fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-01 15:21:03 +00:00
Code Issues Projects Releases Wiki Activity

RESP3: Make WITHSCORES reply back with a flat array in RESP2.

Browse Source
This commit is contained in:
antirez 2018-11-23 12:22:27 +01:00
parent fe67418ba4
commit c7f80e4f1a
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/t_zset.c
View File

@ -2446,6 +2446,7 @@ void zrangeGenericCommand(client *c, int reverse) {
rangelen = (end-start)+1; rangelen = (end-start)+1;
/* Return the result in form of a multi-bulk reply */ /* Return the result in form of a multi-bulk reply */
if (withscores && c->resp == 2) rangelen *= 2;
addReplyArrayLen(c, rangelen); addReplyArrayLen(c, rangelen);
if (zobj->encoding == OBJ_ENCODING_ZIPLIST) { if (zobj->encoding == OBJ_ENCODING_ZIPLIST) {
@ -2467,7 +2468,7 @@ void zrangeGenericCommand(client *c, int reverse) {
serverAssertWithInfo(c,zobj,eptr != NULL && sptr != NULL); serverAssertWithInfo(c,zobj,eptr != NULL && sptr != NULL);
serverAssertWithInfo(c,zobj,ziplistGet(eptr,&vstr,&vlen,&vlong)); serverAssertWithInfo(c,zobj,ziplistGet(eptr,&vstr,&vlen,&vlong));
if (withscores) addReplyArrayLen(c,2); if (withscores && c->resp > 2) addReplyArrayLen(c,2);
if (vstr == NULL) if (vstr == NULL)
addReplyBulkLongLong(c,vlong); addReplyBulkLongLong(c,vlong);
else else
@ -2500,7 +2501,7 @@ void zrangeGenericCommand(client *c, int reverse) {
while(rangelen--) { while(rangelen--) {
serverAssertWithInfo(c,zobj,ln != NULL); serverAssertWithInfo(c,zobj,ln != NULL);
ele = ln->ele; ele = ln->ele;
if (withscores) addReplyArrayLen(c,2); if (withscores && c->resp > 2) addReplyArrayLen(c,2);
addReplyBulkCBuffer(c,ele,sdslen(ele)); addReplyBulkCBuffer(c,ele,sdslen(ele));
if (withscores) addReplyDouble(c,ln->score); if (withscores) addReplyDouble(c,ln->score);
ln = reverse ? ln->backward : ln->level[0].forward; ln = reverse ? ln->backward : ln->level[0].forward;
@ -2628,7 +2629,7 @@ void genericZrangebyscoreCommand(client *c, int reverse) {
serverAssertWithInfo(c,zobj,ziplistGet(eptr,&vstr,&vlen,&vlong)); serverAssertWithInfo(c,zobj,ziplistGet(eptr,&vstr,&vlen,&vlong));
rangelen++; rangelen++;
if (withscores) addReplyArrayLen(c,2); if (withscores && c->resp > 2) addReplyArrayLen(c,2);
if (vstr == NULL) { if (vstr == NULL) {
addReplyBulkLongLong(c,vlong); addReplyBulkLongLong(c,vlong);
} else { } else {
@ -2685,7 +2686,7 @@ void genericZrangebyscoreCommand(client *c, int reverse) {
} }
rangelen++; rangelen++;
if (withscores) addReplyArrayLen(c,2); if (withscores && c->resp > 2) addReplyArrayLen(c,2);
addReplyBulkCBuffer(c,ln->ele,sdslen(ln->ele)); addReplyBulkCBuffer(c,ln->ele,sdslen(ln->ele));
if (withscores) addReplyDouble(c,ln->score); if (withscores) addReplyDouble(c,ln->score);
@ -2700,6 +2701,7 @@ void genericZrangebyscoreCommand(client *c, int reverse) {
serverPanic("Unknown sorted set encoding"); serverPanic("Unknown sorted set encoding");
} }
if (withscores && c->resp == 2) rangelen *= 2;
setDeferredArrayLen(c, replylen, rangelen); setDeferredArrayLen(c, replylen, rangelen);
} }