diff options
author | zhaozhao.zz <zhaozhao.zz@alibaba-inc.com> | 2018-08-14 20:58:58 +0800 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2018-08-29 12:28:39 +0200 |
commit | c03c59133008460bc1648c18bd6fef4da06715e8 (patch) | |
tree | 3a96d7ced7d7ccd38ecdfb77de77b7e9b1888081 | |
parent | fcd5ef1624a2865b64126085204bd6fda42926eb (diff) | |
download | redis-c03c59133008460bc1648c18bd6fef4da06715e8.tar.gz |
block: rewrite BRPOPLPUSH as RPOPLPUSH to propagate
-rw-r--r-- | src/server.c | 1 | ||||
-rw-r--r-- | src/server.h | 2 | ||||
-rw-r--r-- | src/t_list.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c index b537ee04a..cd88d3c2f 100644 --- a/src/server.c +++ b/src/server.c @@ -1491,6 +1491,7 @@ void createSharedObjects(void) { shared.rpop = createStringObject("RPOP",4); shared.lpop = createStringObject("LPOP",4); shared.lpush = createStringObject("LPUSH",5); + shared.rpoplpush = createStringObject("RPOPLPUSH",9); shared.zpopmin = createStringObject("ZPOPMIN",7); shared.zpopmax = createStringObject("ZPOPMAX",7); for (j = 0; j < OBJ_SHARED_INTEGERS; j++) { diff --git a/src/server.h b/src/server.h index ce127b587..2e1f7c9ce 100644 --- a/src/server.h +++ b/src/server.h @@ -782,7 +782,7 @@ struct sharedObjectsStruct { *masterdownerr, *roslaveerr, *execaborterr, *noautherr, *noreplicaserr, *busykeyerr, *oomerr, *plus, *messagebulk, *pmessagebulk, *subscribebulk, *unsubscribebulk, *psubscribebulk, *punsubscribebulk, *del, *unlink, - *rpop, *lpop, *lpush, *zpopmin, *zpopmax, *emptyscan, + *rpop, *lpop, *lpush, *rpoplpush, *zpopmin, *zpopmax, *emptyscan, *select[PROTO_SHARED_SELECT_CMDS], *integers[OBJ_SHARED_INTEGERS], *mbulkhdr[OBJ_SHARED_BULKHDR_LEN], /* "*<value>\r\n" */ diff --git a/src/t_list.c b/src/t_list.c index 1414ff31a..987392e6e 100644 --- a/src/t_list.c +++ b/src/t_list.c @@ -596,6 +596,9 @@ void rpoplpushCommand(client *c) { signalModifiedKey(c->db,touchedkey); decrRefCount(touchedkey); server.dirty++; + if (c->lastcmd->proc == brpoplpushCommand) { + rewriteClientCommandVector(c,3,shared.rpoplpush,c->argv[1],c->argv[2]); + } } } |