mirror of
https://codeberg.org/redict/redict.git
synced 2025-01-22 16:18:28 -05:00
20854cb610
In #11290, we added listpack encoding for SET object. But forgot to support it in zuiFind, causes ZINTER, ZINTERSTORE, ZINTERCARD, ZIDFF, ZDIFFSTORE to crash. And forgot to support it in RM_ScanKey, causes it hang. This PR add support SET listpack in zuiFind, and in RM_ScanKey. And add tests for related commands to cover this case. Other changes: - There is no reason for zuiFind to go into the internals of the SET. It can simply use setTypeIsMember and don't care about encoding. - Remove the `#include "intset.h"` from server.h reduce the chance of accidental intset API use. - Move setTypeAddAux, setTypeRemoveAux and setTypeIsMemberAux interfaces to the header. - In scanGenericCommand, use setTypeInitIterator and setTypeNext to handle OBJ_SET scan. - In RM_ScanKey, improve hash scan mode, use lpGetValue like zset, they can share code and better performance. The zuiFind part fixes #11578 Co-authored-by: Oran Agra <oran@redislabs.com> Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
69 lines
1.9 KiB
Tcl
69 lines
1.9 KiB
Tcl
set testmodule [file normalize tests/modules/scan.so]
|
|
|
|
start_server {tags {"modules"}} {
|
|
r module load $testmodule
|
|
|
|
test {Module scan keyspace} {
|
|
# the module create a scan command with filtering which also return values
|
|
r set x 1
|
|
r set y 2
|
|
r set z 3
|
|
r hset h f v
|
|
lsort [r scan.scan_strings]
|
|
} {{x 1} {y 2} {z 3}}
|
|
|
|
test {Module scan hash listpack} {
|
|
r hmset hh f1 v1 f2 v2
|
|
assert_encoding listpack hh
|
|
lsort [r scan.scan_key hh]
|
|
} {{f1 v1} {f2 v2}}
|
|
|
|
test {Module scan hash listpack with int value} {
|
|
r hmset hh1 f1 1
|
|
assert_encoding listpack hh1
|
|
lsort [r scan.scan_key hh1]
|
|
} {{f1 1}}
|
|
|
|
test {Module scan hash dict} {
|
|
r config set hash-max-ziplist-entries 2
|
|
r hmset hh f3 v3
|
|
assert_encoding hashtable hh
|
|
lsort [r scan.scan_key hh]
|
|
} {{f1 v1} {f2 v2} {f3 v3}}
|
|
|
|
test {Module scan zset listpack} {
|
|
r zadd zz 1 f1 2 f2
|
|
assert_encoding listpack zz
|
|
lsort [r scan.scan_key zz]
|
|
} {{f1 1} {f2 2}}
|
|
|
|
test {Module scan zset skiplist} {
|
|
r config set zset-max-ziplist-entries 2
|
|
r zadd zz 3 f3
|
|
assert_encoding skiplist zz
|
|
lsort [r scan.scan_key zz]
|
|
} {{f1 1} {f2 2} {f3 3}}
|
|
|
|
test {Module scan set intset} {
|
|
r sadd ss 1 2
|
|
assert_encoding intset ss
|
|
lsort [r scan.scan_key ss]
|
|
} {{1 {}} {2 {}}}
|
|
|
|
test {Module scan set dict} {
|
|
r config set set-max-intset-entries 2
|
|
r sadd ss 3
|
|
assert_encoding hashtable ss
|
|
lsort [r scan.scan_key ss]
|
|
} {{1 {}} {2 {}} {3 {}}}
|
|
|
|
test {Module scan set listpack} {
|
|
r sadd ss1 a b c
|
|
assert_encoding listpack ss1
|
|
lsort [r scan.scan_key ss1]
|
|
} {{a {}} {b {}} {c {}}}
|
|
|
|
test "Unload the module - scan" {
|
|
assert_equal {OK} [r module unload scan]
|
|
}
|
|
} |