Merge git://github.com/ianxm/redis

diff --git a/redis-cli.c b/redis-cli.c
index eacc2224e02ce00c6677005531844e06d95a975c..a7c696bfd3365966a2807e176d3f235510f32ac5 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -77,7 +77,7 @@ static struct redisCommand cmdTable[] = {
     {"lrange",4,REDIS_CMD_INLINE},
     {"ltrim",4,REDIS_CMD_INLINE},
     {"lrem",4,REDIS_CMD_BULK},
-    {"lpoppush",3,REDIS_CMD_BULK},
+    {"rpoplpush",3,REDIS_CMD_BULK},
     {"sadd",3,REDIS_CMD_BULK},
     {"srem",3,REDIS_CMD_BULK},
     {"smove",4,REDIS_CMD_BULK},

diff --git a/redis.c b/redis.c
index 90063525a199ace4d74137b9007147f77051e16c..470191dacf67dacd7313b496c5581c554d0dc7b0 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -446,7 +446,7 @@ static void flushdbCommand(redisClient *c);
 static void flushallCommand(redisClient *c);
 static void sortCommand(redisClient *c);
 static void lremCommand(redisClient *c);
-static void lpoppushCommand(redisClient *c);
+static void rpoplpushcommand(redisClient *c);
 static void infoCommand(redisClient *c);
 static void mgetCommand(redisClient *c);
 static void monitorCommand(redisClient *c);
@@ -490,7 +490,7 @@ static struct redisCommand cmdTable[] = {
     {"lrange",lrangeCommand,4,REDIS_CMD_INLINE},
     {"ltrim",ltrimCommand,4,REDIS_CMD_INLINE},
     {"lrem",lremCommand,4,REDIS_CMD_BULK},
-    {"lpoppush",lpoppushCommand,3,REDIS_CMD_BULK},
+    {"rpoplpush",rpoplpushcommand,3,REDIS_CMD_BULK},
     {"sadd",saddCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},
     {"srem",sremCommand,3,REDIS_CMD_BULK},
     {"smove",smoveCommand,4,REDIS_CMD_BULK},
@@ -3473,7 +3473,7 @@ static void lremCommand(redisClient *c) {
 }
 
 /* This is the semantic of this command:
- *  LPOPPUSH srclist dstlist:
+ *  RPOPLPUSH srclist dstlist:
  *   IF LLEN(srclist) > 0
  *     element = RPOP srclist
  *     LPUSH dstlist element
@@ -3487,7 +3487,7 @@ static void lremCommand(redisClient *c) {
  * since the element is not just returned but pushed against another list
  * as well. This command was originally proposed by Ezra Zygmuntowicz.
  */
-static void lpoppushCommand(redisClient *c) {
+static void rpoplpushcommand(redisClient *c) {
     robj *sobj;
 
     sobj = lookupKeyWrite(c->db,c->argv[1]);
@@ -4372,7 +4372,7 @@ static void zscoreCommand(redisClient *c) {
     
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o == NULL) {
-        addReply(c,shared.czero);
+        addReply(c,shared.nullbulk);
         return;
     } else {
         if (o->type != REDIS_ZSET) {

diff --git a/test-redis.tcl b/test-redis.tcl
index 98f806d6ccf47ac7807ca4cb361b0cb6201821df..1ca5e21acba831c8b4ff96fb9714ade8543ac915 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -533,6 +533,17 @@ proc main {server port} {
     } {{1 2 3} 0}
 
     test {SAVE - make sure there are all the types as values} {
+        # Wait for a background saving in progress to terminate
+        while 1 {
+            set i [$r info]
+            if {[string match {*bgsave_in_progress:1*} $i]} {
+                puts -nonewline "\nWaiting for background save to finish... "
+                flush stdout
+                after 100
+            } else {
+                break
+            }
+        }
         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}