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

Streams: checkType for xread & xinfo

Browse Source
This commit is contained in:
zhaozhao.zz 2018-06-11 01:17:52 +08:00
parent be899b824e
commit b8913ce721
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/t_stream.c
View File

@ -1310,14 +1310,13 @@ void xreadCommand(client *c) {
* starting from now. */ * starting from now. */
int id_idx = i - streams_arg - streams_count; int id_idx = i - streams_arg - streams_count;
robj *key = c->argv[i-streams_count]; robj *key = c->argv[i-streams_count];
robj *o; robj *o = lookupKeyRead(c->db,key);
if (o && checkType(c,o,OBJ_STREAM)) goto cleanup;
streamCG *group = NULL; streamCG *group = NULL;
/* If a group was specified, than we need to be sure that the /* If a group was specified, than we need to be sure that the
* key and group actually exist. */ * key and group actually exist. */
if (groupname) { if (groupname) {
o = lookupKeyRead(c->db,key);
if (o && checkType(c,o,OBJ_STREAM)) goto cleanup;
if (o == NULL || if (o == NULL ||
(group = streamLookupCG(o->ptr,groupname->ptr)) == NULL) (group = streamLookupCG(o->ptr,groupname->ptr)) == NULL)
{ {
@ -1331,8 +1330,6 @@ void xreadCommand(client *c) {
} }
if (strcmp(c->argv[i]->ptr,"$") == 0) { if (strcmp(c->argv[i]->ptr,"$") == 0) {
o = lookupKeyRead(c->db,key);
if (o && checkType(c,o,OBJ_STREAM)) goto cleanup;
if (o) { if (o) {
stream *s = o->ptr; stream *s = o->ptr;
ids[id_idx] = s->last_id; ids[id_idx] = s->last_id;
@ -2179,7 +2176,7 @@ NULL
/* Lookup the key now, this is common for all the subcommands but HELP. */ /* Lookup the key now, this is common for all the subcommands but HELP. */
robj *o = lookupKeyWriteOrReply(c,key,shared.nokeyerr); robj *o = lookupKeyWriteOrReply(c,key,shared.nokeyerr);
if (o == NULL) return; if (o == NULL || checkType(c,o,OBJ_STREAM)) return;
s = o->ptr; s = o->ptr;
/* Dispatch the different subcommands. */ /* Dispatch the different subcommands. */