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

Always pass sorted set range objects by reference.

Browse Source
This commit is contained in:
antirez 2014-04-17 14:30:12 +02:00
parent 95098b7230
commit 8827dc4eec
3 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.c
View File

@ -1143,7 +1143,7 @@ unsigned int getKeysInSlot(unsigned int hashslot, robj **keys, unsigned int coun
range.min = range.max = hashslot; range.min = range.max = hashslot;
range.minex = range.maxex = 0; range.minex = range.maxex = 0;
n = zslFirstInRange(server.cluster->slots_to_keys, range); n = zslFirstInRange(server.cluster->slots_to_keys, &range);
while(n && n->score == hashslot && count--) { while(n && n->score == hashslot && count--) {
keys[j++] = n->obj; keys[j++] = n->obj;
n = n->level[0].forward; n = n->level[0].forward;
@ -1161,7 +1161,7 @@ unsigned int countKeysInSlot(unsigned int hashslot) {
range.minex = range.maxex = 0; range.minex = range.maxex = 0;
/* Find first element in range */ /* Find first element in range */
zn = zslFirstInRange(zsl, range); zn = zslFirstInRange(zsl, &range);
/* Use rank of first element, if any, to determine preliminary count */ /* Use rank of first element, if any, to determine preliminary count */
if (zn != NULL) { if (zn != NULL) {
@ -1169,7 +1169,7 @@ unsigned int countKeysInSlot(unsigned int hashslot) {
count = (zsl->length - (rank - 1)); count = (zsl->length - (rank - 1));
/* Find last element in range */ /* Find last element in range */
zn = zslLastInRange(zsl, range); zn = zslLastInRange(zsl, &range);
/* Use rank of last element, if any, to determine the actual count */ /* Use rank of last element, if any, to determine the actual count */
if (zn != NULL) { if (zn != NULL) {

4
src/redis.h
View File

@ -1151,8 +1151,8 @@ void zslFree(zskiplist *zsl);
zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj); zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj);
unsigned char *zzlInsert(unsigned char *zl, robj *ele, double score); unsigned char *zzlInsert(unsigned char *zl, robj *ele, double score);
int zslDelete(zskiplist *zsl, double score, robj *obj); int zslDelete(zskiplist *zsl, double score, robj *obj);
zskiplistNode *zslFirstInRange(zskiplist *zsl, zrangespec range); zskiplistNode *zslFirstInRange(zskiplist *zsl, zrangespec *range);
zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec range); zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec *range);
double zzlGetScore(unsigned char *sptr); double zzlGetScore(unsigned char *sptr);
void zzlNext(unsigned char *zl, unsigned char **eptr, unsigned char **sptr); void zzlNext(unsigned char *zl, unsigned char **eptr, unsigned char **sptr);
void zzlPrev(unsigned char *zl, unsigned char **eptr, unsigned char **sptr); void zzlPrev(unsigned char *zl, unsigned char **eptr, unsigned char **sptr);

90
src/t_zset.c
View File

@ -235,18 +235,18 @@ int zslIsInRange(zskiplist *zsl, zrangespec *range) {
/* Find the first node that is contained in the specified range. /* Find the first node that is contained in the specified range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
zskiplistNode *zslFirstInRange(zskiplist *zsl, zrangespec range) { zskiplistNode *zslFirstInRange(zskiplist *zsl, zrangespec *range) {
zskiplistNode *x; zskiplistNode *x;
int i; int i;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zslIsInRange(zsl,&range)) return NULL; if (!zslIsInRange(zsl,range)) return NULL;
x = zsl->header; x = zsl->header;
for (i = zsl->level-1; i >= 0; i--) { for (i = zsl->level-1; i >= 0; i--) {
/* Go forward while *OUT* of range. */ /* Go forward while *OUT* of range. */
while (x->level[i].forward && while (x->level[i].forward &&
!zslValueGteMin(x->level[i].forward->score,&range)) !zslValueGteMin(x->level[i].forward->score,range))
x = x->level[i].forward; x = x->level[i].forward;
} }
@ -255,24 +255,24 @@ zskiplistNode *zslFirstInRange(zskiplist *zsl, zrangespec range) {
redisAssert(x != NULL); redisAssert(x != NULL);
/* Check if score <= max. */ /* Check if score <= max. */
if (!zslValueLteMax(x->score,&range)) return NULL; if (!zslValueLteMax(x->score,range)) return NULL;
return x; return x;
} }
/* Find the last node that is contained in the specified range. /* Find the last node that is contained in the specified range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec range) { zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec *range) {
zskiplistNode *x; zskiplistNode *x;
int i; int i;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zslIsInRange(zsl,&range)) return NULL; if (!zslIsInRange(zsl,range)) return NULL;
x = zsl->header; x = zsl->header;
for (i = zsl->level-1; i >= 0; i--) { for (i = zsl->level-1; i >= 0; i--) {
/* Go forward while *IN* range. */ /* Go forward while *IN* range. */
while (x->level[i].forward && while (x->level[i].forward &&
zslValueLteMax(x->level[i].forward->score,&range)) zslValueLteMax(x->level[i].forward->score,range))
x = x->level[i].forward; x = x->level[i].forward;
} }
@ -280,7 +280,7 @@ zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec range) {
redisAssert(x != NULL); redisAssert(x != NULL);
/* Check if score >= min. */ /* Check if score >= min. */
if (!zslValueGteMin(x->score,&range)) return NULL; if (!zslValueGteMin(x->score,range)) return NULL;
return x; return x;
} }
@ -288,16 +288,16 @@ zskiplistNode *zslLastInRange(zskiplist *zsl, zrangespec range) {
* Min and max are inclusive, so a score >= min || score <= max is deleted. * Min and max are inclusive, so a score >= min || score <= max is deleted.
* Note that this function takes the reference to the hash table view of the * Note that this function takes the reference to the hash table view of the
* sorted set, in order to remove the elements from the hash table too. */ * sorted set, in order to remove the elements from the hash table too. */
unsigned long zslDeleteRangeByScore(zskiplist *zsl, zrangespec range, dict *dict) { unsigned long zslDeleteRangeByScore(zskiplist *zsl, zrangespec *range, dict *dict) {
zskiplistNode *update[ZSKIPLIST_MAXLEVEL], *x; zskiplistNode *update[ZSKIPLIST_MAXLEVEL], *x;
unsigned long removed = 0; unsigned long removed = 0;
int i; int i;
x = zsl->header; x = zsl->header;
for (i = zsl->level-1; i >= 0; i--) { for (i = zsl->level-1; i >= 0; i--) {
while (x->level[i].forward && (range.minex ? while (x->level[i].forward && (range->minex ?
x->level[i].forward->score <= range.min : x->level[i].forward->score <= range->min :
x->level[i].forward->score < range.min)) x->level[i].forward->score < range->min))
x = x->level[i].forward; x = x->level[i].forward;
update[i] = x; update[i] = x;
} }
@ -306,7 +306,9 @@ unsigned long zslDeleteRangeByScore(zskiplist *zsl, zrangespec range, dict *dict
x = x->level[0].forward; x = x->level[0].forward;
/* Delete nodes while in range. */ /* Delete nodes while in range. */
while (x && (range.maxex ? x->score < range.max : x->score <= range.max)) { while (x &&
(range->maxex ? x->score < range->max : x->score <= range->max))
{
zskiplistNode *next = x->level[0].forward; zskiplistNode *next = x->level[0].forward;
zslDeleteNode(zsl,x,update); zslDeleteNode(zsl,x,update);
dictDelete(dict,x->obj); dictDelete(dict,x->obj);
@ -547,18 +549,18 @@ int zslIsInLexRange(zskiplist *zsl, zlexrangespec *range) {
/* Find the first node that is contained in the specified lex range. /* Find the first node that is contained in the specified lex range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
zskiplistNode *zslFirstInLexRange(zskiplist *zsl, zlexrangespec range) { zskiplistNode *zslFirstInLexRange(zskiplist *zsl, zlexrangespec *range) {
zskiplistNode *x; zskiplistNode *x;
int i; int i;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zslIsInLexRange(zsl,&range)) return NULL; if (!zslIsInLexRange(zsl,range)) return NULL;
x = zsl->header; x = zsl->header;
for (i = zsl->level-1; i >= 0; i--) { for (i = zsl->level-1; i >= 0; i--) {
/* Go forward while *OUT* of range. */ /* Go forward while *OUT* of range. */
while (x->level[i].forward && while (x->level[i].forward &&
!zslLexValueGteMin(x->level[i].forward->obj,&range)) !zslLexValueGteMin(x->level[i].forward->obj,range))
x = x->level[i].forward; x = x->level[i].forward;
} }
@ -567,24 +569,24 @@ zskiplistNode *zslFirstInLexRange(zskiplist *zsl, zlexrangespec range) {
redisAssert(x != NULL); redisAssert(x != NULL);
/* Check if score <= max. */ /* Check if score <= max. */
if (!zslLexValueLteMax(x->obj,&range)) return NULL; if (!zslLexValueLteMax(x->obj,range)) return NULL;
return x; return x;
} }
/* Find the last node that is contained in the specified range. /* Find the last node that is contained in the specified range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
zskiplistNode *zslLastInLexRange(zskiplist *zsl, zlexrangespec range) { zskiplistNode *zslLastInLexRange(zskiplist *zsl, zlexrangespec *range) {
zskiplistNode *x; zskiplistNode *x;
int i; int i;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zslIsInLexRange(zsl,&range)) return NULL; if (!zslIsInLexRange(zsl,range)) return NULL;
x = zsl->header; x = zsl->header;
for (i = zsl->level-1; i >= 0; i--) { for (i = zsl->level-1; i >= 0; i--) {
/* Go forward while *IN* range. */ /* Go forward while *IN* range. */
while (x->level[i].forward && while (x->level[i].forward &&
zslLexValueLteMax(x->level[i].forward->obj,&range)) zslLexValueLteMax(x->level[i].forward->obj,range))
x = x->level[i].forward; x = x->level[i].forward;
} }
@ -592,7 +594,7 @@ zskiplistNode *zslLastInLexRange(zskiplist *zsl, zlexrangespec range) {
redisAssert(x != NULL); redisAssert(x != NULL);
/* Check if score >= min. */ /* Check if score >= min. */
if (!zslLexValueGteMin(x->obj,&range)) return NULL; if (!zslLexValueGteMin(x->obj,range)) return NULL;
return x; return x;
} }
@ -730,21 +732,21 @@ int zzlIsInRange(unsigned char *zl, zrangespec *range) {
/* Find pointer to the first element contained in the specified range. /* Find pointer to the first element contained in the specified range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
unsigned char *zzlFirstInRange(unsigned char *zl, zrangespec range) { unsigned char *zzlFirstInRange(unsigned char *zl, zrangespec *range) {
unsigned char *eptr = ziplistIndex(zl,0), *sptr; unsigned char *eptr = ziplistIndex(zl,0), *sptr;
double score; double score;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zzlIsInRange(zl,&range)) return NULL; if (!zzlIsInRange(zl,range)) return NULL;
while (eptr != NULL) { while (eptr != NULL) {
sptr = ziplistNext(zl,eptr); sptr = ziplistNext(zl,eptr);
redisAssert(sptr != NULL); redisAssert(sptr != NULL);
score = zzlGetScore(sptr); score = zzlGetScore(sptr);
if (zslValueGteMin(score,&range)) { if (zslValueGteMin(score,range)) {
/* Check if score <= max. */ /* Check if score <= max. */
if (zslValueLteMax(score,&range)) if (zslValueLteMax(score,range))
return eptr; return eptr;
return NULL; return NULL;
} }
@ -758,21 +760,21 @@ unsigned char *zzlFirstInRange(unsigned char *zl, zrangespec range) {
/* Find pointer to the last element contained in the specified range. /* Find pointer to the last element contained in the specified range.
* Returns NULL when no element is contained in the range. */ * Returns NULL when no element is contained in the range. */
unsigned char *zzlLastInRange(unsigned char *zl, zrangespec range) { unsigned char *zzlLastInRange(unsigned char *zl, zrangespec *range) {
unsigned char *eptr = ziplistIndex(zl,-2), *sptr; unsigned char *eptr = ziplistIndex(zl,-2), *sptr;
double score; double score;
/* If everything is out of range, return early. */ /* If everything is out of range, return early. */
if (!zzlIsInRange(zl,&range)) return NULL; if (!zzlIsInRange(zl,range)) return NULL;
while (eptr != NULL) { while (eptr != NULL) {
sptr = ziplistNext(zl,eptr); sptr = ziplistNext(zl,eptr);
redisAssert(sptr != NULL); redisAssert(sptr != NULL);
score = zzlGetScore(sptr); score = zzlGetScore(sptr);
if (zslValueLteMax(score,&range)) { if (zslValueLteMax(score,range)) {
/* Check if score >= min. */ /* Check if score >= min. */
if (zslValueGteMin(score,&range)) if (zslValueGteMin(score,range))
return eptr; return eptr;
return NULL; return NULL;
} }
@ -977,7 +979,7 @@ unsigned char *zzlInsert(unsigned char *zl, robj *ele, double score) {
return zl; return zl;
} }
unsigned char *zzlDeleteRangeByScore(unsigned char *zl, zrangespec range, unsigned long *deleted) { unsigned char *zzlDeleteRangeByScore(unsigned char *zl, zrangespec *range, unsigned long *deleted) {
unsigned char *eptr, *sptr; unsigned char *eptr, *sptr;
double score; double score;
unsigned long num = 0; unsigned long num = 0;
@ -991,7 +993,7 @@ unsigned char *zzlDeleteRangeByScore(unsigned char *zl, zrangespec range, unsign
* byte and ziplistNext will return NULL. */ * byte and ziplistNext will return NULL. */
while ((sptr = ziplistNext(zl,eptr)) != NULL) { while ((sptr = ziplistNext(zl,eptr)) != NULL) {
score = zzlGetScore(sptr); score = zzlGetScore(sptr);
if (zslValueLteMax(score,&range)) { if (zslValueLteMax(score,range)) {
/* Delete both the element and the score. */ /* Delete both the element and the score. */
zl = ziplistDelete(zl,&eptr); zl = ziplistDelete(zl,&eptr);
zl = ziplistDelete(zl,&eptr); zl = ziplistDelete(zl,&eptr);
@ -1364,7 +1366,7 @@ void zremrangeGenericCommand(redisClient *c, int rangetype) {
zobj->ptr = zzlDeleteRangeByRank(zobj->ptr,start+1,end+1,&deleted); zobj->ptr = zzlDeleteRangeByRank(zobj->ptr,start+1,end+1,&deleted);
break; break;
case ZRANGE_SCORE: case ZRANGE_SCORE:
zobj->ptr = zzlDeleteRangeByScore(zobj->ptr,range,&deleted); zobj->ptr = zzlDeleteRangeByScore(zobj->ptr,&range,&deleted);
break; break;
} }
if (zzlLength(zobj->ptr) == 0) { if (zzlLength(zobj->ptr) == 0) {
@ -1378,7 +1380,7 @@ void zremrangeGenericCommand(redisClient *c, int rangetype) {
deleted = zslDeleteRangeByRank(zs->zsl,start+1,end+1,zs->dict); deleted = zslDeleteRangeByRank(zs->zsl,start+1,end+1,zs->dict);
break; break;
case ZRANGE_SCORE: case ZRANGE_SCORE:
deleted = zslDeleteRangeByScore(zs->zsl,range,zs->dict); deleted = zslDeleteRangeByScore(zs->zsl,&range,zs->dict);
break; break;
} }
if (htNeedsResize(zs->dict)) dictResize(zs->dict); if (htNeedsResize(zs->dict)) dictResize(zs->dict);
@ -2153,9 +2155,9 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse) {
/* 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. */
@ -2221,9 +2223,9 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse) {
/* 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. */
@ -2310,7 +2312,7 @@ void zcountCommand(redisClient *c) {
double score; double score;
/* Use the first element in range as the starting point */ /* Use the first element in range as the starting point */
eptr = zzlFirstInRange(zl,range); eptr = zzlFirstInRange(zl,&range);
/* No "first" element */ /* No "first" element */
if (eptr == NULL) { if (eptr == NULL) {
@ -2342,7 +2344,7 @@ void zcountCommand(redisClient *c) {
unsigned long rank; unsigned long rank;
/* Find first element in range */ /* Find first element in range */
zn = zslFirstInRange(zsl, range); zn = zslFirstInRange(zsl, &range);
/* Use rank of first element, if any, to determine preliminary count */ /* Use rank of first element, if any, to determine preliminary count */
if (zn != NULL) { if (zn != NULL) {
@ -2350,7 +2352,7 @@ void zcountCommand(redisClient *c) {
count = (zsl->length - (rank - 1)); count = (zsl->length - (rank - 1));
/* Find last element in range */ /* Find last element in range */
zn = zslLastInRange(zsl, range); zn = zslLastInRange(zsl, &range);
/* Use rank of last element, if any, to determine the actual count */ /* Use rank of last element, if any, to determine the actual count */
if (zn != NULL) { if (zn != NULL) {
@ -2420,7 +2422,7 @@ void zlexcountCommand(redisClient *c) {
unsigned long rank; unsigned long rank;
/* Find first element in range */ /* Find first element in range */
zn = zslFirstInLexRange(zsl, range); zn = zslFirstInLexRange(zsl, &range);
/* Use rank of first element, if any, to determine preliminary count */ /* Use rank of first element, if any, to determine preliminary count */
if (zn != NULL) { if (zn != NULL) {
@ -2428,7 +2430,7 @@ void zlexcountCommand(redisClient *c) {
count = (zsl->length - (rank - 1)); count = (zsl->length - (rank - 1));
/* Find last element in range */ /* Find last element in range */
zn = zslLastInLexRange(zsl, range); zn = zslLastInLexRange(zsl, &range);
/* Use rank of last element, if any, to determine the actual count */ /* Use rank of last element, if any, to determine the actual count */
if (zn != NULL) { if (zn != NULL) {
@ -2568,9 +2570,9 @@ void genericZrangebylexCommand(redisClient *c, int reverse) {
/* 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 = zslLastInLexRange(zsl,range); ln = zslLastInLexRange(zsl,&range);
} else { } else {
ln = zslFirstInLexRange(zsl,range); ln = zslFirstInLexRange(zsl,&range);
} }
/* No "first" element in the specified interval. */ /* No "first" element in the specified interval. */