diff options
author | perryitay <85821686+perryitay@users.noreply.github.com> | 2021-11-03 20:47:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-03 20:47:18 +0200 |
commit | f27083a4a8a6682e391a533724c904c69852c0a0 (patch) | |
tree | 74a12c1cbb3f7885ef5275a96227b12925efc114 /src/rdb.c | |
parent | f11a2d4dd764c996b2d0c0cb5abde13f2445b40c (diff) | |
download | redis-f27083a4a8a6682e391a533724c904c69852c0a0.tar.gz |
Add support for list type to store elements larger than 4GB (#9357)
Redis lists are stored in quicklist, which is currently a linked list of ziplists.
Ziplists are limited to storing elements no larger than 4GB, so when bigger
items are added they're getting truncated.
This PR changes quicklists so that they're capable of storing large items
in quicklist nodes that are plain string buffers rather than ziplist.
As part of the PR there were few other changes in redis:
1. new DEBUG sub-commands:
- QUICKLIST-PACKED-THRESHOLD - set the threshold of for the node type to
be plan or ziplist. default (1GB)
- QUICKLIST <key> - Shows low level info about the quicklist encoding of <key>
2. rdb format change:
- A new type was added - RDB_TYPE_LIST_QUICKLIST_2 .
- container type (packed / plain) was added to the beginning of the rdb object
(before the actual node list).
3. testing:
- Tests that requires over 100MB will be by default skipped. a new flag was
added to 'runtest' to run the large memory tests (not used by default)
Co-authored-by: sundb <sundbcn@gmail.com>
Co-authored-by: Oran Agra <oran@redislabs.com>
Diffstat (limited to 'src/rdb.c')
-rw-r--r-- | src/rdb.c | 47 |
1 files changed, 36 insertions, 11 deletions
@@ -658,7 +658,7 @@ int rdbSaveObjectType(rio *rdb, robj *o) { return rdbSaveType(rdb,RDB_TYPE_STRING); case OBJ_LIST: if (o->encoding == OBJ_ENCODING_QUICKLIST) - return rdbSaveType(rdb,RDB_TYPE_LIST_QUICKLIST); + return rdbSaveType(rdb, RDB_TYPE_LIST_QUICKLIST_2); else serverPanic("Unknown list encoding"); case OBJ_SET: @@ -813,13 +813,16 @@ ssize_t rdbSaveObject(rio *rdb, robj *o, robj *key, int dbid) { nwritten += n; while(node) { + if ((n = rdbSaveLen(rdb,node->container)) == -1) return -1; + nwritten += n; + if (quicklistNodeIsCompressed(node)) { void *data; size_t compress_len = quicklistGetLzf(node, &data); if ((n = rdbSaveLzfBlob(rdb,data,compress_len,node->sz)) == -1) return -1; nwritten += n; } else { - if ((n = rdbSaveRawString(rdb,node->zl,node->sz)) == -1) return -1; + if ((n = rdbSaveRawString(rdb,node->entry,node->sz)) == -1) return -1; nwritten += n; } node = node->next; @@ -1934,36 +1937,58 @@ robj *rdbLoadObject(int rdbtype, rio *rdb, sds key, int dbid, int *error) { /* All pairs should be read by now */ serverAssert(len == 0); - } else if (rdbtype == RDB_TYPE_LIST_QUICKLIST) { + } else if (rdbtype == RDB_TYPE_LIST_QUICKLIST || rdbtype == RDB_TYPE_LIST_QUICKLIST_2) { if ((len = rdbLoadLen(rdb,NULL)) == RDB_LENERR) return NULL; if (len == 0) goto emptykey; o = createQuicklistObject(); quicklistSetOptions(o->ptr, server.list_max_ziplist_size, server.list_compress_depth); - + uint64_t container = QUICKLIST_NODE_CONTAINER_ZIPLIST; while (len--) { size_t encoded_len; - unsigned char *zl = + + if (rdbtype == RDB_TYPE_LIST_QUICKLIST_2) { + if ((container = rdbLoadLen(rdb,NULL)) == RDB_LENERR) { + decrRefCount(o); + return NULL; + } + + if (container != QUICKLIST_NODE_CONTAINER_ZIPLIST && container != QUICKLIST_NODE_CONTAINER_PLAIN) { + rdbReportCorruptRDB("Quicklist integrity check failed."); + decrRefCount(o); + return NULL; + } + } + + unsigned char *data = rdbGenericLoadStringObject(rdb,RDB_LOAD_PLAIN,&encoded_len); - if (zl == NULL) { + if (data == NULL || (encoded_len == 0)) { + zfree(data); decrRefCount(o); return NULL; } + + if (container == QUICKLIST_NODE_CONTAINER_PLAIN) { + quicklistAppendPlainNode(o->ptr, data, encoded_len); + zfree(data); + continue; + } + if (deep_integrity_validation) server.stat_dump_payload_sanitizations++; - if (!ziplistValidateIntegrity(zl, encoded_len, deep_integrity_validation, NULL, NULL)) { + if (!ziplistValidateIntegrity(data, encoded_len, deep_integrity_validation, NULL, NULL)) { rdbReportCorruptRDB("Ziplist integrity check failed."); decrRefCount(o); - zfree(zl); + zfree(data); return NULL; } /* Silently skip empty ziplists, if we'll end up with empty quicklist we'll fail later. */ - if (ziplistLen(zl) == 0) { - zfree(zl); + if (ziplistLen(data) == 0) { + zfree(data); continue; } else { - quicklistAppendZiplist(o->ptr, zl); + quicklistAppendZiplist(o->ptr, data); } } |