Merge pull request #3949 from spinlock/unstable-rdb-encoding

rdb: saving skiplist in reversed order to accelerate the deserialisation process
This commit is contained in:
Salvatore Sanfilippo 2017-04-18 10:56:57 +02:00 committed by GitHub
commit 0a942f1751

View File

@ -704,23 +704,24 @@ ssize_t rdbSaveObject(rio *rdb, robj *o) {
nwritten += n; nwritten += n;
} else if (o->encoding == OBJ_ENCODING_SKIPLIST) { } else if (o->encoding == OBJ_ENCODING_SKIPLIST) {
zset *zs = o->ptr; zset *zs = o->ptr;
dictIterator *di = dictGetIterator(zs->dict); zskiplist *zsl = zs->zsl;
dictEntry *de;
if ((n = rdbSaveLen(rdb,dictSize(zs->dict))) == -1) return -1; if ((n = rdbSaveLen(rdb,zsl->length)) == -1) return -1;
nwritten += n; nwritten += n;
while((de = dictNext(di)) != NULL) { zskiplistNode *zn = zsl->tail;
sds ele = dictGetKey(de); while (zn != NULL) {
double *score = dictGetVal(de); sds ele = zn->ele;
double *score = &zn->score;
if ((n = rdbSaveRawString(rdb,(unsigned char*)ele,sdslen(ele))) if ((n = rdbSaveRawString(rdb,(unsigned char*)ele,sdslen(ele)))
== -1) return -1; == -1) return -1;
nwritten += n; nwritten += n;
if ((n = rdbSaveBinaryDoubleValue(rdb,*score)) == -1) return -1; if ((n = rdbSaveBinaryDoubleValue(rdb,*score)) == -1) return -1;
nwritten += n; nwritten += n;
zn = zn->backward;
} }
dictReleaseIterator(di);
} else { } else {
serverPanic("Unknown sorted set encoding"); serverPanic("Unknown sorted set encoding");
} }