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
bb039e85
Commit
bb039e85
authored
Jun 13, 2010
by
antirez
Browse files
fixed a bug in rdbLoadObject abount specially encoded objects
parent
a8dca69b
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
bb039e85
...
@@ -4250,8 +4250,10 @@ static robj *rdbLoadObject(int type, FILE *fp) {
...
@@ -4250,8 +4250,10 @@ static robj *rdbLoadObject(int type, FILE *fp) {
/* If we are using a zipmap and there are too big values
/* If we are using a zipmap and there are too big values
* the object is converted to real hash table encoding. */
* the object is converted to real hash table encoding. */
if
(
o
->
encoding
!=
REDIS_ENCODING_HT
&&
if
(
o
->
encoding
!=
REDIS_ENCODING_HT
&&
(
sdslen
(
key
->
ptr
)
>
server
.
hash_max_zipmap_value
||
((
key
->
encoding
==
REDIS_ENCODING_RAW
&&
sdslen
(
val
->
ptr
)
>
server
.
hash_max_zipmap_value
))
sdslen
(
key
->
ptr
)
>
server
.
hash_max_zipmap_value
)
||
(
val
->
encoding
==
REDIS_ENCODING_RAW
&&
sdslen
(
val
->
ptr
)
>
server
.
hash_max_zipmap_value
)))
{
{
convertToRealHash
(
o
);
convertToRealHash
(
o
);
}
}
...
...
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