Added a missing server.dirty increment in a non critical place, added more tests

diff --git a/redis.c b/redis.c
index dde1630d4a12538f712601dce01a8807afd130e8..459b25c4ef7fc7e140db51e7efef659823e5fddf 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -3968,7 +3968,8 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, unsigned long
         if (!setobj) {
             zfree(dv);
             if (dstkey) {
         if (!setobj) {
             zfree(dv);
             if (dstkey) {

-                deleteKey(c->db,dstkey);
+                if (deleteKey(c->db,dstkey))
+                    server.dirty++;

                 addReply(c,shared.czero);
             } else {
                 addReply(c,shared.nullmultibulk);
                 addReply(c,shared.czero);
             } else {
                 addReply(c,shared.nullmultibulk);

diff --git a/test-redis.tcl b/test-redis.tcl
index c61293fa964e15526a8c5dc75dca841e34f74b30..004dc696cfa91673b85f365f17e816dc12e22642 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -530,6 +530,12 @@ proc main {server port} {
         list [$r lrange mylist 0 -1] [$r type newlist] [string range $err 0 2]
     } {{a b c d} string ERR}
 
         list [$r lrange mylist 0 -1] [$r type newlist] [string range $err 0 2]
     } {{a b c d} string ERR}
 

+    test {RPOPLPUSH against non existing src key} {
+        $r del mylist
+        $r del newlist
+        $r rpoplpush mylist newlist
+    } {}
+

     test {RENAME basic usage} {
         $r set mykey hello
         $r rename mykey mykey1
     test {RENAME basic usage} {
         $r set mykey hello
         $r rename mykey mykey1