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

ZSET now saved on disk like any other type

Browse Source
This commit is contained in:
antirez 2009-10-26 18:47:12 +01:00
parent a7866db6cc
commit 2b59cfdfe9
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
redis.c
View File

@ -379,6 +379,7 @@ static size_t stringObjectLen(robj *o);
static void processInputBuffer(redisClient *c); static void processInputBuffer(redisClient *c);
static zskiplist *zslCreate(void); static zskiplist *zslCreate(void);
static void zslFree(zskiplist *zsl); static void zslFree(zskiplist *zsl);
static void zslInsert(zskiplist *zsl, double score, robj *obj);
static void authCommand(redisClient *c); static void authCommand(redisClient *c);
static void pingCommand(redisClient *c); static void pingCommand(redisClient *c);
@ -2352,6 +2353,21 @@ static int rdbSave(char *filename) {
if (rdbSaveStringObject(fp,eleobj) == -1) goto werr; if (rdbSaveStringObject(fp,eleobj) == -1) goto werr;
} }
dictReleaseIterator(di); dictReleaseIterator(di);
} else if (o->type == REDIS_ZSET) {
/* Save a set value */
zset *zs = o->ptr;
dictIterator *di = dictGetIterator(zs->dict);
dictEntry *de;
if (rdbSaveLen(fp,dictSize(zs->dict)) == -1) goto werr;
while((de = dictNext(di)) != NULL) {
robj *eleobj = dictGetEntryKey(de);
double *score = dictGetEntryVal(de);
if (rdbSaveStringObject(fp,eleobj) == -1) goto werr;
if (rdbSaveDoubleValue(fp,*score) == -1) goto werr;
}
dictReleaseIterator(di);
} else { } else {
assert(0 != 0); assert(0 != 0);
} }
@ -2631,6 +2647,27 @@ static int rdbLoad(char *filename) {
dictAdd((dict*)o->ptr,ele,NULL); dictAdd((dict*)o->ptr,ele,NULL);
} }
} }
} else if (type == REDIS_ZSET) {
/* Read list/set value */
uint32_t zsetlen;
zset *zs;
if ((zsetlen = rdbLoadLen(fp,rdbver,NULL)) == REDIS_RDB_LENERR)
goto eoferr;
o = createZsetObject();
zs = o->ptr;
/* Load every single element of the list/set */
while(zsetlen--) {
robj *ele;
double *score = zmalloc(sizeof(double));
if ((ele = rdbLoadStringObject(fp,rdbver)) == NULL) goto eoferr;
tryObjectEncoding(ele);
if (rdbLoadDoubleValue(fp,score) == -1) goto eoferr;
dictAdd(zs->dict,ele,score);
zslInsert(zs->zsl,*score,ele);
incrRefCount(ele); /* added to skiplist */
}
} else { } else {
assert(0 != 0); assert(0 != 0);
} }
@ -5114,6 +5151,8 @@ static struct redisFunctionSym symsTable[] = {
{"zrangeCommand",(unsigned long)zrangeCommand}, {"zrangeCommand",(unsigned long)zrangeCommand},
{"zrevrangeCommand",(unsigned long)zrevrangeCommand}, {"zrevrangeCommand",(unsigned long)zrevrangeCommand},
{"zremCommand",(unsigned long)zremCommand}, {"zremCommand",(unsigned long)zremCommand},
{"rdbSaveDoubleValue",(unsigned long)rdbSaveDoubleValue},
{"rdbLoadDoubleValue",(unsigned long)rdbLoadDoubleValue},
{NULL,0} {NULL,0}
}; };