missing return caused protocol desync in CLUSTER SETSLOT

[redis.git] / src / t_set.c

diff --git a/src/t_set.c b/src/t_set.c
index 2af383d10f60a951de475247dffb8d66fdf67d10..b221e2e99cd129f7e385f00fc3783931bc97181b 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -218,9 +218,9 @@ void setTypeConvert(robj *setobj, int enc) {
 
 void saddCommand(redisClient *c) {
     robj *set;
 
 void saddCommand(redisClient *c) {
     robj *set;

+    int j, added = 0;

 
     set = lookupKeyWrite(c->db,c->argv[1]);
 
     set = lookupKeyWrite(c->db,c->argv[1]);

-    c->argv[2] = tryObjectEncoding(c->argv[2]);

     if (set == NULL) {
         set = setTypeCreate(c->argv[2]);
         dbAdd(c->db,c->argv[1],set);
     if (set == NULL) {
         set = setTypeCreate(c->argv[2]);
         dbAdd(c->db,c->argv[1],set);


@@ -230,30 +230,34 @@ void saddCommand(redisClient *c) {
             return;
         }
     }
             return;
         }
     }

-    if (setTypeAdd(set,c->argv[2])) {
-        signalModifiedKey(c->db,c->argv[1]);
-        server.dirty++;
-        addReply(c,shared.cone);
-    } else {
-        addReply(c,shared.czero);
+
+    for (j = 2; j < c->argc; j++) {
+        c->argv[j] = tryObjectEncoding(c->argv[j]);
+        if (setTypeAdd(set,c->argv[j])) added++;

     }
     }

+    if (added) signalModifiedKey(c->db,c->argv[1]);
+    server.dirty += added;
+    addReplyLongLong(c,added);

 }
 
 void sremCommand(redisClient *c) {
     robj *set;
 }
 
 void sremCommand(redisClient *c) {
     robj *set;

+    int j, deleted = 0;

 
     if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,set,REDIS_SET)) return;
 
 
     if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,set,REDIS_SET)) return;
 

-    c->argv[2] = tryObjectEncoding(c->argv[2]);
-    if (setTypeRemove(set,c->argv[2])) {
-        if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
+    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 (deleted) {

         signalModifiedKey(c->db,c->argv[1]);
         signalModifiedKey(c->db,c->argv[1]);

-        server.dirty++;
-        addReply(c,shared.cone);
-    } else {
-        addReply(c,shared.czero);
+        server.dirty += deleted;

     }
     }

+    addReplyLongLong(c,deleted);

 }
 
 void smoveCommand(redisClient *c) {
 }
 
 void smoveCommand(redisClient *c) {


@@ -334,12 +338,25 @@ void spopCommand(redisClient *c) {
 
     encoding = setTypeRandomElement(set,&ele,&llele);
     if (encoding == REDIS_ENCODING_INTSET) {
 
     encoding = setTypeRandomElement(set,&ele,&llele);
     if (encoding == REDIS_ENCODING_INTSET) {

-        addReplyBulkLongLong(c,llele);
+        ele = createStringObjectFromLongLong(llele);

         set->ptr = intsetRemove(set->ptr,llele,NULL);
     } else {
         set->ptr = intsetRemove(set->ptr,llele,NULL);
     } else {

-        addReplyBulk(c,ele);
+        incrRefCount(ele);

         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;
+
+    addReplyBulk(c,ele);

     if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
     signalModifiedKey(c->db,c->argv[1]);
     server.dirty++;
     if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
     signalModifiedKey(c->db,c->argv[1]);
     server.dirty++;