fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

make sure that cmpobj is in decoded form when sorting by ALPHA (this solves edge case from previous commit where (!sortby && alpha) == 1)

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-04-15 20:55:34 +02:00
parent 6d7d1370c3
commit 16fa22f12b
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
redis.c
View File

@ -6569,14 +6569,9 @@ static int sortCompare(const void *s1, const void *s2) {
cmp = strcoll(so1->u.cmpobj->ptr,so2->u.cmpobj->ptr); cmp = strcoll(so1->u.cmpobj->ptr,so2->u.cmpobj->ptr);
} }
} else { } else {
/* Compare elements directly */ /* Compare elements directly. Note that these objects already
robj *dec1, *dec2; * need to be non-encoded (see sortCommand). */
cmp = strcoll(so1->obj->ptr,so2->obj->ptr);
dec1 = getDecodedObject(so1->obj);
dec2 = getDecodedObject(so2->obj);
cmp = strcoll(dec1->ptr,dec2->ptr);
decrRefCount(dec1);
decrRefCount(dec2);
} }
} }
return server.sort_desc ? -cmp : cmp; return server.sort_desc ? -cmp : cmp;
@ -6720,14 +6715,13 @@ static void sortCommand(redisClient *c) {
} else { } else {
if (byval->encoding == REDIS_ENCODING_RAW) { if (byval->encoding == REDIS_ENCODING_RAW) {
vector[j].u.score = strtod(byval->ptr,NULL); vector[j].u.score = strtod(byval->ptr,NULL);
} else { } else if (byval->encoding == REDIS_ENCODING_INT) {
/* Don't need to decode the object if it's /* Don't need to decode the object if it's
* integer-encoded (the only encoding supported) so * integer-encoded (the only encoding supported) so
* far. We can just cast it */ * far. We can just cast it */
if (byval->encoding == REDIS_ENCODING_INT) { vector[j].u.score = (long)byval->ptr;
vector[j].u.score = (long)byval->ptr; } else {
} else redisAssert(1 != 1);
redisAssert(1 != 1);
} }
/* clean up immediately if this value came from a zipmap */ /* clean up immediately if this value came from a zipmap */
@ -6832,7 +6826,7 @@ static void sortCommand(redisClient *c) {
decrRefCount(sortval); decrRefCount(sortval);
listRelease(operations); listRelease(operations);
for (j = 0; j < vectorlen; j++) { for (j = 0; j < vectorlen; j++) {
if (sortby && alpha && vector[j].u.cmpobj) if (alpha && vector[j].u.cmpobj)
decrRefCount(vector[j].u.cmpobj); decrRefCount(vector[j].u.cmpobj);
} }
zfree(vector); zfree(vector);