diff options
author | antirez <antirez@gmail.com> | 2014-03-10 13:18:41 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2014-03-10 13:18:41 +0100 |
commit | 787b297046b5695c5dbca87060566cf1d93762de (patch) | |
tree | e2a44fc5866fd05deed1580a885ba34a416b0153 /src/db.c | |
parent | 55b88e004414359fe8e33d7e0cf4e8454367cf6d (diff) | |
download | redis-787b297046b5695c5dbca87060566cf1d93762de.tar.gz |
Cluster: getKeysFromCommand() API cleaned up.
This API originated from the "diskstore" experiment, not for Redis
Cluster itself, so there were legacy/useless things trying to
differentiate between keys that are going to be overwritten and keys
that need to be fetched from disk (preloaded).
All useless with Cluster, so removed with the result of code
simplification.
Diffstat (limited to 'src/db.c')
-rw-r--r-- | src/db.c | 27 |
1 files changed, 3 insertions, 24 deletions
@@ -949,9 +949,9 @@ int *getKeysUsingCommandTable(struct redisCommand *cmd,robj **argv, int argc, in return keys; } -int *getKeysFromCommand(struct redisCommand *cmd,robj **argv, int argc, int *numkeys, int flags) { +int *getKeysFromCommand(struct redisCommand *cmd,robj **argv, int argc, int *numkeys) { if (cmd->getkeys_proc) { - return cmd->getkeys_proc(cmd,argv,argc,numkeys,flags); + return cmd->getkeys_proc(cmd,argv,argc,numkeys); } else { return getKeysUsingCommandTable(cmd,argv,argc,numkeys); } @@ -961,30 +961,9 @@ void getKeysFreeResult(int *result) { zfree(result); } -int *noPreloadGetKeys(struct redisCommand *cmd,robj **argv, int argc, int *numkeys, int flags) { - if (flags & REDIS_GETKEYS_PRELOAD) { - *numkeys = 0; - return NULL; - } else { - return getKeysUsingCommandTable(cmd,argv,argc,numkeys); - } -} - -int *renameGetKeys(struct redisCommand *cmd,robj **argv, int argc, int *numkeys, int flags) { - if (flags & REDIS_GETKEYS_PRELOAD) { - int *keys = zmalloc(sizeof(int)); - *numkeys = 1; - keys[0] = 1; - return keys; - } else { - return getKeysUsingCommandTable(cmd,argv,argc,numkeys); - } -} - -int *zunionInterGetKeys(struct redisCommand *cmd,robj **argv, int argc, int *numkeys, int flags) { +int *zunionInterGetKeys(struct redisCommand *cmd,robj **argv, int argc, int *numkeys) { int i, num, *keys; REDIS_NOTUSED(cmd); - REDIS_NOTUSED(flags); num = atoi(argv[2]->ptr); /* Sanity check. Don't return any key if the command is going to |