variadic SADD

diff --git a/src/redis.c b/src/redis.c
index 38e4ce527d55925ab669f675899d942cc04d8dd2..5f07903cb89e5304c29e367fe5efbbb0756c423f 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -102,7 +102,7 @@ struct redisCommand redisCommandTable[] = {
     {"ltrim",ltrimCommand,4,0,NULL,1,1,1,0,0},
     {"lrem",lremCommand,4,0,NULL,1,1,1,0,0},
     {"rpoplpush",rpoplpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,2,1,0,0},
     {"ltrim",ltrimCommand,4,0,NULL,1,1,1,0,0},
     {"lrem",lremCommand,4,0,NULL,1,1,1,0,0},
     {"rpoplpush",rpoplpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,2,1,0,0},

-    {"sadd",saddCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+    {"sadd",saddCommand,-3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},

     {"srem",sremCommand,3,0,NULL,1,1,1,0,0},
     {"smove",smoveCommand,4,0,NULL,1,2,1,0,0},
     {"sismember",sismemberCommand,3,0,NULL,1,1,1,0,0},
     {"srem",sremCommand,3,0,NULL,1,1,1,0,0},
     {"smove",smoveCommand,4,0,NULL,1,2,1,0,0},
     {"sismember",sismemberCommand,3,0,NULL,1,1,1,0,0},

diff --git a/src/t_set.c b/src/t_set.c
index 7d0811edc248aa25997669f8e0a06457b163c328..138a2f8de28888d7c853be841f5b83221701a8db 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,13 +230,14 @@ 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) {
 }
 
 void sremCommand(redisClient *c) {