From d2154254be252e34c441f22a43c69cba01e2fcaf Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 25 Feb 2013 11:24:42 +0100 Subject: [PATCH] Cluster: fix case for getKeysInSlot() and countKeysInSlot(). Redis functions start in low case. A few functions about cluster were capitalized the wrong way. --- src/cluster.c | 4 ++-- src/db.c | 4 ++-- src/redis.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index e1c12c60e..f7d45b563 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -1534,7 +1534,7 @@ void clusterCommand(redisClient *c) { if (server.cluster->slots[slot] == server.cluster->myself && n != server.cluster->myself) { - if (CountKeysInSlot(slot) != 0) { + if (countKeysInSlot(slot) != 0) { addReplyErrorFormat(c, "Can't assign hashslot %d to a different node while I still hold keys for this hash slot.", slot); return; } @@ -1619,7 +1619,7 @@ void clusterCommand(redisClient *c) { } keys = zmalloc(sizeof(robj*)*maxkeys); - numkeys = GetKeysInSlot(slot, keys, maxkeys); + numkeys = getKeysInSlot(slot, keys, maxkeys); addReplyMultiBulkLen(c,numkeys); for (j = 0; j < numkeys; j++) addReplyBulk(c,keys[j]); zfree(keys); diff --git a/src/db.c b/src/db.c index d4d24b7ae..bcfe9b5d5 100644 --- a/src/db.c +++ b/src/db.c @@ -763,7 +763,7 @@ void slotToKeyFlush(void) { server.cluster->slots_to_keys = zslCreate(); } -unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count) { +unsigned int getKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count) { zskiplistNode *n; zrangespec range; int j = 0; @@ -779,7 +779,7 @@ unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int coun return j; } -unsigned int CountKeysInSlot(unsigned int hashslot) { +unsigned int countKeysInSlot(unsigned int hashslot) { zskiplistNode *n; zrangespec range; int j = 0; diff --git a/src/redis.h b/src/redis.h index b2788c253..4006aaa6f 100644 --- a/src/redis.h +++ b/src/redis.h @@ -1226,8 +1226,8 @@ long long emptyDb(); int selectDb(redisClient *c, int id); void signalModifiedKey(redisDb *db, robj *key); void signalFlushedDb(int dbid); -unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count); -unsigned int CountKeysInSlot(unsigned int hashslot); +unsigned int getKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count); +unsigned int countKeysInSlot(unsigned int hashslot); int verifyClusterConfigWithData(void); /* API to get key arguments from commands */