fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-31 14:51:04 +00:00
Code Issues Projects Releases Wiki Activity

make RPUSHX and LPUSHX variadic

Browse Source
This commit is contained in:
Pierre Chapuis 2016-06-05 16:22:52 +02:00
parent b670a16282
commit d88c3c77be
3 changed files with 18 additions and 9 deletions
src
server.ct_list.c
tests/unit/type
list.tcl

4
src/server.c

@ -145,8 +145,8 @@ struct redisCommand redisCommandTable[] = {
{"mget",mgetCommand,-2,"r",0,NULL,1,-1,1,0,0}, {"mget",mgetCommand,-2,"r",0,NULL,1,-1,1,0,0},
{"rpush",rpushCommand,-3,"wmF",0,NULL,1,1,1,0,0}, {"rpush",rpushCommand,-3,"wmF",0,NULL,1,1,1,0,0},
{"lpush",lpushCommand,-3,"wmF",0,NULL,1,1,1,0,0}, {"lpush",lpushCommand,-3,"wmF",0,NULL,1,1,1,0,0},
{"rpushx",rpushxCommand,3,"wmF",0,NULL,1,1,1,0,0}, {"rpushx",rpushxCommand,-3,"wmF",0,NULL,1,1,1,0,0},
{"lpushx",lpushxCommand,3,"wmF",0,NULL,1,1,1,0,0}, {"lpushx",lpushxCommand,-3,"wmF",0,NULL,1,1,1,0,0},
{"linsert",linsertCommand,5,"wm",0,NULL,1,1,1,0,0}, {"linsert",linsertCommand,5,"wm",0,NULL,1,1,1,0,0},
{"rpop",rpopCommand,2,"wF",0,NULL,1,1,1,0,0}, {"rpop",rpopCommand,2,"wF",0,NULL,1,1,1,0,0},
{"lpop",lpopCommand,2,"wF",0,NULL,1,1,1,0,0}, {"lpop",lpopCommand,2,"wF",0,NULL,1,1,1,0,0},

19
src/t_list.c

@ -233,19 +233,26 @@ void rpushCommand(client *c) {
} }
void pushxGenericCommand(client *c, int where) { void pushxGenericCommand(client *c, int where) {
int j, pushed = 0;
robj *subject; robj *subject;
if ((subject = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL || if ((subject = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
checkType(c,subject,OBJ_LIST)) return; checkType(c,subject,OBJ_LIST)) return;
char *event = (where == LIST_HEAD) ? "lpush" : "rpush"; for (j = 2; j < c->argc; j++) {
c->argv[2] = tryObjectEncoding(c->argv[2]); c->argv[j] = tryObjectEncoding(c->argv[j]);
listTypePush(subject,c->argv[2],where); listTypePush(subject,c->argv[j],where);
signalModifiedKey(c->db,c->argv[1]); pushed++;
notifyKeyspaceEvent(NOTIFY_LIST,event,c->argv[1],c->db->id); }
server.dirty++;
addReplyLongLong(c,listTypeLength(subject)); addReplyLongLong(c,listTypeLength(subject));
if (pushed) {
char *event = (where == LIST_HEAD) ? "lpush" : "rpush";
signalModifiedKey(c->db,c->argv[1]);
notifyKeyspaceEvent(NOTIFY_LIST,event,c->argv[1],c->db->id);
}
server.dirty += pushed;
} }
void lpushxCommand(client *c) { void lpushxCommand(client *c) {

4
tests/unit/type/list.tcl

@ -507,7 +507,9 @@ start_server {
create_list xlist "$large c" create_list xlist "$large c"
assert_equal 3 [r rpushx xlist d] assert_equal 3 [r rpushx xlist d]
assert_equal 4 [r lpushx xlist a] assert_equal 4 [r lpushx xlist a]
assert_equal "a $large c d" [r lrange xlist 0 -1] assert_equal 6 [r rpushx xlist 42 x]
assert_equal 9 [r lpushx xlist y3 y2 y1]
assert_equal "y1 y2 y3 a $large c d 42 x" [r lrange xlist 0 -1]
} }
test "LINSERT - $type" { test "LINSERT - $type" {