mirror of
https://codeberg.org/redict/redict.git
synced 2025-01-23 00:28:26 -05:00
3ca6972ecd
Part two of implementing #8702 (zset), after #8887. ## Description of the feature Replaced all uses of ziplist with listpack in t_zset, and optimized some of the code to optimize performance. ## Rdb format changes New `RDB_TYPE_ZSET_LISTPACK` rdb type. ## Rdb loading improvements: 1) Pre-expansion of dict for validation of duplicate data for listpack and ziplist. 2) Simplifying the release of empty key objects when RDB loading. 3) Unify ziplist and listpack data verify methods for zset and hash, and move code to rdb.c. ## Interface changes 1) New `zset-max-listpack-entries` config is an alias for `zset-max-ziplist-entries` (same with `zset-max-listpack-value`). 2) OBJECT ENCODING will return listpack instead of ziplist. ## Listpack improvements: 1) Add `lpDeleteRange` and `lpDeleteRangeWithEntry` functions to delete a range of entries from listpack. 2) Improve the performance of `lpCompare`, converting from string to integer is faster than converting from integer to string. 3) Replace `snprintf` with `ll2string` to improve performance in converting numbers to strings in `lpGet()`. ## Zset improvements: 1) Improve the performance of `zzlFind` method, use `lpFind` instead of `lpCompare` in a loop. 2) Use `lpDeleteRangeWithEntry` instead of `lpDelete` twice to delete a element of zset. ## Tests 1) Add some unittests for `lpDeleteRange` and `lpDeleteRangeWithEntry` function. 2) Add zset RDB loading test. 3) Add benchmark test for `lpCompare` and `ziplsitCompare`. 4) Add empty listpack zset corrupt dump test.
207 lines
7.0 KiB
Tcl
207 lines
7.0 KiB
Tcl
start_server {tags {"aofrw external:skip"}} {
|
|
# Enable the AOF
|
|
r config set appendonly yes
|
|
r config set auto-aof-rewrite-percentage 0 ; # Disable auto-rewrite.
|
|
waitForBgrewriteaof r
|
|
|
|
foreach rdbpre {yes no} {
|
|
r config set aof-use-rdb-preamble $rdbpre
|
|
test "AOF rewrite during write load: RDB preamble=$rdbpre" {
|
|
# Start a write load for 10 seconds
|
|
set master [srv 0 client]
|
|
set master_host [srv 0 host]
|
|
set master_port [srv 0 port]
|
|
set load_handle0 [start_write_load $master_host $master_port 10]
|
|
set load_handle1 [start_write_load $master_host $master_port 10]
|
|
set load_handle2 [start_write_load $master_host $master_port 10]
|
|
set load_handle3 [start_write_load $master_host $master_port 10]
|
|
set load_handle4 [start_write_load $master_host $master_port 10]
|
|
|
|
# Make sure the instance is really receiving data
|
|
wait_for_condition 50 100 {
|
|
[r dbsize] > 0
|
|
} else {
|
|
fail "No write load detected."
|
|
}
|
|
|
|
# After 3 seconds, start a rewrite, while the write load is still
|
|
# active.
|
|
after 3000
|
|
r bgrewriteaof
|
|
waitForBgrewriteaof r
|
|
|
|
# Let it run a bit more so that we'll append some data to the new
|
|
# AOF.
|
|
after 1000
|
|
|
|
# Stop the processes generating the load if they are still active
|
|
stop_write_load $load_handle0
|
|
stop_write_load $load_handle1
|
|
stop_write_load $load_handle2
|
|
stop_write_load $load_handle3
|
|
stop_write_load $load_handle4
|
|
|
|
# Make sure no more commands processed, before taking debug digest
|
|
wait_load_handlers_disconnected
|
|
|
|
# Get the data set digest
|
|
set d1 [r debug digest]
|
|
|
|
# Load the AOF
|
|
r debug loadaof
|
|
set d2 [r debug digest]
|
|
|
|
# Make sure they are the same
|
|
assert {$d1 eq $d2}
|
|
}
|
|
}
|
|
}
|
|
|
|
start_server {tags {"aofrw external:skip"} overrides {aof-use-rdb-preamble no}} {
|
|
test {Turning off AOF kills the background writing child if any} {
|
|
r config set appendonly yes
|
|
waitForBgrewriteaof r
|
|
r multi
|
|
r bgrewriteaof
|
|
r config set appendonly no
|
|
r exec
|
|
wait_for_condition 50 100 {
|
|
[string match {*Killing*AOF*child*} [exec tail -5 < [srv 0 stdout]]]
|
|
} else {
|
|
fail "Can't find 'Killing AOF child' into recent logs"
|
|
}
|
|
}
|
|
|
|
foreach d {string int} {
|
|
foreach e {quicklist} {
|
|
test "AOF rewrite of list with $e encoding, $d data" {
|
|
r flushall
|
|
set len 1000
|
|
for {set j 0} {$j < $len} {incr j} {
|
|
if {$d eq {string}} {
|
|
set data [randstring 0 16 alpha]
|
|
} else {
|
|
set data [randomInt 4000000000]
|
|
}
|
|
r lpush key $data
|
|
}
|
|
assert_equal [r object encoding key] $e
|
|
set d1 [r debug digest]
|
|
r bgrewriteaof
|
|
waitForBgrewriteaof r
|
|
r debug loadaof
|
|
set d2 [r debug digest]
|
|
if {$d1 ne $d2} {
|
|
error "assertion:$d1 is not equal to $d2"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach d {string int} {
|
|
foreach e {intset hashtable} {
|
|
test "AOF rewrite of set with $e encoding, $d data" {
|
|
r flushall
|
|
if {$e eq {intset}} {set len 10} else {set len 1000}
|
|
for {set j 0} {$j < $len} {incr j} {
|
|
if {$d eq {string}} {
|
|
set data [randstring 0 16 alpha]
|
|
} else {
|
|
set data [randomInt 4000000000]
|
|
}
|
|
r sadd key $data
|
|
}
|
|
if {$d ne {string}} {
|
|
assert_equal [r object encoding key] $e
|
|
}
|
|
set d1 [r debug digest]
|
|
r bgrewriteaof
|
|
waitForBgrewriteaof r
|
|
r debug loadaof
|
|
set d2 [r debug digest]
|
|
if {$d1 ne $d2} {
|
|
error "assertion:$d1 is not equal to $d2"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach d {string int} {
|
|
foreach e {listpack hashtable} {
|
|
test "AOF rewrite of hash with $e encoding, $d data" {
|
|
r flushall
|
|
if {$e eq {listpack}} {set len 10} else {set len 1000}
|
|
for {set j 0} {$j < $len} {incr j} {
|
|
if {$d eq {string}} {
|
|
set data [randstring 0 16 alpha]
|
|
} else {
|
|
set data [randomInt 4000000000]
|
|
}
|
|
r hset key $data $data
|
|
}
|
|
assert_equal [r object encoding key] $e
|
|
set d1 [r debug digest]
|
|
r bgrewriteaof
|
|
waitForBgrewriteaof r
|
|
r debug loadaof
|
|
set d2 [r debug digest]
|
|
if {$d1 ne $d2} {
|
|
error "assertion:$d1 is not equal to $d2"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach d {string int} {
|
|
foreach e {listpack skiplist} {
|
|
test "AOF rewrite of zset with $e encoding, $d data" {
|
|
r flushall
|
|
if {$e eq {listpack}} {set len 10} else {set len 1000}
|
|
for {set j 0} {$j < $len} {incr j} {
|
|
if {$d eq {string}} {
|
|
set data [randstring 0 16 alpha]
|
|
} else {
|
|
set data [randomInt 4000000000]
|
|
}
|
|
r zadd key [expr rand()] $data
|
|
}
|
|
assert_equal [r object encoding key] $e
|
|
set d1 [r debug digest]
|
|
r bgrewriteaof
|
|
waitForBgrewriteaof r
|
|
r debug loadaof
|
|
set d2 [r debug digest]
|
|
if {$d1 ne $d2} {
|
|
error "assertion:$d1 is not equal to $d2"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
test {BGREWRITEAOF is delayed if BGSAVE is in progress} {
|
|
r multi
|
|
r bgsave
|
|
r bgrewriteaof
|
|
r info persistence
|
|
set res [r exec]
|
|
assert_match {*scheduled*} [lindex $res 1]
|
|
assert_match {*aof_rewrite_scheduled:1*} [lindex $res 2]
|
|
while {[string match {*aof_rewrite_scheduled:1*} [r info persistence]]} {
|
|
after 100
|
|
}
|
|
}
|
|
|
|
test {BGREWRITEAOF is refused if already in progress} {
|
|
catch {
|
|
r multi
|
|
r bgrewriteaof
|
|
r bgrewriteaof
|
|
r exec
|
|
} e
|
|
assert_match {*ERR*already*} $e
|
|
while {[string match {*aof_rewrite_scheduled:1*} [r info persistence]]} {
|
|
after 100
|
|
}
|
|
}
|
|
}
|