Now list push commands return the length of the new list, thanks to Gustavo Picon

diff --git a/redis.c b/redis.c
index a0beff284e13e86c9133d44efbb49d511d738253..fd1cb0a532a46374d86aa8fb35797af74ad079d3 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -4075,7 +4075,7 @@ static void pushGenericCommand(redisClient *c, int where) {
     lobj = lookupKeyWrite(c->db,c->argv[1]);
     if (lobj == NULL) {
         if (handleClientsWaitingListPush(c,c->argv[1],c->argv[2])) {
     lobj = lookupKeyWrite(c->db,c->argv[1]);
     if (lobj == NULL) {
         if (handleClientsWaitingListPush(c,c->argv[1],c->argv[2])) {

-            addReply(c,shared.ok);
+            addReply(c,shared.cone);

             return;
         }
         lobj = createListObject();
             return;
         }
         lobj = createListObject();


@@ -4094,7 +4094,7 @@ static void pushGenericCommand(redisClient *c, int where) {
             return;
         }
         if (handleClientsWaitingListPush(c,c->argv[1],c->argv[2])) {
             return;
         }
         if (handleClientsWaitingListPush(c,c->argv[1],c->argv[2])) {

-            addReply(c,shared.ok);
+            addReply(c,shared.cone);

             return;
         }
         list = lobj->ptr;
             return;
         }
         list = lobj->ptr;


@@ -4106,7 +4106,7 @@ static void pushGenericCommand(redisClient *c, int where) {
         incrRefCount(c->argv[2]);
     }
     server.dirty++;
         incrRefCount(c->argv[2]);
     }
     server.dirty++;

-    addReply(c,shared.ok);
+    addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",listLength(list)));

 }
 
 static void lpushCommand(redisClient *c) {
 }
 
 static void lpushCommand(redisClient *c) {

diff --git a/test-redis.tcl b/test-redis.tcl
index 0fc1e7dfc9b871447e125803c8fb07503ac8d79c..a6acea18a2c8204b5296a518c7f8368026689f67 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -406,15 +406,20 @@ proc main {server port} {
     } {1}
 
     test {Basic LPUSH, RPUSH, LLENGTH, LINDEX} {
     } {1}
 
     test {Basic LPUSH, RPUSH, LLENGTH, LINDEX} {

-        $r lpush mylist a
-        $r lpush mylist b
-        $r rpush mylist c
-        set res [$r llen mylist]
+        set res [$r lpush mylist a]
+        append res [$r lpush mylist b]
+        append res [$r rpush mylist c]
+        append res [$r llen mylist]
+        append res [$r rpush anotherlist d]
+        append res [$r lpush anotherlist e]
+        append res [$r llen anotherlist]

         append res [$r lindex mylist 0]
         append res [$r lindex mylist 1]
         append res [$r lindex mylist 2]
         append res [$r lindex mylist 0]
         append res [$r lindex mylist 1]
         append res [$r lindex mylist 2]

+        append res [$r lindex anotherlist 0]
+        append res [$r lindex anotherlist 1]

         list $res [$r lindex mylist 100]
         list $res [$r lindex mylist 100]

-    } {3bac {}}
+    } {1233122baced {}}

 
     test {DEL a list} {
         $r del mylist
 
     test {DEL a list} {
         $r del mylist