revert it in the future

enjoy-binbin · Nov 22, 2023 · d8e4be7 · d8e4be7
1 parent 63dd560
commit d8e4be7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/cluster.h b/src/cluster.h
@@ -80,6 +80,7 @@ int clusterNodeIsMyself(clusterNode *n);
 clusterNode *getMyClusterNode(void);
 char *getMyClusterId(void);
 int getClusterSize(void);
+int getMyClusterSlotCount(void);
 int handleDebugClusterCommand(client *c);
 int clusterNodePending(clusterNode  *node);
 int clusterNodeIsMaster(clusterNode *n);

diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
@@ -5773,6 +5773,10 @@ int getClusterSize(void) {
     return dictSize(server.cluster->nodes);
 }
 
+int getMyClusterSlotCount(void) {
+    return server.cluster->myself->numslots;
+}
+
 char **getClusterNodesList(size_t *numnodes) {
     size_t count = dictSize(server.cluster->nodes);
     char **ids = zmalloc((count+1)*CLUSTER_NAMELEN);

diff --git a/src/db.c b/src/db.c
@@ -29,7 +29,6 @@
 
 #include "server.h"
 #include "cluster.h"
-#include "cluster_legacy.h"
 #include "atomicvar.h"
 #include "latency.h"
 #include "script.h"
@@ -2199,7 +2198,7 @@ int dbExpand(const redisDb *db, uint64_t db_size, dbKeyType keyType, int try_exp
     if (server.cluster_enabled) {
         /* We don't know exact number of keys that would fall into each slot, but we can
          * approximate it, assuming even distribution, divide it by the number of slots. */
-        int slots = server.cluster->myself->numslots;
+        int slots = getMyClusterSlotCount();
         if (slots == 0) return C_OK;
         db_size = db_size / slots;