Move code for pushing on a (blocking) RPOPLPUSH

[redis.git] / src / t_set.c

diff --git a/src/t_set.c b/src/t_set.c
index 68e132278f96c938e605490e6ed55aff46177ef8..234efc7de6291fa90b9e913f9c10961502715864 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -178,6 +178,7 @@ void saddCommand(redisClient *c) {
     robj *set;
 
     set = lookupKeyWrite(c->db,c->argv[1]);
     robj *set;
 
     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);


@@ -202,6 +203,7 @@ void sremCommand(redisClient *c) {
     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]);
         touchWatchedKey(c->db,c->argv[1]);
     if (setTypeRemove(set,c->argv[2])) {
         if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
         touchWatchedKey(c->db,c->argv[1]);


@@ -216,7 +218,7 @@ void smoveCommand(redisClient *c) {
     robj *srcset, *dstset, *ele;
     srcset = lookupKeyWrite(c->db,c->argv[1]);
     dstset = lookupKeyWrite(c->db,c->argv[2]);
     robj *srcset, *dstset, *ele;
     srcset = lookupKeyWrite(c->db,c->argv[1]);
     dstset = lookupKeyWrite(c->db,c->argv[2]);

-    ele = c->argv[3];
+    ele = c->argv[3] = tryObjectEncoding(c->argv[3]);

 
     /* If the source key does not exist return 0 */
     if (srcset == NULL) {
 
     /* If the source key does not exist return 0 */
     if (srcset == NULL) {


@@ -264,6 +266,7 @@ void sismemberCommand(redisClient *c) {
     if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,set,REDIS_SET)) return;
 
     if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,set,REDIS_SET)) return;
 

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

     if (setTypeIsMember(set,c->argv[2]))
         addReply(c,shared.cone);
     else
     if (setTypeIsMember(set,c->argv[2]))
         addReply(c,shared.cone);
     else


@@ -276,7 +279,7 @@ void scardCommand(redisClient *c) {
     if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,o,REDIS_SET)) return;
 
     if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,o,REDIS_SET)) return;
 

-    addReplyUlong(c,setTypeSize(o));
+    addReplyLongLong(c,setTypeSize(o));

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


@@ -320,7 +323,8 @@ int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
 void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum, robj *dstkey) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);
     setTypeIterator *si;
 void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum, robj *dstkey) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);
     setTypeIterator *si;

-    robj *ele, *lenobj = NULL, *dstset = NULL;
+    robj *ele, *dstset = NULL;
+    void *replylen = NULL;

     unsigned long j, cardinality = 0;
 
     for (j = 0; j < setnum; j++) {
     unsigned long j, cardinality = 0;
 
     for (j = 0; j < setnum; j++) {


@@ -356,9 +360,7 @@ void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum,
      * to the output list and save the pointer to later modify it with the
      * right length */
     if (!dstkey) {
      * to the output list and save the pointer to later modify it with the
      * right length */
     if (!dstkey) {

-        lenobj = createObject(REDIS_STRING,NULL);
-        addReply(c,lenobj);
-        decrRefCount(lenobj);
+        replylen = addDeferredMultiBulkLength(c);

     } else {
         /* If we have a target key where to store the resulting set
          * create this key with an empty set inside */
     } else {
         /* If we have a target key where to store the resulting set
          * create this key with an empty set inside */


@@ -400,7 +402,7 @@ void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum,
         touchWatchedKey(c->db,dstkey);
         server.dirty++;
     } else {
         touchWatchedKey(c->db,dstkey);
         server.dirty++;
     } else {

-        lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",cardinality);
+        setDeferredMultiBulkLength(c,replylen,cardinality);

     }
     zfree(sets);
 }
     }
     zfree(sets);
 }


@@ -470,7 +472,7 @@ void sunionDiffGenericCommand(redisClient *c, robj **setkeys, int setnum, robj *
 
     /* Output the content of the resulting set, if not in STORE mode */
     if (!dstkey) {
 
     /* Output the content of the resulting set, if not in STORE mode */
     if (!dstkey) {

-        addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",cardinality));
+        addReplyMultiBulkLen(c,cardinality);

         si = setTypeInitIterator(dstset);
         while((ele = setTypeNext(si)) != NULL) {
             addReplyBulk(c,ele);
         si = setTypeInitIterator(dstset);
         while((ele = setTypeNext(si)) != NULL) {
             addReplyBulk(c,ele);