From 02bb515a094c081fcbc3e33c60a5dbff440eb447 Mon Sep 17 00:00:00 2001 From: Matt Stancliff Date: Tue, 16 Dec 2014 00:49:14 -0500 Subject: Config: Add quicklist, remove old list options This removes: - list-max-ziplist-entries - list-max-ziplist-value This adds: - list-max-ziplist-size - list-compress-depth Also updates config file with new sections and updates tests to use quicklist settings instead of old list settings. --- src/rdb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/rdb.c') diff --git a/src/rdb.c b/src/rdb.c index 209a0da11..53b47e4f0 100644 --- a/src/rdb.c +++ b/src/rdb.c @@ -835,15 +835,15 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) { if ((len = rdbLoadLen(rdb,NULL)) == REDIS_RDB_LENERR) return NULL; o = createQuicklistObject(); - quicklistSetFill(o->ptr, server.list_max_ziplist_entries); - quicklistSetCompress(o->ptr, 0 /*FIXME*/); + quicklistSetOptions(o->ptr, server.list_max_ziplist_size, + server.list_compress_depth); /* Load every single element of the list */ while(len--) { if ((ele = rdbLoadEncodedStringObject(rdb)) == NULL) return NULL; dec = getDecodedObject(ele); size_t len = sdslen(dec->ptr); - o->ptr = quicklistPushTail(o->ptr, dec->ptr, len); + quicklistPushTail(o->ptr, dec->ptr, len); decrRefCount(dec); decrRefCount(ele); } @@ -985,6 +985,8 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) { } else if (rdbtype == REDIS_RDB_TYPE_LIST_QUICKLIST) { if ((len = rdbLoadLen(rdb,NULL)) == REDIS_RDB_LENERR) return NULL; o = createQuicklistObject(); + quicklistSetOptions(o->ptr, server.list_max_ziplist_size, + server.list_compress_depth); while (len--) { if ((ele = rdbLoadStringObject(rdb)) == NULL) return NULL; -- cgit v1.2.1