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

Streams: XREAD get-key method fixed.

Browse Source
This commit is contained in:
antirez 2017-09-08 11:51:53 +02:00
parent 110041825c
commit a7d898334a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db.c
View File

@ -1364,8 +1364,8 @@ int *georadiusGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numk
} }
/* XREAD [BLOCK <milliseconds>] [COUNT <count>] [GROUP <groupname> <ttl>] /* XREAD [BLOCK <milliseconds>] [COUNT <count>] [GROUP <groupname> <ttl>]
* [RETRY <milliseconds> <ttl>] STREAMS key_1 ID_1 key_2 ID_2 ... * [RETRY <milliseconds> <ttl>] STREAMS key_1 key_2 ... key_N
* key_N ID_N */ * ID_1 ID_2 ... ID_N */
int *xreadGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numkeys) { int *xreadGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numkeys) {
int i, num, *keys; int i, num, *keys;
UNUSED(cmd); UNUSED(cmd);
@ -1377,14 +1377,16 @@ int *xreadGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numkeys)
char *arg = argv[i]->ptr; char *arg = argv[i]->ptr;
if (!strcasecmp(arg, "streams")) streams_pos = i; if (!strcasecmp(arg, "streams")) streams_pos = i;
} }
if (streams_pos != -1) num = argc - streams_pos - 1;
/* Syntax error. */ /* Syntax error. */
if (streams_pos == -1) { if (streams_pos == -1 || num % 2 != 0) {
*numkeys = 0; *numkeys = 0;
return NULL; return NULL;
} }
num /= 2; /* We have half the keys as there are arguments because
there are also the IDs, one per key. */
num = argc - streams_pos - 1;
keys = zmalloc(sizeof(int) * num); keys = zmalloc(sizeof(int) * num);
for (i = streams_pos+1; i < argc; i++) keys[i-streams_pos-1] = i; for (i = streams_pos+1; i < argc; i++) keys[i-streams_pos-1] = i;
*numkeys = num; *numkeys = num;