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

Make zzl API unaware of the robj where the ziplist is stored

Browse Source
This commit is contained in:
Pieter Noordhuis 2011-03-11 17:06:07 +01:00
parent df26a0ae0b
commit 8588bfa370
2 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.h
View File

@ -799,7 +799,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal);
zskiplist *zslCreate(void); zskiplist *zslCreate(void);
void zslFree(zskiplist *zsl); void zslFree(zskiplist *zsl);
zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj); zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj);
int zzlInsert(robj *zobj, robj *ele, double score); unsigned char *zzlInsert(unsigned char *zl, robj *ele, double score);
unsigned int zsetLength(robj *zobj); unsigned int zsetLength(robj *zobj);
void zsetConvert(robj *zobj, int encoding); void zsetConvert(robj *zobj, int encoding);

85
src/t_zset.c
View File

@ -519,8 +519,7 @@ 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(robj *zobj, zrangespec range) { unsigned char *zzlFirstInRange(unsigned char *zl, zrangespec range) {
unsigned char *zl = zobj->ptr;
unsigned char *eptr = ziplistIndex(zl,0), *sptr; unsigned char *eptr = ziplistIndex(zl,0), *sptr;
double score; double score;
@ -544,8 +543,7 @@ unsigned char *zzlFirstInRange(robj *zobj, 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(robj *zobj, zrangespec range) { unsigned char *zzlLastInRange(unsigned char *zl, zrangespec range) {
unsigned char *zl = zobj->ptr;
unsigned char *eptr = ziplistIndex(zl,-2), *sptr; unsigned char *eptr = ziplistIndex(zl,-2), *sptr;
double score; double score;
@ -572,8 +570,7 @@ unsigned char *zzlLastInRange(robj *zobj, zrangespec range) {
return NULL; return NULL;
} }
unsigned char *zzlFind(robj *zobj, robj *ele, double *score) { unsigned char *zzlFind(unsigned char *zl, robj *ele, double *score) {
unsigned char *zl = zobj->ptr;
unsigned char *eptr = ziplistIndex(zl,0), *sptr; unsigned char *eptr = ziplistIndex(zl,0), *sptr;
ele = getDecodedObject(ele); ele = getDecodedObject(ele);
@ -598,19 +595,16 @@ unsigned char *zzlFind(robj *zobj, robj *ele, double *score) {
/* Delete (element,score) pair from ziplist. Use local copy of eptr because we /* Delete (element,score) pair from ziplist. Use local copy of eptr because we
* don't want to modify the one given as argument. */ * don't want to modify the one given as argument. */
int zzlDelete(robj *zobj, unsigned char *eptr) { unsigned char *zzlDelete(unsigned char *zl, unsigned char *eptr) {
unsigned char *zl = zobj->ptr;
unsigned char *p = eptr; unsigned char *p = eptr;
/* TODO: add function to ziplist API to delete N elements from offset. */ /* TODO: add function to ziplist API to delete N elements from offset. */
zl = ziplistDelete(zl,&p); zl = ziplistDelete(zl,&p);
zl = ziplistDelete(zl,&p); zl = ziplistDelete(zl,&p);
zobj->ptr = zl; return zl;
return REDIS_OK;
} }
int zzlInsertAt(robj *zobj, robj *ele, double score, unsigned char *eptr) { unsigned char *zzlInsertAt(unsigned char *zl, unsigned char *eptr, robj *ele, double score) {
unsigned char *zl = zobj->ptr;
unsigned char *sptr; unsigned char *sptr;
char scorebuf[128]; char scorebuf[128];
int scorelen; int scorelen;
@ -632,14 +626,12 @@ int zzlInsertAt(robj *zobj, robj *ele, double score, unsigned char *eptr) {
zl = ziplistInsert(zl,sptr,(unsigned char*)scorebuf,scorelen); zl = ziplistInsert(zl,sptr,(unsigned char*)scorebuf,scorelen);
} }
zobj->ptr = zl; return zl;
return REDIS_OK;
} }
/* Insert (element,score) pair in ziplist. This function assumes the element is /* Insert (element,score) pair in ziplist. This function assumes the element is
* not yet present in the list. */ * not yet present in the list. */
int zzlInsert(robj *zobj, robj *ele, double score) { unsigned char *zzlInsert(unsigned char *zl, robj *ele, double score) {
unsigned char *zl = zobj->ptr;
unsigned char *eptr = ziplistIndex(zl,0), *sptr; unsigned char *eptr = ziplistIndex(zl,0), *sptr;
double s; double s;
@ -653,12 +645,12 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
/* First element with score larger than score for element to be /* First element with score larger than score for element to be
* inserted. This means we should take its spot in the list to * inserted. This means we should take its spot in the list to
* maintain ordering. */ * maintain ordering. */
zzlInsertAt(zobj,ele,score,eptr); zl = zzlInsertAt(zl,eptr,ele,score);
break; break;
} else if (s == score) { } else if (s == score) {
/* Ensure lexicographical ordering for elements. */ /* Ensure lexicographical ordering for elements. */
if (zzlCompareElements(eptr,ele->ptr,sdslen(ele->ptr)) > 0) { if (zzlCompareElements(eptr,ele->ptr,sdslen(ele->ptr)) > 0) {
zzlInsertAt(zobj,ele,score,eptr); zl = zzlInsertAt(zl,eptr,ele,score);
break; break;
} }
} }
@ -669,21 +661,21 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
/* Push on tail of list when it was not yet inserted. */ /* Push on tail of list when it was not yet inserted. */
if (eptr == NULL) if (eptr == NULL)
zzlInsertAt(zobj,ele,score,NULL); zl = zzlInsertAt(zl,NULL,ele,score);
decrRefCount(ele); decrRefCount(ele);
return REDIS_OK; return zl;
} }
unsigned long zzlDeleteRangeByScore(robj *zobj, zrangespec range) { unsigned char *zzlDeleteRangeByScore(unsigned char *zl, zrangespec range, unsigned long *deleted) {
unsigned char *zl = zobj->ptr;
unsigned char *eptr, *sptr; unsigned char *eptr, *sptr;
double score; double score;
unsigned long deleted = 0; unsigned long num = 0;
eptr = zzlFirstInRange(zobj,range); if (deleted != NULL) *deleted = 0;
if (eptr == NULL) return deleted;
eptr = zzlFirstInRange(zl,range);
if (eptr == NULL) return zl;
/* When the tail of the ziplist is deleted, eptr will point to the sentinel /* When the tail of the ziplist is deleted, eptr will point to the sentinel
* byte and ziplistNext will return NULL. */ * byte and ziplistNext will return NULL. */
@ -693,22 +685,24 @@ unsigned long zzlDeleteRangeByScore(robj *zobj, zrangespec 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);
deleted++; num++;
} else { } else {
/* No longer in range. */ /* No longer in range. */
break; break;
} }
} }
return deleted; if (deleted != NULL) *deleted = num;
return zl;
} }
/* Delete all the elements with rank between start and end from the skiplist. /* Delete all the elements with rank between start and end from the skiplist.
* Start and end are inclusive. Note that start and end need to be 1-based */ * Start and end are inclusive. Note that start and end need to be 1-based */
unsigned long zzlDeleteRangeByRank(robj *zobj, unsigned int start, unsigned int end) { unsigned char *zzlDeleteRangeByRank(unsigned char *zl, unsigned int start, unsigned int end, unsigned long *deleted) {
unsigned int num = (end-start)+1; unsigned int num = (end-start)+1;
zobj->ptr = ziplistDeleteRange(zobj->ptr,2*(start-1),2*num); if (deleted) *deleted = num;
return num; zl = ziplistDeleteRange(zl,2*(start-1),2*num);
return zl;
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
@ -785,13 +779,9 @@ void zsetConvert(robj *zobj, int encoding) {
zfree(zs->zsl->header); zfree(zs->zsl->header);
zfree(zs->zsl); zfree(zs->zsl);
/* Immediately store pointer to ziplist in object because it will
* change because of reallocations when pushing to the ziplist. */
zobj->ptr = zl;
while (node) { while (node) {
ele = getDecodedObject(node->obj); ele = getDecodedObject(node->obj);
redisAssert(zzlInsertAt(zobj,ele,node->score,NULL) == REDIS_OK); zl = zzlInsertAt(zl,NULL,ele,node->score);
decrRefCount(ele); decrRefCount(ele);
next = node->level[0].forward; next = node->level[0].forward;
@ -800,6 +790,7 @@ void zsetConvert(robj *zobj, int encoding) {
} }
zfree(zs); zfree(zs);
zobj->ptr = zl;
zobj->encoding = REDIS_ENCODING_ZIPLIST; zobj->encoding = REDIS_ENCODING_ZIPLIST;
} else { } else {
redisPanic("Unknown sorted set encoding"); redisPanic("Unknown sorted set encoding");
@ -844,7 +835,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
/* Prefer non-encoded element when dealing with ziplists. */ /* Prefer non-encoded element when dealing with ziplists. */
ele = c->argv[3]; ele = c->argv[3];
if ((eptr = zzlFind(zobj,ele,&curscore)) != NULL) { if ((eptr = zzlFind(zobj->ptr,ele,&curscore)) != NULL) {
if (incr) { if (incr) {
score += curscore; score += curscore;
if (isnan(score)) { if (isnan(score)) {
@ -857,8 +848,8 @@ void zaddGenericCommand(redisClient *c, int incr) {
/* Remove and re-insert when score changed. */ /* Remove and re-insert when score changed. */
if (score != curscore) { if (score != curscore) {
redisAssert(zzlDelete(zobj,eptr) == REDIS_OK); zobj->ptr = zzlDelete(zobj->ptr,eptr);
redisAssert(zzlInsert(zobj,ele,score) == REDIS_OK); zobj->ptr = zzlInsert(zobj->ptr,ele,score);
signalModifiedKey(c->db,key); signalModifiedKey(c->db,key);
server.dirty++; server.dirty++;
@ -871,7 +862,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
} else { } else {
/* Optimize: check if the element is too large or the list becomes /* Optimize: check if the element is too large or the list becomes
* too long *before* executing zzlInsert. */ * too long *before* executing zzlInsert. */
redisAssert(zzlInsert(zobj,ele,score) == REDIS_OK); zobj->ptr = zzlInsert(zobj->ptr,ele,score);
if (zzlLength(zobj->ptr) > server.zset_max_ziplist_entries) if (zzlLength(zobj->ptr) > server.zset_max_ziplist_entries)
zsetConvert(zobj,REDIS_ENCODING_RAW); zsetConvert(zobj,REDIS_ENCODING_RAW);
if (sdslen(ele->ptr) > server.zset_max_ziplist_value) if (sdslen(ele->ptr) > server.zset_max_ziplist_value)
@ -961,8 +952,8 @@ void zremCommand(redisClient *c) {
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) { if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
unsigned char *eptr; unsigned char *eptr;
if ((eptr = zzlFind(zobj,ele,NULL)) != NULL) { if ((eptr = zzlFind(zobj->ptr,ele,NULL)) != NULL) {
redisAssert(zzlDelete(zobj,eptr) == REDIS_OK); zobj->ptr = zzlDelete(zobj->ptr,eptr);
if (zzlLength(zobj->ptr) == 0) dbDelete(c->db,key); if (zzlLength(zobj->ptr) == 0) dbDelete(c->db,key);
} else { } else {
addReply(c,shared.czero); addReply(c,shared.czero);
@ -1012,7 +1003,7 @@ void zremrangebyscoreCommand(redisClient *c) {
checkType(c,zobj,REDIS_ZSET)) return; checkType(c,zobj,REDIS_ZSET)) return;
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) { if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
deleted = zzlDeleteRangeByScore(zobj,range); zobj->ptr = zzlDeleteRangeByScore(zobj->ptr,range,&deleted);
} else if (zobj->encoding == REDIS_ENCODING_RAW) { } else if (zobj->encoding == REDIS_ENCODING_RAW) {
zset *zs = zobj->ptr; zset *zs = zobj->ptr;
deleted = zslDeleteRangeByScore(zs->zsl,range,zs->dict); deleted = zslDeleteRangeByScore(zs->zsl,range,zs->dict);
@ -1057,7 +1048,7 @@ void zremrangebyrankCommand(redisClient *c) {
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) { if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
/* Correct for 1-based rank. */ /* Correct for 1-based rank. */
deleted = zzlDeleteRangeByRank(zobj,start+1,end+1); zobj->ptr = zzlDeleteRangeByRank(zobj->ptr,start+1,end+1,&deleted);
} else if (zobj->encoding == REDIS_ENCODING_RAW) { } else if (zobj->encoding == REDIS_ENCODING_RAW) {
zset *zs = zobj->ptr; zset *zs = zobj->ptr;
@ -1372,7 +1363,7 @@ int zuiFind(zsetopsrc *op, zsetopval *val, double *score) {
zuiObjectFromValue(val); zuiObjectFromValue(val);
if (op->encoding == REDIS_ENCODING_ZIPLIST) { if (op->encoding == REDIS_ENCODING_ZIPLIST) {
if (zzlFind(op->subject,val->ele,score) != NULL) { if (zzlFind(it->zl.zl,val->ele,score) != NULL) {
/* Score is already set by zzlFind. */ /* Score is already set by zzlFind. */
return 1; return 1;
} else { } else {
@ -1791,9 +1782,9 @@ void genericZrangebyscoreCommand(redisClient *c, int reverse, int justcount) {
/* 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(zobj,range); eptr = zzlLastInRange(zl,range);
else else
eptr = zzlFirstInRange(zobj,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) {
@ -1938,7 +1929,7 @@ void zscoreCommand(redisClient *c) {
checkType(c,zobj,REDIS_ZSET)) return; checkType(c,zobj,REDIS_ZSET)) return;
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) { if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
if (zzlFind(zobj,c->argv[2],&score) != NULL) if (zzlFind(zobj->ptr,c->argv[2],&score) != NULL)
addReplyDouble(c,score); addReplyDouble(c,score);
else else
addReply(c,shared.nullbulk); addReply(c,shared.nullbulk);