fixed a few problems with redis-trib resharding.

[redis.git] / src / t_set.c

diff --git a/src/t_set.c b/src/t_set.c
index b221e2e99cd129f7e385f00fc3783931bc97181b..bffea3d4d6d256dcf25b7c794b10a651389a5606 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])) {
 
     for (j = 2; j < c->argc; j++) {
         if (setTypeRemove(set,c->argv[j])) {

-            if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);

             deleted++;
             deleted++;

+            if (setTypeSize(set) == 0) {
+                dbDelete(c->db,c->argv[1]);
+                break;
+            }

         }
     }
     if (deleted) {
         }
     }
     if (deleted) {


@@ -329,7 +332,7 @@ void scardCommand(redisClient *c) {
 }
 
 void spopCommand(redisClient *c) {
 }
 
 void spopCommand(redisClient *c) {

-    robj *set, *ele;
+    robj *set, *ele, *aux;

     int64_t llele;
     int encoding;
 
     int64_t llele;
     int encoding;
 


@@ -345,16 +348,11 @@ void spopCommand(redisClient *c) {
         setTypeRemove(set,ele);
     }
 
         setTypeRemove(set,ele);
     }
 

-    /* Change argv to replicate as SREM */
-    c->argc = 3;
-    c->argv = zrealloc(c->argv,sizeof(robj*)*(c->argc));
-
-    /* Overwrite SREM with SPOP (same length) */
-    redisAssert(sdslen(c->argv[0]->ptr) == 4);
-    memcpy(c->argv[0]->ptr, "SREM", 4);
-
-    /* Popped element already has incremented refcount */
-    c->argv[2] = ele;
+    /* Replicate/AOF this command as an SREM operation */
+    aux = createStringObject("SREM",4);
+    rewriteClientCommandVector(c,3,aux,c->argv[1],ele);
+    decrRefCount(ele);
+    decrRefCount(aux);

 
     addReplyBulk(c,ele);
     if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
 
     addReplyBulk(c,ele);
     if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);


@@ -437,6 +435,7 @@ void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum,
     si = setTypeInitIterator(sets[0]);
     while((encoding = setTypeNext(si,&eleobj,&intobj)) != -1) {
         for (j = 1; j < setnum; j++) {
     si = setTypeInitIterator(sets[0]);
     while((encoding = setTypeNext(si,&eleobj,&intobj)) != -1) {
         for (j = 1; j < setnum; j++) {

+            if (sets[j] == sets[0]) continue;

             if (encoding == REDIS_ENCODING_INTSET) {
                 /* intset with intset is simple... and fast */
                 if (sets[j]->encoding == REDIS_ENCODING_INTSET &&
             if (encoding == REDIS_ENCODING_INTSET) {
                 /* intset with intset is simple... and fast */
                 if (sets[j]->encoding == REDIS_ENCODING_INTSET &&