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

Merge pull request #4971 from soloestoy/bugfix-bzpop

Browse Source 
ZPOP: unblock multiple clients in right way
This commit is contained in:
Salvatore Sanfilippo 2018-05-31 18:40:53 +02:00 committed by GitHub
commit d49d023828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blocked.c
View File

@ -314,8 +314,9 @@ void handleClientsBlockedOnKeys(void) {
if (de) { if (de) {
list *clients = dictGetVal(de); list *clients = dictGetVal(de);
int numclients = listLength(clients); int numclients = listLength(clients);
unsigned long zcard = zsetLength(o);
while(numclients--) { while(numclients-- && zcard) {
listNode *clientnode = listFirst(clients); listNode *clientnode = listFirst(clients);
client *receiver = clientnode->value; client *receiver = clientnode->value;
@ -332,6 +333,7 @@ void handleClientsBlockedOnKeys(void) {
? ZSET_MIN : ZSET_MAX; ? ZSET_MIN : ZSET_MAX;
unblockClient(receiver); unblockClient(receiver);
genericZpopCommand(receiver,&rl->key,1,where,1,NULL); genericZpopCommand(receiver,&rl->key,1,where,1,NULL);
zcard--;
/* Replicate the command. */ /* Replicate the command. */
robj *argv[2]; robj *argv[2];

4
src/t_zset.c
View File

@ -3216,9 +3216,9 @@ void blockingGenericZpopCommand(client *c, int where) {
return; return;
} else { } else {
if (zsetLength(o) != 0) { if (zsetLength(o) != 0) {
/* Non empty zset, this is like a normal Z[REV]POP. */ /* Non empty zset, this is like a normal ZPOP[MIN|MAX]. */
genericZpopCommand(c,&c->argv[j],1,where,1,NULL); genericZpopCommand(c,&c->argv[j],1,where,1,NULL);
/* Replicate it as an Z[REV]POP instead of BZ[REV]POP. */ /* Replicate it as an ZPOP[MIN|MAX] instead of BZPOP[MIN|MAX]. */
rewriteClientCommandVector(c,2, rewriteClientCommandVector(c,2,
where == ZSET_MAX ? shared.zpopmax : shared.zpopmin, where == ZSET_MAX ? shared.zpopmax : shared.zpopmin,
c->argv[j]); c->argv[j]);