Unverified Commit 11dc4e59 authored by Binbin's avatar Binbin Committed by GitHub
Browse files

SMOVE only notify dstset when the addition is successful. (#9244)

in case dest key already contains the member, the dest key isn't modified, so the command shouldn't invalidate watch.
parent f03af47a
...@@ -392,12 +392,12 @@ void smoveCommand(client *c) { ...@@ -392,12 +392,12 @@ void smoveCommand(client *c) {
} }
signalModifiedKey(c,c->db,c->argv[1]); signalModifiedKey(c,c->db,c->argv[1]);
signalModifiedKey(c,c->db,c->argv[2]);
server.dirty++; server.dirty++;
/* An extra key has changed when ele was successfully added to dstset */ /* An extra key has changed when ele was successfully added to dstset */
if (setTypeAdd(dstset,ele->ptr)) { if (setTypeAdd(dstset,ele->ptr)) {
server.dirty++; server.dirty++;
signalModifiedKey(c,c->db,c->argv[2]);
notifyKeyspaceEvent(NOTIFY_SET,"sadd",c->argv[2],c->db->id); notifyKeyspaceEvent(NOTIFY_SET,"sadd",c->argv[2],c->db->id);
} }
addReply(c,shared.cone); addReply(c,shared.cone);
......
...@@ -828,6 +828,28 @@ start_server { ...@@ -828,6 +828,28 @@ start_server {
lsort [r smembers set{t}] lsort [r smembers set{t}]
} {a b c} } {a b c}
test "SMOVE only notify dstset when the addition is successful" {
r del srcset{t}
r del dstset{t}
r sadd srcset{t} a b
r sadd dstset{t} a
r watch dstset{t}
r multi
r sadd dstset{t} c
set r2 [redis_client]
$r2 smove srcset{t} dstset{t} a
# The dstset is actually unchanged, multi should success
r exec
set res [r scard dstset{t}]
assert_equal $res 2
$r2 close
}
tags {slow} { tags {slow} {
test {intsets implementation stress testing} { test {intsets implementation stress testing} {
for {set j 0} {$j < 20} {incr j} { for {set j 0} {$j < 20} {incr j} {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment