replaced ZMERGE by ZUNION and ZINTER. note: key preloading by the VM does not yet work

This commit is contained in:
Pieter Noordhuis
2010-03-09 12:38:50 +01:00
parent b287c9bb2b
commit 2830ca539b
2 changed files with 137 additions and 65 deletions

View File

@ -1462,7 +1462,7 @@ proc main {server port} {
list [$r zremrangebyscore zset -inf +inf] [$r zrange zset 0 -1]
} {5 {}}
test {ZMERGE basics} {
test {ZUNION basics} {
$r del zseta zsetb zsetc
$r zadd zseta 1 a
$r zadd zseta 2 b
@ -1470,13 +1470,21 @@ proc main {server port} {
$r zadd zsetb 1 b
$r zadd zsetb 2 c
$r zadd zsetb 3 d
list [$r zmerge zsetc zseta zsetb] [$r zrange zsetc 0 -1 withscores]
list [$r zunion zsetc 2 zseta zsetb] [$r zrange zsetc 0 -1 withscores]
} {4 {a 1 b 3 d 3 c 5}}
test {ZMERGEWEIGHED basics} {
list [$r zmergeweighed zsetc zseta 2 zsetb 3] [$r zrange zsetc 0 -1 withscores]
test {ZUNION with weights} {
list [$r zunion zsetc 2 zseta zsetb weights 2 3] [$r zrange zsetc 0 -1 withscores]
} {4 {a 2 b 7 d 9 c 12}}
test {ZINTER basics} {
list [$r zinter zsetc 2 zseta zsetb] [$r zrange zsetc 0 -1 withscores]
} {2 {b 3 c 5}}
test {ZINTER with weights} {
list [$r zinter zsetc 2 zseta zsetb weights 2 3] [$r zrange zsetc 0 -1 withscores]
} {2 {b 7 c 12}}
test {SORT against sorted sets} {
$r del zset
$r zadd zset 1 a