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
9fa2e702
Unverified
Commit
9fa2e702
authored
Jun 08, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Jun 08, 2018
Browse files
Merge pull request #4861 from soloestoy/rdb-dict-expand
RDB: expand dict if needed when rdb load object
parents
269e8052
24036b4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
9fa2e702
...
...
@@ -1441,6 +1441,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
o
=
createZsetObject
();
zs
=
o
->
ptr
;
if
(
zsetlen
>
DICT_HT_INITIAL_SIZE
)
dictExpand
(
zs
->
dict
,
zsetlen
);
/* Load every single element of the sorted set. */
while
(
zsetlen
--
)
{
sds
sdsele
;
...
...
@@ -1509,6 +1512,9 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
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 */
while
(
o
->
encoding
==
OBJ_ENCODING_HT
&&
len
>
0
)
{
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