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

Merge pull request #2346 from sunheehnus/sort

Browse Source 
Little optimization & bug fix in sort.c
This commit is contained in:
Salvatore Sanfilippo 2015-02-03 15:32:38 +01:00
commit 5fbb36f9e7
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/sort.c
View File

@ -332,7 +332,7 @@ void sortCommand(redisClient *c) {
* In this case to load all the objects in the vector is a huge waste of * In this case to load all the objects in the vector is a huge waste of
* resources. We just allocate a vector that is big enough for the selected * resources. We just allocate a vector that is big enough for the selected
* range length, and make sure to load just this part in the vector. */ * range length, and make sure to load just this part in the vector. */
if (sortval->type == REDIS_ZSET && if ((sortval->type == REDIS_ZSET || sortval->type == REDIS_LIST) &&
dontsort && dontsort &&
(start != 0 || end != vectorlen-1)) (start != 0 || end != vectorlen-1))
{ {
@ -343,7 +343,35 @@ void sortCommand(redisClient *c) {
vector = zmalloc(sizeof(redisSortObject)*vectorlen); vector = zmalloc(sizeof(redisSortObject)*vectorlen);
j = 0; j = 0;
if (sortval->type == REDIS_LIST) { if (sortval->type == REDIS_LIST && dontsort) {
/* Special handling for a list, if 'dontsort' is true.
* This makes sure we return elements in the list original
* ordering, accordingly to DESC / ASC options.
*
* Note that in this case we also handle LIMIT here in a direct
* way, just getting the required range, as an optimization. */
if (end >= start) {
listTypeIterator *li;
listTypeEntry entry;
li = listTypeInitIterator(sortval,
desc ? listTypeLength(sortval) - start - 1 : start,
desc ? REDIS_HEAD : REDIS_TAIL);
while(j < vectorlen && listTypeNext(li,&entry)) {
vector[j].obj = listTypeGet(&entry);
vector[j].u.score = 0;
vector[j].u.cmpobj = NULL;
j++;
}
listTypeReleaseIterator(li);
/* The code producing the output does not know that in the case of
* sorted set, 'dontsort', and LIMIT, we are able to get just the
* range, already sorted, so we need to adjust "start" and "end"
* to make sure start is set to 0. */
end -= start;
start = 0;
}
} else if (sortval->type == REDIS_LIST) {
listTypeIterator *li = listTypeInitIterator(sortval,0,REDIS_TAIL); listTypeIterator *li = listTypeInitIterator(sortval,0,REDIS_TAIL);
listTypeEntry entry; listTypeEntry entry;
while(listTypeNext(li,&entry)) { while(listTypeNext(li,&entry)) {
@ -420,7 +448,6 @@ void sortCommand(redisClient *c) {
} else { } else {
redisPanic("Unknown type"); redisPanic("Unknown type");
} }
printf("j: %d; vectorlen: %d\n", j, vectorlen);
redisAssertWithInfo(c,sortval,j == vectorlen); redisAssertWithInfo(c,sortval,j == vectorlen);
/* Now it's time to load the right scores in the sorting vector */ /* Now it's time to load the right scores in the sorting vector */