Fix for the variadic version of SREM. Regression test added.

diff --git a/src/t_set.c b/src/t_set.c
index be083c8b0a66346c03452c80478a85d806f7cb6d..c7d05c2f1f8f82c68f10b54596bae8816481da33 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -249,8 +249,11 @@ void sremCommand(redisClient *c) {
 
     for (j = 2; j < c->argc; j++) {
         if (setTypeRemove(set,c->argv[j])) {
-            if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
             deleted++;
+            if (setTypeSize(set) == 0) {
+                dbDelete(c->db,c->argv[1]);
+                break;
+            }
         }
     }
     if (deleted) {

diff --git a/tests/unit/type/set.tcl b/tests/unit/type/set.tcl
index 1a37ed616ae48648996f80722f1e22bf2237b5aa..bdd1f9bfa11955a2026ccb9caad974204126267a 100644 (file)
--- a/tests/unit/type/set.tcl
+++ b/tests/unit/type/set.tcl
@@ -105,6 +105,12 @@ start_server {
         lsort [r smembers myset]
     } {a c}
 
+    test {SREM variadic version with more args needed to destroy the key} {
+        r del myset
+        r sadd myset 1 2 3
+        r srem myset 1 2 3 4 5 6 7 8
+    } {3}
+
     foreach {type} {hashtable intset} {
         for {set i 1} {$i <= 5} {incr i} {
             r del [format "set%d" $i]