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
521ddcce
Commit
521ddcce
authored
May 19, 2011
by
antirez
Browse files
Fix for ZUNIONSTORE bug when there is an empty set among input sets. Regression test added.
parent
330c90b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
521ddcce
...
@@ -1550,7 +1550,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
...
@@ -1550,7 +1550,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
}
}
}
else
if
(
op
==
REDIS_OP_UNION
)
{
}
else
if
(
op
==
REDIS_OP_UNION
)
{
for
(
i
=
0
;
i
<
setnum
;
i
++
)
{
for
(
i
=
0
;
i
<
setnum
;
i
++
)
{
if
(
zuiLength
(
&
src
[
0
])
==
0
)
if
(
zuiLength
(
&
src
[
i
])
==
0
)
continue
;
continue
;
while
(
zuiNext
(
&
src
[
i
],
&
zval
))
{
while
(
zuiNext
(
&
src
[
i
],
&
zval
))
{
...
...
tests/unit/type/zset.tcl
View file @
521ddcce
...
@@ -353,6 +353,14 @@ start_server {tags {"zset"}} {
...
@@ -353,6 +353,14 @@ start_server {tags {"zset"}} {
assert_equal 0
[
r exists dst_key
]
assert_equal 0
[
r exists dst_key
]
}
}
test
"ZUNIONSTORE with empty set -
$encoding
"
{
r del zseta zsetb
r zadd zseta 1 a
r zadd zseta 2 b
r zunionstore zsetc 2 zseta zsetb
r zrange zsetc 0 -1 withscores
}
{
a 1 b 2
}
test
"ZUNIONSTORE basics -
$encoding
"
{
test
"ZUNIONSTORE basics -
$encoding
"
{
r del zseta zsetb zsetc
r del zseta zsetb zsetc
r zadd zseta 1 a
r zadd zseta 1 a
...
...
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