Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
24036b4d
Commit
24036b4d
authored
Apr 22, 2018
by
zhaozhao.zz
Browse files
RDB: expand dict if needed when rdb load object
parent
aba76320
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
24036b4d
...
@@ -1427,6 +1427,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
...
@@ -1427,6 +1427,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
o = createZsetObject();
o = createZsetObject();
zs = o->ptr;
zs = o->ptr;
if (zsetlen > DICT_HT_INITIAL_SIZE)
dictExpand(zs->dict,zsetlen);
/* Load every single element of the sorted set. */
/* Load every single element of the sorted set. */
while(zsetlen--) {
while(zsetlen--) {
sds sdsele;
sds sdsele;
...
@@ -1495,6 +1498,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
...
@@ -1495,6 +1498,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
sdsfree(value);
sdsfree(value);
}
}
if (o->encoding == OBJ_ENCODING_HT && len > DICT_HT_INITIAL_SIZE)
dictExpand(o->ptr,len);
/* Load remaining fields and values into the hash table */
/* Load remaining fields and values into the hash table */
while (o->encoding == OBJ_ENCODING_HT && len > 0) {
while (o->encoding == OBJ_ENCODING_HT && len > 0) {
len--;
len--;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment