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

Remove ZCOUNT branches from generic RANGEBYSCORE code

Browse Source
This commit is contained in:
Pieter Noordhuis 2011-10-03 14:23:31 +02:00
parent 62d774e5ba
commit 0cfc894066
1 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/t_zset.c
View File

@ -1756,12 +1756,11 @@ void zrevrangeCommand(redisClient *c) {
zrangeGenericCommand(c,1); zrangeGenericCommand(c,1);
} }
/* This command implements ZRANGEBYSCORE, ZREVRANGEBYSCORE and ZCOUNT. /* This command implements ZRANGEBYSCORE, ZREVRANGEBYSCORE. */
* If "justcount", only the number of elements in the range is returned. */ void genericZrangebyscoreCommand(redisClient *c, int reverse) {
void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
zrangespec range; zrangespec range;
robj *key = c->argv[1]; robj *key = c->argv[1];
robj *emptyreply, *zobj; robj *zobj;
int offset = 0, limit = -1; int offset = 0, limit = -1;
int withscores = 0; int withscores = 0;
unsigned long rangelen = 0; unsigned long rangelen = 0;
@ -1804,8 +1803,7 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
} }
/* Ok, lookup the key and get the range */ /* Ok, lookup the key and get the range */
emptyreply = justcount ? shared.czero : shared.emptymultibulk; if ((zobj = lookupKeyReadOrReply(c,key,shared.emptymultibulk)) == NULL ||
if ((zobj = lookupKeyReadOrReply(c,key,emptyreply)) == NULL ||
checkType(c,zobj,REDIS_ZSET)) return; checkType(c,zobj,REDIS_ZSET)) return;
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) { if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
@ -1817,14 +1815,15 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
double score; double score;
/* If reversed, get the last node in range as starting point. */ /* If reversed, get the last node in range as starting point. */
if (reverse) if (reverse) {
eptr = zzlLastInRange(zl,range); eptr = zzlLastInRange(zl,range);
else } else {
eptr = zzlFirstInRange(zl,range); eptr = zzlFirstInRange(zl,range);
}
/* No "first" element in the specified interval. */ /* No "first" element in the specified interval. */
if (eptr == NULL) { if (eptr == NULL) {
addReply(c,emptyreply); addReply(c, shared.emptymultibulk);
return; return;
} }
@ -1835,16 +1834,17 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
/* We don't know in advance how many matching elements there are in the /* We don't know in advance how many matching elements there are in the
* list, so we push this object that will represent the multi-bulk * list, so we push this object that will represent the multi-bulk
* length in the output buffer, and will "fix" it later */ * length in the output buffer, and will "fix" it later */
if (!justcount) replylen = addDeferredMultiBulkLength(c);
replylen = addDeferredMultiBulkLength(c);
/* If there is an offset, just traverse the number of elements without /* If there is an offset, just traverse the number of elements without
* checking the score because that is done in the next loop. */ * checking the score because that is done in the next loop. */
while (eptr && offset--) while (eptr && offset--) {
if (reverse) if (reverse) {
zzlPrev(zl,&eptr,&sptr); zzlPrev(zl,&eptr,&sptr);
else } else {
zzlNext(zl,&eptr,&sptr); zzlNext(zl,&eptr,&sptr);
}
}
while (eptr && limit--) { while (eptr && limit--) {
score = zzlGetScore(sptr); score = zzlGetScore(sptr);
@ -1856,24 +1856,26 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
if (!zslValueLteMax(score,&range)) break; if (!zslValueLteMax(score,&range)) break;
} }
/* Do our magic */ /* We know the element exists, so ziplistGet should always succeed */
rangelen++; redisAssert(ziplistGet(eptr,&vstr,&vlen,&vlong));
if (!justcount) {
redisAssert(ziplistGet(eptr,&vstr,&vlen,&vlong));
if (vstr == NULL)
addReplyBulkLongLong(c,vlong);
else
addReplyBulkCBuffer(c,vstr,vlen);
if (withscores) rangelen++;
addReplyDouble(c,score); if (vstr == NULL) {
addReplyBulkLongLong(c,vlong);
} else {
addReplyBulkCBuffer(c,vstr,vlen);
}
if (withscores) {
addReplyDouble(c,score);
} }
/* Move to next node */ /* Move to next node */
if (reverse) if (reverse) {
zzlPrev(zl,&eptr,&sptr); zzlPrev(zl,&eptr,&sptr);
else } else {
zzlNext(zl,&eptr,&sptr); zzlNext(zl,&eptr,&sptr);
}
} }
} else if (zobj->encoding == REDIS_ENCODING_SKIPLIST) { } else if (zobj->encoding == REDIS_ENCODING_SKIPLIST) {
zset *zs = zobj->ptr; zset *zs = zobj->ptr;
@ -1881,27 +1883,32 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
zskiplistNode *ln; zskiplistNode *ln;
/* If reversed, get the last node in range as starting point. */ /* If reversed, get the last node in range as starting point. */
if (reverse) if (reverse) {
ln = zslLastInRange(zsl,range); ln = zslLastInRange(zsl,range);
else } else {
ln = zslFirstInRange(zsl,range); ln = zslFirstInRange(zsl,range);
}
/* No "first" element in the specified interval. */ /* No "first" element in the specified interval. */
if (ln == NULL) { if (ln == NULL) {
addReply(c,emptyreply); addReply(c, shared.emptymultibulk);
return; return;
} }
/* We don't know in advance how many matching elements there are in the /* We don't know in advance how many matching elements there are in the
* list, so we push this object that will represent the multi-bulk * list, so we push this object that will represent the multi-bulk
* length in the output buffer, and will "fix" it later */ * length in the output buffer, and will "fix" it later */
if (!justcount) replylen = addDeferredMultiBulkLength(c);
replylen = addDeferredMultiBulkLength(c);
/* If there is an offset, just traverse the number of elements without /* If there is an offset, just traverse the number of elements without
* checking the score because that is done in the next loop. */ * checking the score because that is done in the next loop. */
while (ln && offset--) while (ln && offset--) {
ln = reverse ? ln->backward : ln->level[0].forward; if (reverse) {
ln = ln->backward;
} else {
ln = ln->level[0].forward;
}
}
while (ln && limit--) { while (ln && limit--) {
/* Abort when the node is no longer in range. */ /* Abort when the node is no longer in range. */
@ -1911,35 +1918,37 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
if (!zslValueLteMax(ln->score,&range)) break; if (!zslValueLteMax(ln->score,&range)) break;
} }
/* Do our magic */
rangelen++; rangelen++;
if (!justcount) { addReplyBulk(c,ln->obj);
addReplyBulk(c,ln->obj);
if (withscores) if (withscores) {
addReplyDouble(c,ln->score); addReplyDouble(c,ln->score);
} }
/* Move to next node */ /* Move to next node */
ln = reverse ? ln->backward : ln->level[0].forward; if (reverse) {
ln = ln->backward;
} else {
ln = ln->level[0].forward;
}
} }
} else { } else {
redisPanic("Unknown sorted set encoding"); redisPanic("Unknown sorted set encoding");
} }
if (justcount) { if (withscores) {
addReplyLongLong(c,(long)rangelen); rangelen *= 2;
} else {
if (withscores) rangelen *= 2;
setDeferredMultiBulkLength(c,replylen,rangelen);
} }
setDeferredMultiBulkLength(c, replylen, rangelen);
} }
void zrangebyscoreCommand(redisClient *c) { void zrangebyscoreCommand(redisClient *c) {
genericZrangebyscoreCommand(c,0,0); genericZrangebyscoreCommand(c,0);
} }
void zrevrangebyscoreCommand(redisClient *c) { void zrevrangebyscoreCommand(redisClient *c) {
genericZrangebyscoreCommand(c,1,0); genericZrangebyscoreCommand(c,1);
} }
void zcountCommand(redisClient *c) { void zcountCommand(redisClient *c) {