caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cluster: fix case for getKeysInSlot() and countKeysInSlot().

Browse Source 
Redis functions start in low case. A few functions about cluster were
capitalized the wrong way.
This commit is contained in:
antirez 2013-02-25 11:24:42 +01:00
parent c2eb4a606f
commit d2154254be
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -1534,7 +1534,7 @@ void clusterCommand(redisClient *c) {
if (server.cluster->slots[slot] == server.cluster->myself && if (server.cluster->slots[slot] == server.cluster->myself &&
n != 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); addReplyErrorFormat(c, "Can't assign hashslot %d to a different node while I still hold keys for this hash slot.", slot);
return; return;
} }
@ -1619,7 +1619,7 @@ void clusterCommand(redisClient *c) {
} }
keys = zmalloc(sizeof(robj*)*maxkeys); keys = zmalloc(sizeof(robj*)*maxkeys);
numkeys = GetKeysInSlot(slot, keys, maxkeys); numkeys = getKeysInSlot(slot, keys, maxkeys);
addReplyMultiBulkLen(c,numkeys); addReplyMultiBulkLen(c,numkeys);
for (j = 0; j < numkeys; j++) addReplyBulk(c,keys[j]); for (j = 0; j < numkeys; j++) addReplyBulk(c,keys[j]);
zfree(keys); zfree(keys);

4
src/db.c
View File

@ -763,7 +763,7 @@ void slotToKeyFlush(void) {
server.cluster->slots_to_keys = zslCreate(); 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; zskiplistNode *n;
zrangespec range; zrangespec range;
int j = 0; int j = 0;
@ -779,7 +779,7 @@ unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int coun
return j; return j;
} }
unsigned int CountKeysInSlot(unsigned int hashslot) { unsigned int countKeysInSlot(unsigned int hashslot) {
zskiplistNode *n; zskiplistNode *n;
zrangespec range; zrangespec range;
int j = 0; int j = 0;

4
src/redis.h
View File

@ -1226,8 +1226,8 @@ long long emptyDb();
int selectDb(redisClient *c, int id); int selectDb(redisClient *c, int id);
void signalModifiedKey(redisDb *db, robj *key); void signalModifiedKey(redisDb *db, robj *key);
void signalFlushedDb(int dbid); void signalFlushedDb(int dbid);
unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count); unsigned int getKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count);
unsigned int CountKeysInSlot(unsigned int hashslot); unsigned int countKeysInSlot(unsigned int hashslot);
int verifyClusterConfigWithData(void); int verifyClusterConfigWithData(void);
/* API to get key arguments from commands */ /* API to get key arguments from commands */