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

Fixed SORT bugs (issue ) with regression tests.

Browse Source
This commit is contained in:
antirez 2011-12-01 16:07:55 +01:00
parent 1576520cc0
commit 237194b760
2 changed files with 21 additions and 12 deletions
src
sort.c
tests/unit
sort.tcl

21
src/sort.c

@ -141,11 +141,7 @@ void sortCommand(redisClient *c) {
/* Lookup the key to sort. It must be of the right types */ /* Lookup the key to sort. It must be of the right types */
sortval = lookupKeyRead(c->db,c->argv[1]); sortval = lookupKeyRead(c->db,c->argv[1]);
if (sortval == NULL) { if (sortval && sortval->type != REDIS_SET && sortval->type != REDIS_LIST &&
addReply(c,shared.emptymultibulk);
return;
}
if (sortval->type != REDIS_SET && sortval->type != REDIS_LIST &&
sortval->type != REDIS_ZSET) sortval->type != REDIS_ZSET)
{ {
addReply(c,shared.wrongtypeerr); addReply(c,shared.wrongtypeerr);
@ -161,7 +157,10 @@ void sortCommand(redisClient *c) {
/* Now we need to protect sortval incrementing its count, in the future /* Now we need to protect sortval incrementing its count, in the future
* SORT may have options able to overwrite/delete keys during the sorting * SORT may have options able to overwrite/delete keys during the sorting
* and the sorted key itself may get destroied */ * and the sorted key itself may get destroied */
incrRefCount(sortval); if (sortval)
incrRefCount(sortval);
else
sortval = createListObject();
/* The SORT command has an SQL-alike syntax, parse it */ /* The SORT command has an SQL-alike syntax, parse it */
while(j < c->argc) { while(j < c->argc) {
@ -200,7 +199,8 @@ void sortCommand(redisClient *c) {
} }
/* Destructively convert encoded sorted sets for SORT. */ /* Destructively convert encoded sorted sets for SORT. */
if (sortval->type == REDIS_ZSET) zsetConvert(sortval, REDIS_ENCODING_SKIPLIST); if (sortval->type == REDIS_ZSET)
zsetConvert(sortval, REDIS_ENCODING_SKIPLIST);
/* Load the sorting vector with all the objects to sort */ /* Load the sorting vector with all the objects to sort */
switch(sortval->type) { switch(sortval->type) {
@ -367,12 +367,9 @@ void sortCommand(redisClient *c) {
} }
} }
} }
setKey(c->db,storekey,sobj); if (outputlen) setKey(c->db,storekey,sobj);
decrRefCount(sobj); decrRefCount(sobj);
/* Note: we add 1 because the DB is dirty anyway since even if the server.dirty += outputlen;
* SORT result is empty a new key is set and maybe the old content
* replaced. */
server.dirty += 1+outputlen;
addReplyLongLong(c,outputlen); addReplyLongLong(c,outputlen);
} }

12
tests/unit/sort.tcl

@ -134,6 +134,18 @@ start_server {
assert_equal [lsort -real $floats] [r sort mylist] assert_equal [lsort -real $floats] [r sort mylist]
} }
test "SORT with STORE returns zero if result is empty (github isse 224)" {
r flushdb
r sort foo store bar
} {0}
test "SORT with STORE does not create empty lists (github issue 224)" {
r flushdb
r lpush foo bar
r sort foo limit 10 10 store zap
r exists zap
} {0}
tags {"slow"} { tags {"slow"} {
set num 100 set num 100
set res [create_random_dataset $num lpush] set res [create_random_dataset $num lpush]