fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-21 00:22:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5248 from soloestoy/rewrite-brpoplpush

Browse Source 
rewrite BRPOPLPUSH as RPOPLPUSH to propagate
This commit is contained in:
Salvatore Sanfilippo 2018-08-26 16:31:24 +02:00 committed by GitHub
commit 19880ab851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blocked.c
View File

@ -269,7 +269,7 @@ void handleClientsBlockedOnKeys(void) {
robj *dstkey = receiver->bpop.target; robj *dstkey = receiver->bpop.target;
int where = (receiver->lastcmd && int where = (receiver->lastcmd &&
receiver->lastcmd->proc == blpopCommand) ? receiver->lastcmd->proc == blpopCommand) ?
LIST_HEAD : LIST_TAIL; LIST_HEAD : LIST_TAIL;
robj *value = listTypePop(o,where); robj *value = listTypePop(o,where);
if (value) { if (value) {
@ -285,7 +285,7 @@ void handleClientsBlockedOnKeys(void) {
{ {
/* If we failed serving the client we need /* If we failed serving the client we need
* to also undo the POP operation. */ * to also undo the POP operation. */
listTypePush(o,value,where); listTypePush(o,value,where);
} }
if (dstkey) decrRefCount(dstkey); if (dstkey) decrRefCount(dstkey);

1
src/server.c
View File

@ -1491,6 +1491,7 @@ void createSharedObjects(void) {
shared.rpop = createStringObject("RPOP",4); shared.rpop = createStringObject("RPOP",4);
shared.lpop = createStringObject("LPOP",4); shared.lpop = createStringObject("LPOP",4);
shared.lpush = createStringObject("LPUSH",5); shared.lpush = createStringObject("LPUSH",5);
shared.rpoplpush = createStringObject("RPOPLPUSH",9);
shared.zpopmin = createStringObject("ZPOPMIN",7); shared.zpopmin = createStringObject("ZPOPMIN",7);
shared.zpopmax = createStringObject("ZPOPMAX",7); shared.zpopmax = createStringObject("ZPOPMAX",7);
for (j = 0; j < OBJ_SHARED_INTEGERS; j++) { for (j = 0; j < OBJ_SHARED_INTEGERS; j++) {

2
src/server.h
View File

@ -782,7 +782,7 @@ struct sharedObjectsStruct {
*masterdownerr, *roslaveerr, *execaborterr, *noautherr, *noreplicaserr, *masterdownerr, *roslaveerr, *execaborterr, *noautherr, *noreplicaserr,
*busykeyerr, *oomerr, *plus, *messagebulk, *pmessagebulk, *subscribebulk, *busykeyerr, *oomerr, *plus, *messagebulk, *pmessagebulk, *subscribebulk,
*unsubscribebulk, *psubscribebulk, *punsubscribebulk, *del, *unlink, *unsubscribebulk, *psubscribebulk, *punsubscribebulk, *del, *unlink,
*rpop, *lpop, *lpush, *zpopmin, *zpopmax, *emptyscan, *rpop, *lpop, *lpush, *rpoplpush, *zpopmin, *zpopmax, *emptyscan,
*select[PROTO_SHARED_SELECT_CMDS], *select[PROTO_SHARED_SELECT_CMDS],
*integers[OBJ_SHARED_INTEGERS], *integers[OBJ_SHARED_INTEGERS],
*mbulkhdr[OBJ_SHARED_BULKHDR_LEN], /* "*<value>\r\n" */ *mbulkhdr[OBJ_SHARED_BULKHDR_LEN], /* "*<value>\r\n" */

3
src/t_list.c
View File

@ -596,6 +596,9 @@ void rpoplpushCommand(client *c) {
signalModifiedKey(c->db,touchedkey); signalModifiedKey(c->db,touchedkey);
decrRefCount(touchedkey); decrRefCount(touchedkey);
server.dirty++; server.dirty++;
if (c->lastcmd->proc == brpoplpushCommand) {
rewriteClientCommandVector(c,3,shared.rpoplpush,c->argv[1],c->argv[2]);
}
} }
} }