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 e2ac5ae5378155f329f76d90d7f5c6680e959f05..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