Merge branch 'unstable' of github.com:/antirez/redis into unstable

This commit is contained in:
antirez 2018-05-29 12:41:07 +02:00
commit 3d5e2c62e2

View File

@ -1593,7 +1593,7 @@ NULL
* acknowledged, that is, the IDs we were actually able to resolve in the PEL. * acknowledged, that is, the IDs we were actually able to resolve in the PEL.
*/ */
void xackCommand(client *c) { void xackCommand(client *c) {
streamCG *group; streamCG *group = NULL;
robj *o = lookupKeyRead(c->db,c->argv[1]); robj *o = lookupKeyRead(c->db,c->argv[1]);
if (o) { if (o) {
if (checkType(c,o,OBJ_STREAM)) return; /* Type error. */ if (checkType(c,o,OBJ_STREAM)) return; /* Type error. */
@ -1832,7 +1832,7 @@ void xpendingCommand(client *c) {
* successfully claimed, so that the caller is able to understand * successfully claimed, so that the caller is able to understand
* what messages it is now in charge of. */ * what messages it is now in charge of. */
void xclaimCommand(client *c) { void xclaimCommand(client *c) {
streamCG *group; streamCG *group = NULL;
robj *o = lookupKeyRead(c->db,c->argv[1]); robj *o = lookupKeyRead(c->db,c->argv[1]);
long long minidle; /* Minimum idle time argument. */ long long minidle; /* Minimum idle time argument. */
long long retrycount = -1; /* -1 means RETRYCOUNT option not given. */ long long retrycount = -1; /* -1 means RETRYCOUNT option not given. */