caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streams: rearrange the usage of '-' and '+' IDs in stream commands.

Browse Source
This commit is contained in:
dejun.xdj 2018-07-30 21:33:01 +08:00
parent d6f5ec6f09
commit 6491717c88
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/t_stream.c
View File

@ -1137,7 +1137,7 @@ void xaddCommand(client *c) {
maxlen_arg_idx = i; maxlen_arg_idx = i;
} else { } else {
/* If we are here is a syntax error or a valid ID. */ /* If we are here is a syntax error or a valid ID. */
if (streamParseIDOrReply(c,c->argv[i],&id,0) != C_OK) return; if (streamParseIDOrReply(c,c->argv[i],&id,0,0) != C_OK) return;
id_given = 1; id_given = 1;
break; break;
} }
@ -1206,8 +1206,8 @@ void xrangeGenericCommand(client *c, int rev) {
robj *startarg = rev ? c->argv[3] : c->argv[2]; robj *startarg = rev ? c->argv[3] : c->argv[2];
robj *endarg = rev ? c->argv[2] : c->argv[3]; robj *endarg = rev ? c->argv[2] : c->argv[3];
if (streamParseIDOrReply(c,startarg,&startid,0) == C_ERR) return; if (streamParseIDOrReply(c,startarg,&startid,0,1) == C_ERR) return;
if (streamParseIDOrReply(c,endarg,&endid,UINT64_MAX) == C_ERR) return; if (streamParseIDOrReply(c,endarg,&endid,UINT64_MAX,1) == C_ERR) return;
/* Parse the COUNT option if any. */ /* Parse the COUNT option if any. */
if (c->argc > 4) { if (c->argc > 4) {
@ -1393,7 +1393,7 @@ void xreadCommand(client *c) {
ids[id_idx].seq = UINT64_MAX; ids[id_idx].seq = UINT64_MAX;
continue; continue;
} }
if (streamParseIDOrReply(c,c->argv[i],ids+id_idx,0) != C_OK) if (streamParseIDOrReply(c,c->argv[i],ids+id_idx,0,0) != C_OK)
goto cleanup; goto cleanup;
} }
@ -1667,7 +1667,7 @@ NULL
streamID id; streamID id;
if (!strcmp(c->argv[4]->ptr,"$")) { if (!strcmp(c->argv[4]->ptr,"$")) {
id = s->last_id; id = s->last_id;
} else if (streamParseIDOrReply(c,c->argv[4],&id,0) != C_OK) { } else if (streamParseIDOrReply(c,c->argv[4],&id,0,0) != C_OK) {
return; return;
} }
streamCG *cg = streamCreateCG(s,grpname,sdslen(grpname),&id); streamCG *cg = streamCreateCG(s,grpname,sdslen(grpname),&id);
@ -1684,7 +1684,7 @@ NULL
streamID id; streamID id;
if (!strcmp(c->argv[4]->ptr,"$")) { if (!strcmp(c->argv[4]->ptr,"$")) {
id = s->last_id; id = s->last_id;
} else if (streamParseIDOrReply(c,c->argv[4],&id,0) != C_OK) { } else if (streamParseIDOrReply(c,c->argv[4],&id,0,1) != C_OK) {
return; return;
} }
cg->last_id = id; cg->last_id = id;
@ -1744,7 +1744,7 @@ void xackCommand(client *c) {
for (int j = 3; j < c->argc; j++) { for (int j = 3; j < c->argc; j++) {
streamID id; streamID id;
unsigned char buf[sizeof(streamID)]; unsigned char buf[sizeof(streamID)];
if (streamParseIDOrReply(c,c->argv[j],&id,0) != C_OK) return; if (streamParseIDOrReply(c,c->argv[j],&id,0,0) != C_OK) return;
streamEncodeID(buf,&id); streamEncodeID(buf,&id);
/* Lookup the ID in the group PEL: it will have a reference to the /* Lookup the ID in the group PEL: it will have a reference to the
@ -1791,9 +1791,9 @@ void xpendingCommand(client *c) {
if (c->argc >= 6) { if (c->argc >= 6) {
if (getLongLongFromObjectOrReply(c,c->argv[5],&count,NULL) == C_ERR) if (getLongLongFromObjectOrReply(c,c->argv[5],&count,NULL) == C_ERR)
return; return;
if (streamParseIDOrReply(c,c->argv[3],&startid,0) == C_ERR) if (streamParseIDOrReply(c,c->argv[3],&startid,0,1) == C_ERR)
return; return;
if (streamParseIDOrReply(c,c->argv[4],&endid,UINT64_MAX) == C_ERR) if (streamParseIDOrReply(c,c->argv[4],&endid,UINT64_MAX,1) == C_ERR)
return; return;
} }
@ -2002,7 +2002,7 @@ void xclaimCommand(client *c) {
int j; int j;
for (j = 4; j < c->argc; j++) { for (j = 4; j < c->argc; j++) {
streamID id; streamID id;
if (streamParseIDOrReply(NULL,c->argv[j],&id,0) != C_OK) break; if (streamParseIDOrReply(NULL,c->argv[j],&id,0,0) != C_OK) break;
} }
int last_id_arg = j-1; /* Next time we iterate the IDs we now the range. */ int last_id_arg = j-1; /* Next time we iterate the IDs we now the range. */
@ -2061,7 +2061,7 @@ void xclaimCommand(client *c) {
for (int j = 5; j <= last_id_arg; j++) { for (int j = 5; j <= last_id_arg; j++) {
streamID id; streamID id;
unsigned char buf[sizeof(streamID)]; unsigned char buf[sizeof(streamID)];
if (streamParseIDOrReply(c,c->argv[j],&id,0) != C_OK) return; if (streamParseIDOrReply(c,c->argv[j],&id,0,0) != C_OK) return;
streamEncodeID(buf,&id); streamEncodeID(buf,&id);
/* Lookup the ID in the group PEL. */ /* Lookup the ID in the group PEL. */
@ -2144,13 +2144,13 @@ void xdelCommand(client *c) {
* executed because at some point an invalid ID is parsed. */ * executed because at some point an invalid ID is parsed. */
streamID id; streamID id;
for (int j = 2; j < c->argc; j++) { for (int j = 2; j < c->argc; j++) {
if (streamParseIDOrReply(c,c->argv[j],&id,0) != C_OK) return; if (streamParseIDOrReply(c,c->argv[j],&id,0,0) != C_OK) return;
} }
/* Actually apply the command. */ /* Actually apply the command. */
int deleted = 0; int deleted = 0;
for (int j = 2; j < c->argc; j++) { for (int j = 2; j < c->argc; j++) {
streamParseIDOrReply(c,c->argv[j],&id,0); /* Retval already checked. */ streamParseIDOrReply(c,c->argv[j],&id,0,0); /* Retval already checked. */
deleted += streamDeleteItem(s,&id); deleted += streamDeleteItem(s,&id);
} }