Unverified Commit ebf72741 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #5799 from guybe7/zpop_zero_count

ZPOP should return an empty array if COUNT=0
parents 6fd4af1f 25029568
...@@ -3140,7 +3140,10 @@ void genericZpopCommand(client *c, robj **keyv, int keyc, int where, int emitkey ...@@ -3140,7 +3140,10 @@ void genericZpopCommand(client *c, robj **keyv, int keyc, int where, int emitkey
if (countarg) { if (countarg) {
if (getLongFromObjectOrReply(c,countarg,&count,NULL) != C_OK) if (getLongFromObjectOrReply(c,countarg,&count,NULL) != C_OK)
return; return;
if (count < 0) count = 1; if (count <= 0) {
addReplyNullArray(c);
return;
}
} }
/* Check type and break on the first error, otherwise identify candidate. */ /* Check type and break on the first error, otherwise identify candidate. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment