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
80586cb8
Commit
80586cb8
authored
Jan 25, 2012
by
Pieter Noordhuis
Browse files
Test that zipmap from RDB is correctly converted
parent
fe458402
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
80586cb8
...
...
@@ -915,12 +915,13 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
{
unsigned
char
*
zl
=
ziplistNew
();
unsigned
char
*
zi
=
zipmapRewind
(
o
->
ptr
);
unsigned
char
*
fstr
,
*
vstr
;
unsigned
int
flen
,
vlen
;
unsigned
int
maxlen
=
0
;
while
(
zi
!=
NULL
)
{
unsigned
char
*
fstr
,
*
vstr
;
unsigned
int
flen
,
vlen
;
zi
=
zipmapNext
(
zi
,
&
fstr
,
&
flen
,
&
vstr
,
&
vlen
);
while
((
zi
=
zipmapNext
(
zi
,
&
fstr
,
&
flen
,
&
vstr
,
&
vlen
))
!=
NULL
)
{
if
(
flen
>
maxlen
)
maxlen
=
flen
;
if
(
vlen
>
maxlen
)
maxlen
=
vlen
;
zl
=
ziplistPush
(
zl
,
fstr
,
flen
,
ZIPLIST_TAIL
);
zl
=
ziplistPush
(
zl
,
vstr
,
vlen
,
ZIPLIST_TAIL
);
}
...
...
@@ -930,8 +931,11 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
o
->
type
=
REDIS_HASH
;
o
->
encoding
=
REDIS_ENCODING_ZIPLIST
;
if
(
hashTypeLength
(
o
)
>
server
.
hash_max_ziplist_entries
)
if
(
hashTypeLength
(
o
)
>
server
.
hash_max_ziplist_entries
||
maxlen
>
server
.
hash_max_ziplist_value
)
{
hashTypeConvert
(
o
,
REDIS_ENCODING_HT
);
}
}
break
;
case
REDIS_RDB_TYPE_LIST_ZIPLIST
:
...
...
tests/assets/hash-zipmap.rdb
0 → 100644
View file @
80586cb8
File added
tests/integration/convert-zipmap-hash-on-load.tcl
0 → 100644
View file @
80586cb8
set server_path
[
tmpdir
"server.convert-zipmap-hash-on-load"
]
# Copy RDB with zipmap encoded hash to server path
exec cp tests/assets/hash-zipmap.rdb $server_path
start_server
[
list overrides
[
list
"dir"
$server_path
"dbfilename"
"hash-zipmap.rdb"
]]
{
test
"RDB load zipmap hash: converts to ziplist"
{
r select 0
assert_match
"*ziplist*"
[
r debug object hash
]
assert_equal 2
[
r hlen hash
]
assert_match
{
v1 v2
}
[
r hmget hash f1 f2
]
}
}
start_server
[
list overrides
[
list
"dir"
$server_path
"dbfilename"
"hash-zipmap.rdb"
"hash-max-ziplist-entries"
1
]]
{
test
"RDB load zipmap hash: converts to hash table when hash-max-ziplist-entries is exceeded"
{
r select 0
assert_match
"*hashtable*"
[
r debug object hash
]
assert_equal 2
[
r hlen hash
]
assert_match
{
v1 v2
}
[
r hmget hash f1 f2
]
}
}
start_server
[
list overrides
[
list
"dir"
$server_path
"dbfilename"
"hash-zipmap.rdb"
"hash-max-ziplist-value"
1
]]
{
test
"RDB load zipmap hash: converts to hash table when hash-max-ziplist-value is exceeded"
{
r select 0
assert_match
"*hashtable*"
[
r debug object hash
]
assert_equal 2
[
r hlen hash
]
assert_match
{
v1 v2
}
[
r hmget hash f1 f2
]
}
}
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