SHUTDOWN now does the right thing when append only is on, that is, fsync instead...

[redis.git] / redis.c

diff --git a/redis.c b/redis.c
index e0e93aadda7cf69217db7131cc7b4d76f8e82e45..274dec7a85a3be63c984783ea27c73026fdf6716 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define REDIS_VERSION "1.050"
+#define REDIS_VERSION "1.1.93"

 
 #include "fmacros.h"
 #include "config.h"
 
 #include "fmacros.h"
 #include "config.h"


@@ -56,6 +56,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/resource.h>

+#include <sys/uio.h>

 #include <limits.h>
 #include <math.h>
 
 #include <limits.h>
 #include <math.h>
 


@@ -89,7 +90,12 @@
 #define REDIS_MAX_SYNC_TIME     60      /* Slave can't take more to sync */
 #define REDIS_EXPIRELOOKUPS_PER_CRON    100 /* try to expire 100 keys/second */
 #define REDIS_MAX_WRITE_PER_EVENT (1024*64)
 #define REDIS_MAX_SYNC_TIME     60      /* Slave can't take more to sync */
 #define REDIS_EXPIRELOOKUPS_PER_CRON    100 /* try to expire 100 keys/second */
 #define REDIS_MAX_WRITE_PER_EVENT (1024*64)

-#define REDIS_REQUEST_MAX_SIZE  (1024*1024*256) /* max bytes in inline command */
+#define REDIS_REQUEST_MAX_SIZE (1024*1024*256) /* max bytes in inline command */
+
+/* If more then REDIS_WRITEV_THRESHOLD write packets are pending use writev */
+#define REDIS_WRITEV_THRESHOLD      3
+/* Max number of iovecs used for each writev call */
+#define REDIS_WRITEV_IOVEC_COUNT    256

 
 /* Hash table parameters */
 #define REDIS_HT_MINFILL        10      /* Minimal hash table fill 10% */
 
 /* Hash table parameters */
 #define REDIS_HT_MINFILL        10      /* Minimal hash table fill 10% */


@@ -192,6 +198,10 @@
 #define APPENDFSYNC_ALWAYS 1
 #define APPENDFSYNC_EVERYSEC 2
 
 #define APPENDFSYNC_ALWAYS 1
 #define APPENDFSYNC_EVERYSEC 2
 

+/* We can print the stacktrace, so our assert is defined this way: */
+#define redisAssert(_e) ((_e)?(void)0 : (_redisAssert(#_e),exit(1)))
+static void _redisAssert(char *estr);
+

 /*================================= Data types ============================== */
 
 /* A redis object, that is a type able to hold a string / list / set */
 /*================================= Data types ============================== */
 
 /* A redis object, that is a type able to hold a string / list / set */


@@ -203,6 +213,17 @@ typedef struct redisObject {
     int refcount;
 } robj;
 
     int refcount;
 } robj;
 

+/* Macro used to initalize a Redis object allocated on the stack.
+ * Note that this macro is taken near the structure definition to make sure
+ * we'll update it when the structure is changed, to avoid bugs like
+ * bug #85 introduced exactly in this way. */
+#define initStaticStringObject(_var,_ptr) do { \
+    _var.refcount = 1; \
+    _var.type = REDIS_STRING; \
+    _var.encoding = REDIS_ENCODING_RAW; \
+    _var.ptr = _ptr; \
+} while(0);
+

 typedef struct redisDb {
     dict *dict;
     dict *expires;
 typedef struct redisDb {
     dict *dict;
     dict *expires;


@@ -269,8 +290,9 @@ struct redisServer {
     int appendfd;
     int appendseldb;
     char *pidfile;
     int appendfd;
     int appendseldb;
     char *pidfile;

-    int bgsaveinprogress;

     pid_t bgsavechildpid;
     pid_t bgsavechildpid;

+    pid_t bgrewritechildpid;
+    sds bgrewritebuf; /* buffer taken by parent during oppend only rewrite */

     struct saveparam *saveparams;
     int saveparamslen;
     char *logfile;
     struct saveparam *saveparams;
     int saveparamslen;
     char *logfile;


@@ -279,8 +301,10 @@ struct redisServer {
     char *appendfilename;
     char *requirepass;
     int shareobjects;
     char *appendfilename;
     char *requirepass;
     int shareobjects;

+    int rdbcompression;

     /* Replication related */
     int isslave;
     /* Replication related */
     int isslave;

+    char *masterauth;

     char *masterhost;
     int masterport;
     redisClient *master;    /* client that is master for this slave */
     char *masterhost;
     int masterport;
     redisClient *master;    /* client that is master for this slave */


@@ -376,7 +400,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
 static int syncWithMaster(void);
 static robj *tryObjectSharing(robj *o);
 static int tryObjectEncoding(robj *o);
 static int syncWithMaster(void);
 static robj *tryObjectSharing(robj *o);
 static int tryObjectEncoding(robj *o);

-static robj *getDecodedObject(const robj *o);
+static robj *getDecodedObject(robj *o);

 static int removeExpire(redisDb *db, robj *key);
 static int expireIfNeeded(redisDb *db, robj *key);
 static int deleteIfVolatile(redisDb *db, robj *key);
 static int removeExpire(redisDb *db, robj *key);
 static int expireIfNeeded(redisDb *db, robj *key);
 static int deleteIfVolatile(redisDb *db, robj *key);


@@ -388,11 +412,13 @@ static void freeMemoryIfNeeded(void);
 static int processCommand(redisClient *c);
 static void setupSigSegvAction(void);
 static void rdbRemoveTempFile(pid_t childpid);
 static int processCommand(redisClient *c);
 static void setupSigSegvAction(void);
 static void rdbRemoveTempFile(pid_t childpid);

+static void aofRemoveTempFile(pid_t childpid);

 static size_t stringObjectLen(robj *o);
 static void processInputBuffer(redisClient *c);
 static zskiplist *zslCreate(void);
 static void zslFree(zskiplist *zsl);
 static void zslInsert(zskiplist *zsl, double score, robj *obj);
 static size_t stringObjectLen(robj *o);
 static void processInputBuffer(redisClient *c);
 static zskiplist *zslCreate(void);
 static void zslFree(zskiplist *zsl);
 static void zslInsert(zskiplist *zsl, double score, robj *obj);

+static void sendReplyToClientWritev(aeEventLoop *el, int fd, void *privdata, int mask);

 
 static void authCommand(redisClient *c);
 static void pingCommand(redisClient *c);
 
 static void authCommand(redisClient *c);
 static void pingCommand(redisClient *c);


@@ -413,6 +439,7 @@ static void dbsizeCommand(redisClient *c);
 static void lastsaveCommand(redisClient *c);
 static void saveCommand(redisClient *c);
 static void bgsaveCommand(redisClient *c);
 static void lastsaveCommand(redisClient *c);
 static void saveCommand(redisClient *c);
 static void bgsaveCommand(redisClient *c);

+static void bgrewriteaofCommand(redisClient *c);

 static void shutdownCommand(redisClient *c);
 static void moveCommand(redisClient *c);
 static void renameCommand(redisClient *c);
 static void shutdownCommand(redisClient *c);
 static void moveCommand(redisClient *c);
 static void renameCommand(redisClient *c);


@@ -445,6 +472,7 @@ static void flushdbCommand(redisClient *c);
 static void flushallCommand(redisClient *c);
 static void sortCommand(redisClient *c);
 static void lremCommand(redisClient *c);
 static void flushallCommand(redisClient *c);
 static void sortCommand(redisClient *c);
 static void lremCommand(redisClient *c);

+static void rpoplpushcommand(redisClient *c);

 static void infoCommand(redisClient *c);
 static void mgetCommand(redisClient *c);
 static void monitorCommand(redisClient *c);
 static void infoCommand(redisClient *c);
 static void mgetCommand(redisClient *c);
 static void monitorCommand(redisClient *c);


@@ -457,6 +485,7 @@ static void debugCommand(redisClient *c);
 static void msetCommand(redisClient *c);
 static void msetnxCommand(redisClient *c);
 static void zaddCommand(redisClient *c);
 static void msetCommand(redisClient *c);
 static void msetnxCommand(redisClient *c);
 static void zaddCommand(redisClient *c);

+static void zincrbyCommand(redisClient *c);

 static void zrangeCommand(redisClient *c);
 static void zrangebyscoreCommand(redisClient *c);
 static void zrevrangeCommand(redisClient *c);
 static void zrangeCommand(redisClient *c);
 static void zrangebyscoreCommand(redisClient *c);
 static void zrevrangeCommand(redisClient *c);


@@ -488,6 +517,7 @@ static struct redisCommand cmdTable[] = {
     {"lrange",lrangeCommand,4,REDIS_CMD_INLINE},
     {"ltrim",ltrimCommand,4,REDIS_CMD_INLINE},
     {"lrem",lremCommand,4,REDIS_CMD_BULK},
     {"lrange",lrangeCommand,4,REDIS_CMD_INLINE},
     {"ltrim",ltrimCommand,4,REDIS_CMD_INLINE},
     {"lrem",lremCommand,4,REDIS_CMD_BULK},

+    {"rpoplpush",rpoplpushcommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},

     {"sadd",saddCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},
     {"srem",sremCommand,3,REDIS_CMD_BULK},
     {"smove",smoveCommand,4,REDIS_CMD_BULK},
     {"sadd",saddCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},
     {"srem",sremCommand,3,REDIS_CMD_BULK},
     {"smove",smoveCommand,4,REDIS_CMD_BULK},


@@ -503,10 +533,11 @@ static struct redisCommand cmdTable[] = {
     {"sdiffstore",sdiffstoreCommand,-3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM},
     {"smembers",sinterCommand,2,REDIS_CMD_INLINE},
     {"zadd",zaddCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},
     {"sdiffstore",sdiffstoreCommand,-3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM},
     {"smembers",sinterCommand,2,REDIS_CMD_INLINE},
     {"zadd",zaddCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},

+    {"zincrby",zincrbyCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},

     {"zrem",zremCommand,3,REDIS_CMD_BULK},
     {"zremrangebyscore",zremrangebyscoreCommand,4,REDIS_CMD_INLINE},
     {"zrange",zrangeCommand,4,REDIS_CMD_INLINE},
     {"zrem",zremCommand,3,REDIS_CMD_BULK},
     {"zremrangebyscore",zremrangebyscoreCommand,4,REDIS_CMD_INLINE},
     {"zrange",zrangeCommand,4,REDIS_CMD_INLINE},

-    {"zrangebyscore",zrangebyscoreCommand,4,REDIS_CMD_INLINE},
+    {"zrangebyscore",zrangebyscoreCommand,-4,REDIS_CMD_INLINE},

     {"zrevrange",zrevrangeCommand,4,REDIS_CMD_INLINE},
     {"zcard",zcardCommand,2,REDIS_CMD_INLINE},
     {"zscore",zscoreCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},
     {"zrevrange",zrevrangeCommand,4,REDIS_CMD_INLINE},
     {"zcard",zcardCommand,2,REDIS_CMD_INLINE},
     {"zscore",zscoreCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM},


@@ -529,6 +560,7 @@ static struct redisCommand cmdTable[] = {
     {"echo",echoCommand,2,REDIS_CMD_BULK},
     {"save",saveCommand,1,REDIS_CMD_INLINE},
     {"bgsave",bgsaveCommand,1,REDIS_CMD_INLINE},
     {"echo",echoCommand,2,REDIS_CMD_BULK},
     {"save",saveCommand,1,REDIS_CMD_INLINE},
     {"bgsave",bgsaveCommand,1,REDIS_CMD_INLINE},

+    {"bgrewriteaof",bgrewriteaofCommand,1,REDIS_CMD_INLINE},

     {"shutdown",shutdownCommand,1,REDIS_CMD_INLINE},
     {"lastsave",lastsaveCommand,1,REDIS_CMD_INLINE},
     {"type",typeCommand,2,REDIS_CMD_INLINE},
     {"shutdown",shutdownCommand,1,REDIS_CMD_INLINE},
     {"lastsave",lastsaveCommand,1,REDIS_CMD_INLINE},
     {"type",typeCommand,2,REDIS_CMD_INLINE},


@@ -543,6 +575,7 @@ static struct redisCommand cmdTable[] = {
     {"debug",debugCommand,-2,REDIS_CMD_INLINE},
     {NULL,NULL,0,0}
 };
     {"debug",debugCommand,-2,REDIS_CMD_INLINE},
     {NULL,NULL,0,0}
 };

+

 /*============================ Utility functions ============================ */
 
 /* Glob-style pattern matching. */
 /*============================ Utility functions ============================ */
 
 /* Glob-style pattern matching. */


@@ -739,37 +772,24 @@ static unsigned int dictObjHash(const void *key) {
 static int dictEncObjKeyCompare(void *privdata, const void *key1,
         const void *key2)
 {
 static int dictEncObjKeyCompare(void *privdata, const void *key1,
         const void *key2)
 {

-    const robj *o1 = key1, *o2 = key2;
-
-    if (o1->encoding == REDIS_ENCODING_RAW &&
-        o2->encoding == REDIS_ENCODING_RAW)
-        return sdsDictKeyCompare(privdata,o1->ptr,o2->ptr);
-    else {
-        robj *dec1, *dec2;
-        int cmp;
+    robj *o1 = (robj*) key1, *o2 = (robj*) key2;
+    int cmp;

 
 

-        dec1 = o1->encoding != REDIS_ENCODING_RAW ?
-            getDecodedObject(o1) : (robj*)o1;
-        dec2 = o2->encoding != REDIS_ENCODING_RAW ?
-            getDecodedObject(o2) : (robj*)o2;
-        cmp = sdsDictKeyCompare(privdata,dec1->ptr,dec2->ptr);
-        if (dec1 != o1) decrRefCount(dec1);
-        if (dec2 != o2) decrRefCount(dec2);
-        return cmp;
-    }
+    o1 = getDecodedObject(o1);
+    o2 = getDecodedObject(o2);
+    cmp = sdsDictKeyCompare(privdata,o1->ptr,o2->ptr);
+    decrRefCount(o1);
+    decrRefCount(o2);
+    return cmp;

 }
 
 static unsigned int dictEncObjHash(const void *key) {
 }
 
 static unsigned int dictEncObjHash(const void *key) {

-    const robj *o = key;
+    robj *o = (robj*) key;

 
 

-    if (o->encoding == REDIS_ENCODING_RAW)
-        return dictGenHashFunction(o->ptr, sdslen((sds)o->ptr));
-    else {
-        robj *dec = getDecodedObject(o);
-        unsigned int hash = dictGenHashFunction(dec->ptr, sdslen((sds)dec->ptr));
-        decrRefCount(dec);
-        return hash;
-    }
+    o = getDecodedObject(o);
+    unsigned int hash = dictGenHashFunction(o->ptr, sdslen((sds)o->ptr));
+    decrRefCount(o);
+    return hash;

 }
 
 static dictType setDictType = {
 }
 
 static dictType setDictType = {


@@ -787,7 +807,7 @@ static dictType zsetDictType = {
     NULL,                      /* val dup */
     dictEncObjKeyCompare,      /* key compare */
     dictRedisObjectDestructor, /* key destructor */
     NULL,                      /* val dup */
     dictEncObjKeyCompare,      /* key compare */
     dictRedisObjectDestructor, /* key destructor */

-    dictVanillaFree            /* val destructor */
+    dictVanillaFree            /* val destructor of malloc(sizeof(double)) */

 };
 
 static dictType hashDictType = {
 };
 
 static dictType hashDictType = {


@@ -807,8 +827,7 @@ static dictType hashDictType = {
  * is based on heap allocation for send buffers, so we simply abort.
  * At least the code will be simpler to read... */
 static void oom(const char *msg) {
  * is based on heap allocation for send buffers, so we simply abort.
  * At least the code will be simpler to read... */
 static void oom(const char *msg) {

-    fprintf(stderr, "%s: Out of memory\n",msg);
-    fflush(stderr);
+    redisLog(REDIS_WARNING, "%s: Out of memory\n",msg);

     sleep(1);
     abort();
 }
     sleep(1);
     abort();
 }


@@ -856,6 +875,90 @@ static void tryResizeHashTables(void) {
     }
 }
 
     }
 }
 

+/* A background saving child (BGSAVE) terminated its work. Handle this. */
+void backgroundSaveDoneHandler(int statloc) {
+    int exitcode = WEXITSTATUS(statloc);
+    int bysignal = WIFSIGNALED(statloc);
+
+    if (!bysignal && exitcode == 0) {
+        redisLog(REDIS_NOTICE,
+            "Background saving terminated with success");
+        server.dirty = 0;
+        server.lastsave = time(NULL);
+    } else if (!bysignal && exitcode != 0) {
+        redisLog(REDIS_WARNING, "Background saving error");
+    } else {
+        redisLog(REDIS_WARNING,
+            "Background saving terminated by signal");
+        rdbRemoveTempFile(server.bgsavechildpid);
+    }
+    server.bgsavechildpid = -1;
+    /* Possibly there are slaves waiting for a BGSAVE in order to be served
+     * (the first stage of SYNC is a bulk transfer of dump.rdb) */
+    updateSlavesWaitingBgsave(exitcode == 0 ? REDIS_OK : REDIS_ERR);
+}
+
+/* A background append only file rewriting (BGREWRITEAOF) terminated its work.
+ * Handle this. */
+void backgroundRewriteDoneHandler(int statloc) {
+    int exitcode = WEXITSTATUS(statloc);
+    int bysignal = WIFSIGNALED(statloc);
+
+    if (!bysignal && exitcode == 0) {
+        int fd;
+        char tmpfile[256];
+
+        redisLog(REDIS_NOTICE,
+            "Background append only file rewriting terminated with success");
+        /* Now it's time to flush the differences accumulated by the parent */
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) server.bgrewritechildpid);
+        fd = open(tmpfile,O_WRONLY|O_APPEND);
+        if (fd == -1) {
+            redisLog(REDIS_WARNING, "Not able to open the temp append only file produced by the child: %s", strerror(errno));
+            goto cleanup;
+        }
+        /* Flush our data... */
+        if (write(fd,server.bgrewritebuf,sdslen(server.bgrewritebuf)) !=
+                (signed) sdslen(server.bgrewritebuf)) {
+            redisLog(REDIS_WARNING, "Error or short write trying to flush the parent diff of the append log file in the child temp file: %s", strerror(errno));
+            close(fd);
+            goto cleanup;
+        }
+        redisLog(REDIS_NOTICE,"Parent diff flushed into the new append log file with success (%lu bytes)",sdslen(server.bgrewritebuf));
+        /* Now our work is to rename the temp file into the stable file. And
+         * switch the file descriptor used by the server for append only. */
+        if (rename(tmpfile,server.appendfilename) == -1) {
+            redisLog(REDIS_WARNING,"Can't rename the temp append only file into the stable one: %s", strerror(errno));
+            close(fd);
+            goto cleanup;
+        }
+        /* Mission completed... almost */
+        redisLog(REDIS_NOTICE,"Append only file successfully rewritten.");
+        if (server.appendfd != -1) {
+            /* If append only is actually enabled... */
+            close(server.appendfd);
+            server.appendfd = fd;
+            fsync(fd);
+            server.appendseldb = -1; /* Make sure it will issue SELECT */
+            redisLog(REDIS_NOTICE,"The new append only file was selected for future appends.");
+        } else {
+            /* If append only is disabled we just generate a dump in this
+             * format. Why not? */
+            close(fd);
+        }
+    } else if (!bysignal && exitcode != 0) {
+        redisLog(REDIS_WARNING, "Background append only file rewriting error");
+    } else {
+        redisLog(REDIS_WARNING,
+            "Background append only file rewriting terminated by signal");
+    }
+cleanup:
+    sdsfree(server.bgrewritebuf);
+    server.bgrewritebuf = sdsempty();
+    aofRemoveTempFile(server.bgrewritechildpid);
+    server.bgrewritechildpid = -1;
+}
+

 static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
     int j, loops = server.cronloops++;
     REDIS_NOTUSED(eventLoop);
 static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
     int j, loops = server.cronloops++;
     REDIS_NOTUSED(eventLoop);


@@ -884,7 +987,7 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
      * if we resize the HT while there is the saving child at work actually
      * a lot of memory movements in the parent will cause a lot of pages
      * copied. */
      * if we resize the HT while there is the saving child at work actually
      * a lot of memory movements in the parent will cause a lot of pages
      * copied. */

-    if (!server.bgsaveinprogress) tryResizeHashTables();
+    if (server.bgsavechildpid == -1) tryResizeHashTables();

 
     /* Show information about connected clients */
     if (!(loops % 5)) {
 
     /* Show information about connected clients */
     if (!(loops % 5)) {


@@ -899,28 +1002,17 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
     if (server.maxidletime && !(loops % 10))
         closeTimedoutClients();
 
     if (server.maxidletime && !(loops % 10))
         closeTimedoutClients();
 

-    /* Check if a background saving in progress terminated */
-    if (server.bgsaveinprogress) {
+    /* Check if a background saving or AOF rewrite in progress terminated */
+    if (server.bgsavechildpid != -1 || server.bgrewritechildpid != -1) {

         int statloc;
         int statloc;

-        if (wait4(-1,&statloc,WNOHANG,NULL)) {
-            int exitcode = WEXITSTATUS(statloc);
-            int bysignal = WIFSIGNALED(statloc);
-
-            if (!bysignal && exitcode == 0) {
-                redisLog(REDIS_NOTICE,
-                    "Background saving terminated with success");
-                server.dirty = 0;
-                server.lastsave = time(NULL);
-            } else if (!bysignal && exitcode != 0) {
-                redisLog(REDIS_WARNING, "Background saving error");
+        pid_t pid;
+
+        if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
+            if (pid == server.bgsavechildpid) {
+                backgroundSaveDoneHandler(statloc);

             } else {
             } else {

-                redisLog(REDIS_WARNING,
-                    "Background saving terminated by signal");
-                rdbRemoveTempFile(server.bgsavechildpid);
+                backgroundRewriteDoneHandler(statloc);

             }
             }

-            server.bgsaveinprogress = 0;
-            server.bgsavechildpid = -1;
-            updateSlavesWaitingBgsave(exitcode == 0 ? REDIS_OK : REDIS_ERR);

         }
     } else {
         /* If there is not a background saving in progress check if
         }
     } else {
         /* If there is not a background saving in progress check if


@@ -939,14 +1031,21 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
          }
     }
 
          }
     }
 

-    /* Try to expire a few timed out keys */
+    /* Try to expire a few timed out keys. The algorithm used is adaptive and
+     * will use few CPU cycles if there are few expiring keys, otherwise
+     * it will get more aggressive to avoid that too much memory is used by
+     * keys that can be removed from the keyspace. */

     for (j = 0; j < server.dbnum; j++) {
     for (j = 0; j < server.dbnum; j++) {

+        int expired;

         redisDb *db = server.db+j;
         redisDb *db = server.db+j;

-        int num = dictSize(db->expires);

 
 

-        if (num) {
+        /* Continue to expire if at the end of the cycle more than 25%
+         * of the keys were expired. */
+        do {
+            int num = dictSize(db->expires);

             time_t now = time(NULL);
 
             time_t now = time(NULL);
 

+            expired = 0;

             if (num > REDIS_EXPIRELOOKUPS_PER_CRON)
                 num = REDIS_EXPIRELOOKUPS_PER_CRON;
             while (num--) {
             if (num > REDIS_EXPIRELOOKUPS_PER_CRON)
                 num = REDIS_EXPIRELOOKUPS_PER_CRON;
             while (num--) {


@@ -957,9 +1056,10 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
                 t = (time_t) dictGetEntryVal(de);
                 if (now > t) {
                     deleteKey(db,dictGetEntryKey(de));
                 t = (time_t) dictGetEntryVal(de);
                 if (now > t) {
                     deleteKey(db,dictGetEntryKey(de));

+                    expired++;

                 }
             }
                 }
             }

-        }
+        } while (expired > REDIS_EXPIRELOOKUPS_PER_CRON/4);

     }
 
     /* Check if we should connect to a MASTER */
     }
 
     /* Check if we should connect to a MASTER */


@@ -1016,7 +1116,7 @@ static void appendServerSaveParams(time_t seconds, int changes) {
     server.saveparamslen++;
 }
 
     server.saveparamslen++;
 }
 

-static void ResetServerSaveParams() {
+static void resetServerSaveParams() {

     zfree(server.saveparams);
     server.saveparams = NULL;
     server.saveparamslen = 0;
     zfree(server.saveparams);
     server.saveparams = NULL;
     server.saveparamslen = 0;


@@ -1039,19 +1139,21 @@ static void initServerConfig() {
     server.appendseldb = -1; /* Make sure the first time will not match */
     server.pidfile = "/var/run/redis.pid";
     server.dbfilename = "dump.rdb";
     server.appendseldb = -1; /* Make sure the first time will not match */
     server.pidfile = "/var/run/redis.pid";
     server.dbfilename = "dump.rdb";

-    server.appendfilename = "appendonly.log";
+    server.appendfilename = "appendonly.aof";

     server.requirepass = NULL;
     server.shareobjects = 0;
     server.requirepass = NULL;
     server.shareobjects = 0;

+    server.rdbcompression = 1;

     server.sharingpoolsize = 1024;
     server.maxclients = 0;
     server.maxmemory = 0;
     server.sharingpoolsize = 1024;
     server.maxclients = 0;
     server.maxmemory = 0;

-    ResetServerSaveParams();
+    resetServerSaveParams();

 
     appendServerSaveParams(60*60,1);  /* save after 1 hour and 1 change */
     appendServerSaveParams(300,100);  /* save after 5 minutes and 100 changes */
     appendServerSaveParams(60,10000); /* save after 1 minute and 10000 changes */
     /* Replication related */
     server.isslave = 0;
 
     appendServerSaveParams(60*60,1);  /* save after 1 hour and 1 change */
     appendServerSaveParams(300,100);  /* save after 5 minutes and 100 changes */
     appendServerSaveParams(60,10000); /* save after 1 minute and 10000 changes */
     /* Replication related */
     server.isslave = 0;

+    server.masterauth = NULL;

     server.masterhost = NULL;
     server.masterport = 6379;
     server.master = NULL;
     server.masterhost = NULL;
     server.masterport = 6379;
     server.master = NULL;


@@ -1090,8 +1192,9 @@ static void initServer() {
         server.db[j].id = j;
     }
     server.cronloops = 0;
         server.db[j].id = j;
     }
     server.cronloops = 0;

-    server.bgsaveinprogress = 0;

     server.bgsavechildpid = -1;
     server.bgsavechildpid = -1;

+    server.bgrewritechildpid = -1;
+    server.bgrewritebuf = sdsempty();

     server.lastsave = time(NULL);
     server.dirty = 0;
     server.usedmemory = 0;
     server.lastsave = time(NULL);
     server.dirty = 0;
     server.usedmemory = 0;


@@ -1230,6 +1333,8 @@ static void loadServerConfig(char *filename) {
             server.masterhost = sdsnew(argv[1]);
             server.masterport = atoi(argv[2]);
             server.replstate = REDIS_REPL_CONNECT;
             server.masterhost = sdsnew(argv[1]);
             server.masterport = atoi(argv[2]);
             server.replstate = REDIS_REPL_CONNECT;

+        } else if (!strcasecmp(argv[0],"masterauth") && argc == 2) {
+               server.masterauth = zstrdup(argv[1]);

         } else if (!strcasecmp(argv[0],"glueoutputbuf") && argc == 2) {
             if ((server.glueoutputbuf = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
         } else if (!strcasecmp(argv[0],"glueoutputbuf") && argc == 2) {
             if ((server.glueoutputbuf = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;


@@ -1238,6 +1343,10 @@ static void loadServerConfig(char *filename) {
             if ((server.shareobjects = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
             if ((server.shareobjects = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }

+        } else if (!strcasecmp(argv[0],"rdbcompression") && argc == 2) {
+            if ((server.rdbcompression = yesnotoi(argv[1])) == -1) {
+                err = "argument must be 'yes' or 'no'"; goto loaderr;
+            }

         } else if (!strcasecmp(argv[0],"shareobjectspoolsize") && argc == 2) {
             server.sharingpoolsize = atoi(argv[1]);
             if (server.sharingpoolsize < 1) {
         } else if (!strcasecmp(argv[0],"shareobjectspoolsize") && argc == 2) {
             server.sharingpoolsize = atoi(argv[1]);
             if (server.sharingpoolsize < 1) {


@@ -1308,14 +1417,14 @@ static void freeClient(redisClient *c) {
     freeClientArgv(c);
     close(c->fd);
     ln = listSearchKey(server.clients,c);
     freeClientArgv(c);
     close(c->fd);
     ln = listSearchKey(server.clients,c);

-    assert(ln != NULL);
+    redisAssert(ln != NULL);

     listDelNode(server.clients,ln);
     if (c->flags & REDIS_SLAVE) {
         if (c->replstate == REDIS_REPL_SEND_BULK && c->repldbfd != -1)
             close(c->repldbfd);
         list *l = (c->flags & REDIS_MONITOR) ? server.monitors : server.slaves;
         ln = listSearchKey(l,c);
     listDelNode(server.clients,ln);
     if (c->flags & REDIS_SLAVE) {
         if (c->replstate == REDIS_REPL_SEND_BULK && c->repldbfd != -1)
             close(c->repldbfd);
         list *l = (c->flags & REDIS_MONITOR) ? server.monitors : server.slaves;
         ln = listSearchKey(l,c);

-        assert(ln != NULL);
+        redisAssert(ln != NULL);

         listDelNode(l,ln);
     }
     if (c->flags & REDIS_MASTER) {
         listDelNode(l,ln);
     }
     if (c->flags & REDIS_MASTER) {


@@ -1327,34 +1436,31 @@ static void freeClient(redisClient *c) {
     zfree(c);
 }
 
     zfree(c);
 }
 

+#define GLUEREPLY_UP_TO (1024)

 static void glueReplyBuffersIfNeeded(redisClient *c) {
 static void glueReplyBuffersIfNeeded(redisClient *c) {

-    int totlen = 0;
+    int copylen = 0;
+    char buf[GLUEREPLY_UP_TO];

     listNode *ln;
     robj *o;
 
     listRewind(c->reply);
     while((ln = listYield(c->reply))) {
     listNode *ln;
     robj *o;
 
     listRewind(c->reply);
     while((ln = listYield(c->reply))) {

+        int objlen;
+

         o = ln->value;
         o = ln->value;

-        totlen += sdslen(o->ptr);
-        /* This optimization makes more sense if we don't have to copy
-         * too much data */
-        if (totlen > 1024) return;
-    }
-    if (totlen > 0) {
-        char buf[1024];
-        int copylen = 0;
-
-        listRewind(c->reply);
-        while((ln = listYield(c->reply))) {
-            o = ln->value;
-            memcpy(buf+copylen,o->ptr,sdslen(o->ptr));
-            copylen += sdslen(o->ptr);
+        objlen = sdslen(o->ptr);
+        if (copylen + objlen <= GLUEREPLY_UP_TO) {
+            memcpy(buf+copylen,o->ptr,objlen);
+            copylen += objlen;

             listDelNode(c->reply,ln);
             listDelNode(c->reply,ln);

+        } else {
+            if (copylen == 0) return;
+            break;

         }
         }

-        /* Now the output buffer is empty, add the new single element */
-        o = createObject(REDIS_STRING,sdsnewlen(buf,totlen));
-        listAddNodeTail(c->reply,o);

     }
     }

+    /* Now the output buffer is empty, add the new single element */
+    o = createObject(REDIS_STRING,sdsnewlen(buf,copylen));
+    listAddNodeHead(c->reply,o);

 }
 
 static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
 }
 
 static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {


@@ -1364,9 +1470,19 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
 
     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
 

-    if (server.glueoutputbuf && listLength(c->reply) > 1)
-        glueReplyBuffersIfNeeded(c);
+    /* Use writev() if we have enough buffers to send */
+    if (!server.glueoutputbuf &&
+        listLength(c->reply) > REDIS_WRITEV_THRESHOLD && 
+        !(c->flags & REDIS_MASTER))
+    {
+        sendReplyToClientWritev(el, fd, privdata, mask);
+        return;
+    }
+

     while(listLength(c->reply)) {
     while(listLength(c->reply)) {

+        if (server.glueoutputbuf && listLength(c->reply) > 1)
+            glueReplyBuffersIfNeeded(c);
+

         o = listNodeValue(listFirst(c->reply));
         objlen = sdslen(o->ptr);
 
         o = listNodeValue(listFirst(c->reply));
         objlen = sdslen(o->ptr);
 


@@ -1390,10 +1506,10 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
             c->sentlen = 0;
         }
         /* Note that we avoid to send more thank REDIS_MAX_WRITE_PER_EVENT
             c->sentlen = 0;
         }
         /* Note that we avoid to send more thank REDIS_MAX_WRITE_PER_EVENT

-         * bytes, in a single threaded server it's a good idea to server
+         * bytes, in a single threaded server it's a good idea to serve

          * other clients as well, even if a very large request comes from
          * super fast link that is always able to accept data (in real world
          * other clients as well, even if a very large request comes from
          * super fast link that is always able to accept data (in real world

-         * terms think to 'KEYS *' against the loopback interfae) */
+         * scenario think about 'KEYS *' against the loopback interfae) */

         if (totwritten > REDIS_MAX_WRITE_PER_EVENT) break;
     }
     if (nwritten == -1) {
         if (totwritten > REDIS_MAX_WRITE_PER_EVENT) break;
     }
     if (nwritten == -1) {


@@ -1413,6 +1529,84 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
     }
 }
 
     }
 }
 

+static void sendReplyToClientWritev(aeEventLoop *el, int fd, void *privdata, int mask)
+{
+    redisClient *c = privdata;
+    int nwritten = 0, totwritten = 0, objlen, willwrite;
+    robj *o;
+    struct iovec iov[REDIS_WRITEV_IOVEC_COUNT];
+    int offset, ion = 0;
+    REDIS_NOTUSED(el);
+    REDIS_NOTUSED(mask);
+
+    listNode *node;
+    while (listLength(c->reply)) {
+        offset = c->sentlen;
+        ion = 0;
+        willwrite = 0;
+
+        /* fill-in the iov[] array */
+        for(node = listFirst(c->reply); node; node = listNextNode(node)) {
+            o = listNodeValue(node);
+            objlen = sdslen(o->ptr);
+
+            if (totwritten + objlen - offset > REDIS_MAX_WRITE_PER_EVENT) 
+                break;
+
+            if(ion == REDIS_WRITEV_IOVEC_COUNT)
+                break; /* no more iovecs */
+
+            iov[ion].iov_base = ((char*)o->ptr) + offset;
+            iov[ion].iov_len = objlen - offset;
+            willwrite += objlen - offset;
+            offset = 0; /* just for the first item */
+            ion++;
+        }
+
+        if(willwrite == 0)
+            break;
+
+        /* write all collected blocks at once */
+        if((nwritten = writev(fd, iov, ion)) < 0) {
+            if (errno != EAGAIN) {
+                redisLog(REDIS_DEBUG,
+                         "Error writing to client: %s", strerror(errno));
+                freeClient(c);
+                return;
+            }
+            break;
+        }
+
+        totwritten += nwritten;
+        offset = c->sentlen;
+
+        /* remove written robjs from c->reply */
+        while (nwritten && listLength(c->reply)) {
+            o = listNodeValue(listFirst(c->reply));
+            objlen = sdslen(o->ptr);
+
+            if(nwritten >= objlen - offset) {
+                listDelNode(c->reply, listFirst(c->reply));
+                nwritten -= objlen - offset;
+                c->sentlen = 0;
+            } else {
+                /* partial write */
+                c->sentlen += nwritten;
+                break;
+            }
+            offset = 0;
+        }
+    }
+
+    if (totwritten > 0) 
+        c->lastinteraction = time(NULL);
+
+    if (listLength(c->reply) == 0) {
+        c->sentlen = 0;
+        aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE);
+    }
+}
+

 static struct redisCommand *lookupCommand(char *name) {
     int j = 0;
     while(cmdTable[j].name != NULL) {
 static struct redisCommand *lookupCommand(char *name) {
     int j = 0;
     while(cmdTable[j].name != NULL) {


@@ -1525,7 +1719,10 @@ static int processCommand(redisClient *c) {
         return 1;
     } else if ((cmd->arity > 0 && cmd->arity != c->argc) ||
                (c->argc < -cmd->arity)) {
         return 1;
     } else if ((cmd->arity > 0 && cmd->arity != c->argc) ||
                (c->argc < -cmd->arity)) {

-        addReplySds(c,sdsnew("-ERR wrong number of arguments\r\n"));
+        addReplySds(c,
+            sdscatprintf(sdsempty(),
+                "-ERR wrong number of arguments for '%s' command\r\n",
+                cmd->name));

         resetClient(c);
         return 1;
     } else if (server.maxmemory && cmd->flags & REDIS_CMD_DENYOOM && zmalloc_used_memory() > server.maxmemory) {
         resetClient(c);
         return 1;
     } else if (server.maxmemory && cmd->flags & REDIS_CMD_DENYOOM && zmalloc_used_memory() > server.maxmemory) {


@@ -1613,8 +1810,8 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
             robj *lenobj;
 
             lenobj = createObject(REDIS_STRING,
             robj *lenobj;
 
             lenobj = createObject(REDIS_STRING,

-                sdscatprintf(sdsempty(),"%d\r\n",
-                    stringObjectLen(argv[j])));
+                sdscatprintf(sdsempty(),"%lu\r\n",
+                    (unsigned long) stringObjectLen(argv[j])));

             lenobj->refcount = 0;
             outv[outc++] = lenobj;
         }
             lenobj->refcount = 0;
             outv[outc++] = lenobj;
         }


@@ -1686,11 +1883,6 @@ again:
             sdsupdatelen(query);
 
             /* Now we can split the query in arguments */
             sdsupdatelen(query);
 
             /* Now we can split the query in arguments */

-            if (sdslen(query) == 0) {
-                /* Ignore empty query */
-                sdsfree(query);
-                return;
-            }

             argv = sdssplitlen(query,sdslen(query)," ",1,&argc);
             sdsfree(query);
 
             argv = sdssplitlen(query,sdslen(query)," ",1,&argc);
             sdsfree(query);
 


@@ -1706,10 +1898,16 @@ again:
                 }
             }
             zfree(argv);
                 }
             }
             zfree(argv);

-            /* Execute the command. If the client is still valid
-             * after processCommand() return and there is something
-             * on the query buffer try to process the next command. */
-            if (c->argc && processCommand(c) && sdslen(c->querybuf)) goto again;
+            if (c->argc) {
+                /* Execute the command. If the client is still valid
+                 * after processCommand() return and there is something
+                 * on the query buffer try to process the next command. */
+                if (processCommand(c) && sdslen(c->querybuf)) goto again;
+            } else {
+                /* Nothing to process, argc == 0. Just process the query
+                 * buffer if it's not empty or return to the caller */
+                if (sdslen(c->querybuf)) goto again;
+            }

             return;
         } else if (sdslen(c->querybuf) >= REDIS_REQUEST_MAX_SIZE) {
             redisLog(REDIS_DEBUG, "Client protocol error");
             return;
         } else if (sdslen(c->querybuf) >= REDIS_REQUEST_MAX_SIZE) {
             redisLog(REDIS_DEBUG, "Client protocol error");


@@ -1803,7 +2001,7 @@ static redisClient *createClient(int fd) {
     listSetFreeMethod(c->reply,decrRefCount);
     listSetDupMethod(c->reply,dupClientReplyValue);
     if (aeCreateFileEvent(server.el, c->fd, AE_READABLE,
     listSetFreeMethod(c->reply,decrRefCount);
     listSetDupMethod(c->reply,dupClientReplyValue);
     if (aeCreateFileEvent(server.el, c->fd, AE_READABLE,

-        readQueryFromClient, c, NULL) == AE_ERR) {
+        readQueryFromClient, c) == AE_ERR) {

         freeClient(c);
         return NULL;
     }
         freeClient(c);
         return NULL;
     }


@@ -1816,13 +2014,8 @@ static void addReply(redisClient *c, robj *obj) {
         (c->replstate == REDIS_REPL_NONE ||
          c->replstate == REDIS_REPL_ONLINE) &&
         aeCreateFileEvent(server.el, c->fd, AE_WRITABLE,
         (c->replstate == REDIS_REPL_NONE ||
          c->replstate == REDIS_REPL_ONLINE) &&
         aeCreateFileEvent(server.el, c->fd, AE_WRITABLE,

-        sendReplyToClient, c, NULL) == AE_ERR) return;
-    if (obj->encoding != REDIS_ENCODING_RAW) {
-        obj = getDecodedObject(obj);
-    } else {
-        incrRefCount(obj);
-    }
-    listAddNodeTail(c->reply,obj);
+        sendReplyToClient, c) == AE_ERR) return;
+    listAddNodeTail(c->reply,getDecodedObject(obj));

 }
 
 static void addReplySds(redisClient *c, sds s) {
 }
 
 static void addReplySds(redisClient *c, sds s) {


@@ -1831,6 +2024,14 @@ static void addReplySds(redisClient *c, sds s) {
     decrRefCount(o);
 }
 
     decrRefCount(o);
 }
 

+static void addReplyDouble(redisClient *c, double d) {
+    char buf[128];
+
+    snprintf(buf,sizeof(buf),"%.17g",d);
+    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n%s\r\n",
+        (unsigned long) strlen(buf),buf));
+}
+

 static void addReplyBulkLen(redisClient *c, robj *obj) {
     size_t len;
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {
     size_t len;
 


@@ -1839,6 +2040,7 @@ static void addReplyBulkLen(redisClient *c, robj *obj) {
     } else {
         long n = (long)obj->ptr;
 
     } else {
         long n = (long)obj->ptr;
 

+        /* Compute how many bytes will take this integer as a radix 10 string */

         len = 1;
         if (n < 0) {
             len++;
         len = 1;
         if (n < 0) {
             len++;


@@ -1848,7 +2050,7 @@ static void addReplyBulkLen(redisClient *c, robj *obj) {
             len++;
         }
     }
             len++;
         }
     }

-    addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",len));
+    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",(unsigned long)len));

 }
 
 static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
 }
 
 static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {


@@ -1878,7 +2080,9 @@ static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
         char *err = "-ERR max number of clients reached\r\n";
 
         /* That's a best effort error message, don't check write errors */
         char *err = "-ERR max number of clients reached\r\n";
 
         /* That's a best effort error message, don't check write errors */

-        (void) write(c->fd,err,strlen(err));
+        if (write(c->fd,err,strlen(err)) == -1) {
+            /* Nothing to do, Just to avoid the warning... */
+        }

         freeClient(c);
         return;
     }
         freeClient(c);
         return;
     }


@@ -1976,7 +2180,7 @@ static void decrRefCount(void *obj) {
         case REDIS_SET: freeSetObject(o); break;
         case REDIS_ZSET: freeZsetObject(o); break;
         case REDIS_HASH: freeHashObject(o); break;
         case REDIS_SET: freeSetObject(o); break;
         case REDIS_ZSET: freeZsetObject(o); break;
         case REDIS_HASH: freeHashObject(o); break;

-        default: assert(0 != 0); break;
+        default: redisAssert(0 != 0); break;

         }
         if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX ||
             !listAddNodeHead(server.objfreelist,o))
         }
         if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX ||
             !listAddNodeHead(server.objfreelist,o))


@@ -2021,7 +2225,7 @@ static robj *tryObjectSharing(robj *o) {
 
     if (o == NULL || server.shareobjects == 0) return o;
 
 
     if (o == NULL || server.shareobjects == 0) return o;
 

-    assert(o->type == REDIS_STRING);
+    redisAssert(o->type == REDIS_STRING);

     de = dictFind(server.sharingpool,o);
     if (de) {
         robj *shared = dictGetEntryKey(de);
     de = dictFind(server.sharingpool,o);
     if (de) {
         robj *shared = dictGetEntryKey(de);


@@ -2039,7 +2243,7 @@ static robj *tryObjectSharing(robj *o) {
         if (dictSize(server.sharingpool) >=
                 server.sharingpoolsize) {
             de = dictGetRandomKey(server.sharingpool);
         if (dictSize(server.sharingpool) >=
                 server.sharingpoolsize) {
             de = dictGetRandomKey(server.sharingpool);

-            assert(de != NULL);
+            redisAssert(de != NULL);

             c = ((unsigned long) dictGetEntryVal(de))-1;
             dictGetEntryVal(de) = (void*) c;
             if (c == 0) {
             c = ((unsigned long) dictGetEntryVal(de))-1;
             dictGetEntryVal(de) = (void*) c;
             if (c == 0) {


@@ -2052,7 +2256,7 @@ static robj *tryObjectSharing(robj *o) {
             int retval;
 
             retval = dictAdd(server.sharingpool,o,(void*)1);
             int retval;
 
             retval = dictAdd(server.sharingpool,o,(void*)1);

-            assert(retval == DICT_OK);
+            redisAssert(retval == DICT_OK);

             incrRefCount(o);
         }
         return o;
             incrRefCount(o);
         }
         return o;


@@ -2095,7 +2299,7 @@ static int tryObjectEncoding(robj *o) {
      if (o->refcount > 1) return REDIS_ERR;
 
     /* Currently we try to encode only strings */
      if (o->refcount > 1) return REDIS_ERR;
 
     /* Currently we try to encode only strings */

-    assert(o->type == REDIS_STRING);
+    redisAssert(o->type == REDIS_STRING);

 
     /* Check if we can represent this string as a long integer */
     if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return REDIS_ERR;
 
     /* Check if we can represent this string as a long integer */
     if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return REDIS_ERR;


@@ -2107,11 +2311,15 @@ static int tryObjectEncoding(robj *o) {
     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 

-/* Get a decoded version of an encoded object (returned as a new object) */
-static robj *getDecodedObject(const robj *o) {
+/* Get a decoded version of an encoded object (returned as a new object).
+ * If the object is already raw-encoded just increment the ref count. */
+static robj *getDecodedObject(robj *o) {

     robj *dec;
     
     robj *dec;
     

-    assert(o->encoding != REDIS_ENCODING_RAW);
+    if (o->encoding == REDIS_ENCODING_RAW) {
+        incrRefCount(o);
+        return o;
+    }

     if (o->type == REDIS_STRING && o->encoding == REDIS_ENCODING_INT) {
         char buf[32];
 
     if (o->type == REDIS_STRING && o->encoding == REDIS_ENCODING_INT) {
         char buf[32];
 


@@ -2119,16 +2327,20 @@ static robj *getDecodedObject(const robj *o) {
         dec = createStringObject(buf,strlen(buf));
         return dec;
     } else {
         dec = createStringObject(buf,strlen(buf));
         return dec;
     } else {

-        assert(1 != 1);
+        redisAssert(1 != 1);

     }
 }
 
 /* Compare two string objects via strcmp() or alike.
  * Note that the objects may be integer-encoded. In such a case we
  * use snprintf() to get a string representation of the numbers on the stack
     }
 }
 
 /* Compare two string objects via strcmp() or alike.
  * Note that the objects may be integer-encoded. In such a case we
  * use snprintf() to get a string representation of the numbers on the stack

- * and compare the strings, it's much faster than calling getDecodedObject(). */
+ * and compare the strings, it's much faster than calling getDecodedObject().
+ *
+ * Important note: if objects are not integer encoded, but binary-safe strings,
+ * sdscmp() from sds.c will apply memcmp() so this function ca be considered
+ * binary safe. */

 static int compareStringObjects(robj *a, robj *b) {
 static int compareStringObjects(robj *a, robj *b) {

-    assert(a->type == REDIS_STRING && b->type == REDIS_STRING);
+    redisAssert(a->type == REDIS_STRING && b->type == REDIS_STRING);

     char bufa[128], bufb[128], *astr, *bstr;
     int bothsds = 1;
 
     char bufa[128], bufb[128], *astr, *bstr;
     int bothsds = 1;
 


@@ -2151,7 +2363,7 @@ static int compareStringObjects(robj *a, robj *b) {
 }
 
 static size_t stringObjectLen(robj *o) {
 }
 
 static size_t stringObjectLen(robj *o) {

-    assert(o->type == REDIS_STRING);
+    redisAssert(o->type == REDIS_STRING);

     if (o->encoding == REDIS_ENCODING_RAW) {
         return sdslen(o->ptr);
     } else {
     if (o->encoding == REDIS_ENCODING_RAW) {
         return sdslen(o->ptr);
     } else {


@@ -2282,7 +2494,7 @@ static int rdbSaveStringObjectRaw(FILE *fp, robj *obj) {
 
     /* Try LZF compression - under 20 bytes it's unable to compress even
      * aaaaaaaaaaaaaaaaaa so skip it */
 
     /* Try LZF compression - under 20 bytes it's unable to compress even
      * aaaaaaaaaaaaaaaaaa so skip it */

-    if (len > 20) {
+    if (server.rdbcompression && len > 20) {

         int retval;
 
         retval = rdbSaveLzfStringObject(fp,obj);
         int retval;
 
         retval = rdbSaveLzfStringObject(fp,obj);


@@ -2300,16 +2512,11 @@ static int rdbSaveStringObjectRaw(FILE *fp, robj *obj) {
 /* Like rdbSaveStringObjectRaw() but handle encoded objects */
 static int rdbSaveStringObject(FILE *fp, robj *obj) {
     int retval;
 /* Like rdbSaveStringObjectRaw() but handle encoded objects */
 static int rdbSaveStringObject(FILE *fp, robj *obj) {
     int retval;

-    robj *dec;

 
 

-    if (obj->encoding != REDIS_ENCODING_RAW) {
-        dec = getDecodedObject(obj);
-        retval = rdbSaveStringObjectRaw(fp,dec);
-        decrRefCount(dec);
-        return retval;
-    } else {
-        return rdbSaveStringObjectRaw(fp,obj);
-    }
+    obj = getDecodedObject(obj);
+    retval = rdbSaveStringObjectRaw(fp,obj);
+    decrRefCount(obj);
+    return retval;

 }
 
 /* Save a double value. Doubles are saved as strings prefixed by an unsigned
 }
 
 /* Save a double value. Doubles are saved as strings prefixed by an unsigned


@@ -2332,7 +2539,7 @@ static int rdbSaveDoubleValue(FILE *fp, double val) {
         buf[0] = (val < 0) ? 255 : 254;
     } else {
         snprintf((char*)buf+1,sizeof(buf)-1,"%.17g",val);
         buf[0] = (val < 0) ? 255 : 254;
     } else {
         snprintf((char*)buf+1,sizeof(buf)-1,"%.17g",val);

-        buf[0] = strlen((char*)buf);
+        buf[0] = strlen((char*)buf+1);

         len = buf[0]+1;
     }
     if (fwrite(buf,len,1,fp) == 0) return -1;
         len = buf[0]+1;
     }
     if (fwrite(buf,len,1,fp) == 0) return -1;


@@ -2429,7 +2636,7 @@ static int rdbSave(char *filename) {
                 }
                 dictReleaseIterator(di);
             } else {
                 }
                 dictReleaseIterator(di);
             } else {

-                assert(0 != 0);
+                redisAssert(0 != 0);

             }
         }
         dictReleaseIterator(di);
             }
         }
         dictReleaseIterator(di);


@@ -2465,7 +2672,7 @@ werr:
 static int rdbSaveBackground(char *filename) {
     pid_t childpid;
 
 static int rdbSaveBackground(char *filename) {
     pid_t childpid;
 

-    if (server.bgsaveinprogress) return REDIS_ERR;
+    if (server.bgsavechildpid != -1) return REDIS_ERR;

     if ((childpid = fork()) == 0) {
         /* Child */
         close(server.fd);
     if ((childpid = fork()) == 0) {
         /* Child */
         close(server.fd);


@@ -2482,7 +2689,6 @@ static int rdbSaveBackground(char *filename) {
             return REDIS_ERR;
         }
         redisLog(REDIS_NOTICE,"Background saving started by pid %d",childpid);
             return REDIS_ERR;
         }
         redisLog(REDIS_NOTICE,"Background saving started by pid %d",childpid);

-        server.bgsaveinprogress = 1;

         server.bgsavechildpid = childpid;
         return REDIS_OK;
     }
         server.bgsavechildpid = childpid;
         return REDIS_OK;
     }


@@ -2564,7 +2770,7 @@ static robj *rdbLoadIntegerObject(FILE *fp, int enctype) {
         val = (int32_t)v;
     } else {
         val = 0; /* anti-warning */
         val = (int32_t)v;
     } else {
         val = 0; /* anti-warning */

-        assert(0!=0);
+        redisAssert(0!=0);

     }
     return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val));
 }
     }
     return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val));
 }


@@ -2603,7 +2809,7 @@ static robj *rdbLoadStringObject(FILE*fp, int rdbver) {
         case REDIS_RDB_ENC_LZF:
             return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver));
         default:
         case REDIS_RDB_ENC_LZF:
             return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver));
         default:

-            assert(0!=0);
+            redisAssert(0!=0);

         }
     }
 
         }
     }
 


@@ -2628,6 +2834,7 @@ static int rdbLoadDoubleValue(FILE *fp, double *val) {
     case 253: *val = R_Nan; return 0;
     default:
         if (fread(buf,len,1,fp) == 0) return -1;
     case 253: *val = R_Nan; return 0;
     default:
         if (fread(buf,len,1,fp) == 0) return -1;

+        buf[len] = '\0';

         sscanf(buf, "%lg", val);
         return 0;
     }
         sscanf(buf, "%lg", val);
         return 0;
     }


@@ -2729,7 +2936,7 @@ static int rdbLoad(char *filename) {
                 incrRefCount(ele); /* added to skiplist */
             }
         } else {
                 incrRefCount(ele); /* added to skiplist */
             }
         } else {

-            assert(0 != 0);
+            redisAssert(0 != 0);

         }
         /* Add the new object in the hash table */
         retval = dictAdd(d,keyobj,o);
         }
         /* Add the new object in the hash table */
         retval = dictAdd(d,keyobj,o);


@@ -2783,6 +2990,7 @@ static void echoCommand(redisClient *c) {
 static void setGenericCommand(redisClient *c, int nx) {
     int retval;
 
 static void setGenericCommand(redisClient *c, int nx) {
     int retval;
 

+    if (nx) deleteIfVolatile(c->db,c->argv[1]);

     retval = dictAdd(c->db->dict,c->argv[1],c->argv[2]);
     if (retval == DICT_ERR) {
         if (!nx) {
     retval = dictAdd(c->db->dict,c->argv[1],c->argv[2]);
     if (retval == DICT_ERR) {
         if (!nx) {


@@ -2857,6 +3065,53 @@ static void mgetCommand(redisClient *c) {
     }
 }
 
     }
 }
 

+static void msetGenericCommand(redisClient *c, int nx) {
+    int j, busykeys = 0;
+
+    if ((c->argc % 2) == 0) {
+        addReplySds(c,sdsnew("-ERR wrong number of arguments for MSET\r\n"));
+        return;
+    }
+    /* Handle the NX flag. The MSETNX semantic is to return zero and don't
+     * set nothing at all if at least one already key exists. */
+    if (nx) {
+        for (j = 1; j < c->argc; j += 2) {
+            if (lookupKeyWrite(c->db,c->argv[j]) != NULL) {
+                busykeys++;
+            }
+        }
+    }
+    if (busykeys) {
+        addReply(c, shared.czero);
+        return;
+    }
+
+    for (j = 1; j < c->argc; j += 2) {
+        int retval;
+
+        tryObjectEncoding(c->argv[j+1]);
+        retval = dictAdd(c->db->dict,c->argv[j],c->argv[j+1]);
+        if (retval == DICT_ERR) {
+            dictReplace(c->db->dict,c->argv[j],c->argv[j+1]);
+            incrRefCount(c->argv[j+1]);
+        } else {
+            incrRefCount(c->argv[j]);
+            incrRefCount(c->argv[j+1]);
+        }
+        removeExpire(c->db,c->argv[j]);
+    }
+    server.dirty += (c->argc-1)/2;
+    addReply(c, nx ? shared.cone : shared.ok);
+}
+
+static void msetCommand(redisClient *c) {
+    msetGenericCommand(c,0);
+}
+
+static void msetnxCommand(redisClient *c) {
+    msetGenericCommand(c,1);
+}
+

 static void incrDecrCommand(redisClient *c, long long incr) {
     long long value;
     int retval;
 static void incrDecrCommand(redisClient *c, long long incr) {
     long long value;
     int retval;


@@ -2876,7 +3131,7 @@ static void incrDecrCommand(redisClient *c, long long incr) {
             else if (o->encoding == REDIS_ENCODING_INT)
                 value = (long)o->ptr;
             else
             else if (o->encoding == REDIS_ENCODING_INT)
                 value = (long)o->ptr;
             else

-                assert(1 != 1);
+                redisAssert(1 != 1);

         }
     }
 
         }
     }
 


@@ -2974,7 +3229,7 @@ static void keysCommand(redisClient *c) {
     dictEntry *de;
     sds pattern = c->argv[1]->ptr;
     int plen = sdslen(pattern);
     dictEntry *de;
     sds pattern = c->argv[1]->ptr;
     int plen = sdslen(pattern);

-    int numkeys = 0, keyslen = 0;
+    unsigned long numkeys = 0, keyslen = 0;

     robj *lenobj = createObject(REDIS_STRING,NULL);
 
     di = dictGetIterator(c->db->dict);
     robj *lenobj = createObject(REDIS_STRING,NULL);
 
     di = dictGetIterator(c->db->dict);


@@ -3031,7 +3286,7 @@ static void typeCommand(redisClient *c) {
 }
 
 static void saveCommand(redisClient *c) {
 }
 
 static void saveCommand(redisClient *c) {

-    if (server.bgsaveinprogress) {
+    if (server.bgsavechildpid != -1) {

         addReplySds(c,sdsnew("-ERR background save in progress\r\n"));
         return;
     }
         addReplySds(c,sdsnew("-ERR background save in progress\r\n"));
         return;
     }


@@ -3043,12 +3298,13 @@ static void saveCommand(redisClient *c) {
 }
 
 static void bgsaveCommand(redisClient *c) {
 }
 
 static void bgsaveCommand(redisClient *c) {

-    if (server.bgsaveinprogress) {
+    if (server.bgsavechildpid != -1) {

         addReplySds(c,sdsnew("-ERR background save already in progress\r\n"));
         return;
     }
     if (rdbSaveBackground(server.dbfilename) == REDIS_OK) {
         addReplySds(c,sdsnew("-ERR background save already in progress\r\n"));
         return;
     }
     if (rdbSaveBackground(server.dbfilename) == REDIS_OK) {

-        addReply(c,shared.ok);
+        char *status = "+Background saving started\r\n";
+        addReplySds(c,sdsnew(status));

     } else {
         addReply(c,shared.err);
     }
     } else {
         addReply(c,shared.err);
     }


@@ -3059,25 +3315,31 @@ static void shutdownCommand(redisClient *c) {
     /* Kill the saving child if there is a background saving in progress.
        We want to avoid race conditions, for instance our saving child may
        overwrite the synchronous saving did by SHUTDOWN. */
     /* Kill the saving child if there is a background saving in progress.
        We want to avoid race conditions, for instance our saving child may
        overwrite the synchronous saving did by SHUTDOWN. */

-    if (server.bgsaveinprogress) {
+    if (server.bgsavechildpid != -1) {

         redisLog(REDIS_WARNING,"There is a live saving child. Killing it!");
         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }
         redisLog(REDIS_WARNING,"There is a live saving child. Killing it!");
         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }

-    /* SYNC SAVE */
-    if (rdbSave(server.dbfilename) == REDIS_OK) {
-        if (server.daemonize)
-            unlink(server.pidfile);
-        redisLog(REDIS_WARNING,"%zu bytes used at exit",zmalloc_used_memory());
-        redisLog(REDIS_WARNING,"Server exit now, bye bye...");
-        exit(1);
+    if (server.appendonly) {
+        /* Append only file: fsync() the AOF and exit */
+        fsync(server.appendfd);
+        exit(0);

     } else {
     } else {

-        /* Ooops.. error saving! The best we can do is to continue operating.
-         * Note that if there was a background saving process, in the next
-         * cron() Redis will be notified that the background saving aborted,
-         * handling special stuff like slaves pending for synchronization... */
-        redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit"); 
-        addReplySds(c,sdsnew("-ERR can't quit, problems saving the DB\r\n"));
+        /* Snapshotting. Perform a SYNC SAVE and exit */
+        if (rdbSave(server.dbfilename) == REDIS_OK) {
+            if (server.daemonize)
+                unlink(server.pidfile);
+            redisLog(REDIS_WARNING,"%zu bytes used at exit",zmalloc_used_memory());
+            redisLog(REDIS_WARNING,"Server exit now, bye bye...");
+            exit(0);
+        } else {
+            /* Ooops.. error saving! The best we can do is to continue operating.
+             * Note that if there was a background saving process, in the next
+             * cron() Redis will be notified that the background saving aborted,
+             * handling special stuff like slaves pending for synchronization... */
+            redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit"); 
+            addReplySds(c,sdsnew("-ERR can't quit, problems saving the DB\r\n"));
+        }

     }
 }
 
     }
 }
 


@@ -3375,7 +3637,7 @@ static void ltrimCommand(redisClient *c) {
     
     o = lookupKeyWrite(c->db,c->argv[1]);
     if (o == NULL) {
     
     o = lookupKeyWrite(c->db,c->argv[1]);
     if (o == NULL) {

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

     } else {
         if (o->type != REDIS_LIST) {
             addReply(c,shared.wrongtypeerr);
     } else {
         if (o->type != REDIS_LIST) {
             addReply(c,shared.wrongtypeerr);


@@ -3455,6 +3717,70 @@ static void lremCommand(redisClient *c) {
     }
 }
 
     }
 }
 

+/* This is the semantic of this command:
+ *  RPOPLPUSH srclist dstlist:
+ *   IF LLEN(srclist) > 0
+ *     element = RPOP srclist
+ *     LPUSH dstlist element
+ *     RETURN element
+ *   ELSE
+ *     RETURN nil
+ *   END
+ *  END
+ *
+ * The idea is to be able to get an element from a list in a reliable way
+ * since the element is not just returned but pushed against another list
+ * as well. This command was originally proposed by Ezra Zygmuntowicz.
+ */
+static void rpoplpushcommand(redisClient *c) {
+    robj *sobj;
+
+    sobj = lookupKeyWrite(c->db,c->argv[1]);
+    if (sobj == NULL) {
+        addReply(c,shared.nullbulk);
+    } else {
+        if (sobj->type != REDIS_LIST) {
+            addReply(c,shared.wrongtypeerr);
+        } else {
+            list *srclist = sobj->ptr;
+            listNode *ln = listLast(srclist);
+
+            if (ln == NULL) {
+                addReply(c,shared.nullbulk);
+            } else {
+                robj *dobj = lookupKeyWrite(c->db,c->argv[2]);
+                robj *ele = listNodeValue(ln);
+                list *dstlist;
+
+                if (dobj == NULL) {
+
+                    /* Create the list if the key does not exist */
+                    dobj = createListObject();
+                    dictAdd(c->db->dict,c->argv[2],dobj);
+                    incrRefCount(c->argv[2]);
+                } else if (dobj->type != REDIS_LIST) {
+                    addReply(c,shared.wrongtypeerr);
+                    return;
+                }
+                /* Add the element to the target list */
+                dstlist = dobj->ptr;
+                listAddNodeHead(dstlist,ele);
+                incrRefCount(ele);
+
+                /* Send the element to the client as reply as well */
+                addReplyBulkLen(c,ele);
+                addReply(c,ele);
+                addReply(c,shared.crlf);
+
+                /* Finally remove the element from the source list */
+                listDelNode(srclist,ln);
+                server.dirty++;
+            }
+        }
+    }
+}
+
+

 /* ==================================== Sets ================================ */
 
 static void saddCommand(redisClient *c) {
 /* ==================================== Sets ================================ */
 
 static void saddCommand(redisClient *c) {


@@ -3567,7 +3893,7 @@ static void scardCommand(redisClient *c) {
             addReply(c,shared.wrongtypeerr);
         } else {
             s = o->ptr;
             addReply(c,shared.wrongtypeerr);
         } else {
             s = o->ptr;

-            addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",
+            addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",

                 dictSize(s)));
         }
     }
                 dictSize(s)));
         }
     }


@@ -3632,12 +3958,12 @@ static int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
     return dictSize(*d1)-dictSize(*d2);
 }
 
     return dictSize(*d1)-dictSize(*d2);
 }
 

-static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, robj *dstkey) {
+static void sinterGenericCommand(redisClient *c, robj **setskeys, unsigned long setsnum, robj *dstkey) {

     dict **dv = zmalloc(sizeof(dict*)*setsnum);
     dictIterator *di;
     dictEntry *de;
     robj *lenobj = NULL, *dstset = NULL;
     dict **dv = zmalloc(sizeof(dict*)*setsnum);
     dictIterator *di;
     dictEntry *de;
     robj *lenobj = NULL, *dstset = NULL;

-    int j, cardinality = 0;
+    unsigned long j, cardinality = 0;

 
     for (j = 0; j < setsnum; j++) {
         robj *setobj;
 
     for (j = 0; j < setsnum; j++) {
         robj *setobj;


@@ -3648,8 +3974,9 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
         if (!setobj) {
             zfree(dv);
             if (dstkey) {
         if (!setobj) {
             zfree(dv);
             if (dstkey) {

-                deleteKey(c->db,dstkey);
-                addReply(c,shared.ok);
+                if (deleteKey(c->db,dstkey))
+                    server.dirty++;
+                addReply(c,shared.czero);

             } else {
                 addReply(c,shared.nullmultibulk);
             }
             } else {
                 addReply(c,shared.nullmultibulk);
             }


@@ -3714,9 +4041,9 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
     }
 
     if (!dstkey) {
     }
 
     if (!dstkey) {

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

     } else {
     } else {

-        addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",
+        addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",

             dictSize((dict*)dstset->ptr)));
         server.dirty++;
     }
             dictSize((dict*)dstset->ptr)));
         server.dirty++;
     }


@@ -3818,7 +4145,7 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
     if (!dstkey) {
         decrRefCount(dstset);
     } else {
     if (!dstkey) {
         decrRefCount(dstset);
     } else {

-        addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",
+        addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",

             dictSize((dict*)dstset->ptr)));
         server.dirty++;
     }
             dictSize((dict*)dstset->ptr)));
         server.dirty++;
     }


@@ -4046,56 +4373,101 @@ static zskiplistNode *zslFirstWithScore(zskiplist *zsl, double score) {
 
 /* The actual Z-commands implementations */
 
 
 /* The actual Z-commands implementations */
 

-static void zaddCommand(redisClient *c) {
+/* This generic command implements both ZADD and ZINCRBY.
+ * scoreval is the score if the operation is a ZADD (doincrement == 0) or
+ * the increment if the operation is a ZINCRBY (doincrement == 1). */
+static void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, int doincrement) {

     robj *zsetobj;
     zset *zs;
     double *score;
 
     robj *zsetobj;
     zset *zs;
     double *score;
 

-    zsetobj = lookupKeyWrite(c->db,c->argv[1]);
+    zsetobj = lookupKeyWrite(c->db,key);

     if (zsetobj == NULL) {
         zsetobj = createZsetObject();
     if (zsetobj == NULL) {
         zsetobj = createZsetObject();

-        dictAdd(c->db->dict,c->argv[1],zsetobj);
-        incrRefCount(c->argv[1]);
+        dictAdd(c->db->dict,key,zsetobj);
+        incrRefCount(key);

     } else {
         if (zsetobj->type != REDIS_ZSET) {
             addReply(c,shared.wrongtypeerr);
             return;
         }
     }
     } else {
         if (zsetobj->type != REDIS_ZSET) {
             addReply(c,shared.wrongtypeerr);
             return;
         }
     }

-    score = zmalloc(sizeof(double));
-    *score = strtod(c->argv[2]->ptr,NULL);

     zs = zsetobj->ptr;
     zs = zsetobj->ptr;

-    if (dictAdd(zs->dict,c->argv[3],score) == DICT_OK) {
+
+    /* Ok now since we implement both ZADD and ZINCRBY here the code
+     * needs to handle the two different conditions. It's all about setting
+     * '*score', that is, the new score to set, to the right value. */
+    score = zmalloc(sizeof(double));
+    if (doincrement) {
+        dictEntry *de;
+
+        /* Read the old score. If the element was not present starts from 0 */
+        de = dictFind(zs->dict,ele);
+        if (de) {
+            double *oldscore = dictGetEntryVal(de);
+            *score = *oldscore + scoreval;
+        } else {
+            *score = scoreval;
+        }
+    } else {
+        *score = scoreval;
+    }
+
+    /* What follows is a simple remove and re-insert operation that is common
+     * to both ZADD and ZINCRBY... */
+    if (dictAdd(zs->dict,ele,score) == DICT_OK) {

         /* case 1: New element */
         /* case 1: New element */

-        incrRefCount(c->argv[3]); /* added to hash */
-        zslInsert(zs->zsl,*score,c->argv[3]);
-        incrRefCount(c->argv[3]); /* added to skiplist */
+        incrRefCount(ele); /* added to hash */
+        zslInsert(zs->zsl,*score,ele);
+        incrRefCount(ele); /* added to skiplist */

         server.dirty++;
         server.dirty++;

-        addReply(c,shared.cone);
+        if (doincrement)
+            addReplyDouble(c,*score);
+        else
+            addReply(c,shared.cone);

     } else {
         dictEntry *de;
         double *oldscore;
         
         /* case 2: Score update operation */
     } else {
         dictEntry *de;
         double *oldscore;
         
         /* case 2: Score update operation */

-        de = dictFind(zs->dict,c->argv[3]);
-        assert(de != NULL);
+        de = dictFind(zs->dict,ele);
+        redisAssert(de != NULL);

         oldscore = dictGetEntryVal(de);
         if (*score != *oldscore) {
             int deleted;
 
         oldscore = dictGetEntryVal(de);
         if (*score != *oldscore) {
             int deleted;
 

-            deleted = zslDelete(zs->zsl,*oldscore,c->argv[3]);
-            assert(deleted != 0);
-            zslInsert(zs->zsl,*score,c->argv[3]);
-            incrRefCount(c->argv[3]);
-            dictReplace(zs->dict,c->argv[3],score);
+            /* Remove and insert the element in the skip list with new score */
+            deleted = zslDelete(zs->zsl,*oldscore,ele);
+            redisAssert(deleted != 0);
+            zslInsert(zs->zsl,*score,ele);
+            incrRefCount(ele);
+            /* Update the score in the hash table */
+            dictReplace(zs->dict,ele,score);

             server.dirty++;
         } else {
             zfree(score);
         }
             server.dirty++;
         } else {
             zfree(score);
         }

-        addReply(c,shared.czero);
+        if (doincrement)
+            addReplyDouble(c,*score);
+        else
+            addReply(c,shared.czero);

     }
 }
 
     }
 }
 

+static void zaddCommand(redisClient *c) {
+    double scoreval;
+
+    scoreval = strtod(c->argv[2]->ptr,NULL);
+    zaddGenericCommand(c,c->argv[1],c->argv[3],scoreval,0);
+}
+
+static void zincrbyCommand(redisClient *c) {
+    double scoreval;
+
+    scoreval = strtod(c->argv[2]->ptr,NULL);
+    zaddGenericCommand(c,c->argv[1],c->argv[3],scoreval,1);
+}
+

 static void zremCommand(redisClient *c) {
     robj *zsetobj;
     zset *zs;
 static void zremCommand(redisClient *c) {
     robj *zsetobj;
     zset *zs;


@@ -4121,7 +4493,7 @@ static void zremCommand(redisClient *c) {
         /* Delete from the skiplist */
         oldscore = dictGetEntryVal(de);
         deleted = zslDelete(zs->zsl,*oldscore,c->argv[2]);
         /* Delete from the skiplist */
         oldscore = dictGetEntryVal(de);
         deleted = zslDelete(zs->zsl,*oldscore,c->argv[2]);

-        assert(deleted != 0);
+        redisAssert(deleted != 0);

 
         /* Delete from the hash table */
         dictDelete(zs->dict,c->argv[2]);
 
         /* Delete from the hash table */
         dictDelete(zs->dict,c->argv[2]);


@@ -4225,6 +4597,20 @@ static void zrangebyscoreCommand(redisClient *c) {
     robj *o;
     double min = strtod(c->argv[2]->ptr,NULL);
     double max = strtod(c->argv[3]->ptr,NULL);
     robj *o;
     double min = strtod(c->argv[2]->ptr,NULL);
     double max = strtod(c->argv[3]->ptr,NULL);

+    int offset = 0, limit = -1;
+
+    if (c->argc != 4 && c->argc != 7) {
+        addReplySds(c,
+            sdsnew("-ERR wrong number of arguments for ZRANGEBYSCORE\r\n"));
+        return;
+    } else if (c->argc == 7 && strcasecmp(c->argv[4]->ptr,"limit")) {
+        addReply(c,shared.syntaxerr);
+        return;
+    } else if (c->argc == 7) {
+        offset = atoi(c->argv[5]->ptr);
+        limit = atoi(c->argv[6]->ptr);
+        if (offset < 0) offset = 0;
+    }

 
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o == NULL) {
 
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o == NULL) {


@@ -4253,14 +4639,22 @@ static void zrangebyscoreCommand(redisClient *c) {
              * it later */
             lenobj = createObject(REDIS_STRING,NULL);
             addReply(c,lenobj);
              * it later */
             lenobj = createObject(REDIS_STRING,NULL);
             addReply(c,lenobj);

+            decrRefCount(lenobj);

 
             while(ln && ln->score <= max) {
 
             while(ln && ln->score <= max) {

+                if (offset) {
+                    offset--;
+                    ln = ln->forward[0];
+                    continue;
+                }
+                if (limit == 0) break;

                 ele = ln->obj;
                 addReplyBulkLen(c,ele);
                 addReply(c,ele);
                 addReply(c,shared.crlf);
                 ln = ln->forward[0];
                 rangelen++;
                 ele = ln->obj;
                 addReplyBulkLen(c,ele);
                 addReply(c,ele);
                 addReply(c,shared.crlf);
                 ln = ln->forward[0];
                 rangelen++;

+                if (limit > 0) limit--;

             }
             lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",rangelen);
         }
             }
             lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",rangelen);
         }


@@ -4280,7 +4674,7 @@ static void zcardCommand(redisClient *c) {
             addReply(c,shared.wrongtypeerr);
         } else {
             zs = o->ptr;
             addReply(c,shared.wrongtypeerr);
         } else {
             zs = o->ptr;

-            addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",zs->zsl->length));
+            addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",zs->zsl->length));

         }
     }
 }
         }
     }
 }


@@ -4291,7 +4685,7 @@ static void zscoreCommand(redisClient *c) {
     
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o == NULL) {
     
     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) {
         return;
     } else {
         if (o->type != REDIS_ZSET) {


@@ -4304,12 +4698,9 @@ static void zscoreCommand(redisClient *c) {
             if (!de) {
                 addReply(c,shared.nullbulk);
             } else {
             if (!de) {
                 addReply(c,shared.nullbulk);
             } else {

-                char buf[128];

                 double *score = dictGetEntryVal(de);
 
                 double *score = dictGetEntryVal(de);
 

-                snprintf(buf,sizeof(buf),"%.17g",*score);
-                addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n%s\r\n",
-                    strlen(buf),buf));
+                addReplyDouble(c,*score);

             }
         }
     }
             }
         }
     }


@@ -4352,17 +4743,25 @@ static robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst) {
         char buf[REDIS_SORTKEY_MAX+1];
     } keyname;
 
         char buf[REDIS_SORTKEY_MAX+1];
     } keyname;
 

-    if (subst->encoding == REDIS_ENCODING_RAW)
-        incrRefCount(subst);
-    else {
-        subst = getDecodedObject(subst);
+    /* If the pattern is "#" return the substitution object itself in order
+     * to implement the "SORT ... GET #" feature. */
+    spat = pattern->ptr;
+    if (spat[0] == '#' && spat[1] == '\0') {
+        return subst;

     }
 
     }
 

-    spat = pattern->ptr;
+    /* The substitution object may be specially encoded. If so we create
+     * a decoded object on the fly. Otherwise getDecodedObject will just
+     * increment the ref count, that we'll decrement later. */
+    subst = getDecodedObject(subst);
+

     ssub = subst->ptr;
     if (sdslen(spat)+sdslen(ssub)-1 > REDIS_SORTKEY_MAX) return NULL;
     p = strchr(spat,'*');
     ssub = subst->ptr;
     if (sdslen(spat)+sdslen(ssub)-1 > REDIS_SORTKEY_MAX) return NULL;
     p = strchr(spat,'*');

-    if (!p) return NULL;
+    if (!p) {
+        decrRefCount(subst);
+        return NULL;
+    }

 
     prefixlen = p-spat;
     sublen = sdslen(ssub);
 
     prefixlen = p-spat;
     sublen = sdslen(ssub);


@@ -4373,10 +4772,7 @@ static robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst) {
     keyname.buf[prefixlen+sublen+postfixlen] = '\0';
     keyname.len = prefixlen+sublen+postfixlen;
 
     keyname.buf[prefixlen+sublen+postfixlen] = '\0';
     keyname.len = prefixlen+sublen+postfixlen;
 

-    keyobj.refcount = 1;
-    keyobj.type = REDIS_STRING;
-    keyobj.ptr = ((char*)&keyname)+(sizeof(long)*2);
-
+    initStaticStringObject(keyobj,((char*)&keyname)+(sizeof(long)*2))

     decrRefCount(subst);
 
     /* printf("lookup '%s' => %p\n", keyname.buf,de); */
     decrRefCount(subst);
 
     /* printf("lookup '%s' => %p\n", keyname.buf,de); */


@@ -4416,20 +4812,13 @@ static int sortCompare(const void *s1, const void *s2) {
             }
         } else {
             /* Compare elements directly */
             }
         } else {
             /* Compare elements directly */

-            if (so1->obj->encoding == REDIS_ENCODING_RAW &&
-                so2->obj->encoding == REDIS_ENCODING_RAW) {
-                cmp = strcoll(so1->obj->ptr,so2->obj->ptr);
-            } else {
-                robj *dec1, *dec2;
-
-                dec1 = so1->obj->encoding == REDIS_ENCODING_RAW ?
-                    so1->obj : getDecodedObject(so1->obj);
-                dec2 = so2->obj->encoding == REDIS_ENCODING_RAW ?
-                    so2->obj : getDecodedObject(so2->obj);
-                cmp = strcoll(dec1->ptr,dec2->ptr);
-                if (dec1 != so1->obj) decrRefCount(dec1);
-                if (dec2 != so2->obj) decrRefCount(dec2);
-            }
+            robj *dec1, *dec2;
+
+            dec1 = getDecodedObject(so1->obj);
+            dec2 = getDecodedObject(so2->obj);
+            cmp = strcoll(dec1->ptr,dec2->ptr);
+            decrRefCount(dec1);
+            decrRefCount(dec2);

         }
     }
     return server.sort_desc ? -cmp : cmp;
         }
     }
     return server.sort_desc ? -cmp : cmp;


@@ -4453,7 +4842,9 @@ static void sortCommand(redisClient *c) {
         addReply(c,shared.nokeyerr);
         return;
     }
         addReply(c,shared.nokeyerr);
         return;
     }

-    if (sortval->type != REDIS_SET && sortval->type != REDIS_LIST) {
+    if (sortval->type != REDIS_SET && sortval->type != REDIS_LIST &&
+        sortval->type != REDIS_ZSET)
+    {

         addReply(c,shared.wrongtypeerr);
         return;
     }
         addReply(c,shared.wrongtypeerr);
         return;
     }


@@ -4506,11 +4897,15 @@ static void sortCommand(redisClient *c) {
     }
 
     /* Load the sorting vector with all the objects to sort */
     }
 
     /* Load the sorting vector with all the objects to sort */

-    vectorlen = (sortval->type == REDIS_LIST) ?
-        listLength((list*)sortval->ptr) :
-        dictSize((dict*)sortval->ptr);
+    switch(sortval->type) {
+    case REDIS_LIST: vectorlen = listLength((list*)sortval->ptr); break;
+    case REDIS_SET: vectorlen =  dictSize((dict*)sortval->ptr); break;
+    case REDIS_ZSET: vectorlen = dictSize(((zset*)sortval->ptr)->dict); break;
+    default: vectorlen = 0; redisAssert(0); /* Avoid GCC warning */
+    }

     vector = zmalloc(sizeof(redisSortObject)*vectorlen);
     j = 0;
     vector = zmalloc(sizeof(redisSortObject)*vectorlen);
     j = 0;

+

     if (sortval->type == REDIS_LIST) {
         list *list = sortval->ptr;
         listNode *ln;
     if (sortval->type == REDIS_LIST) {
         list *list = sortval->ptr;
         listNode *ln;


@@ -4524,10 +4919,17 @@ static void sortCommand(redisClient *c) {
             j++;
         }
     } else {
             j++;
         }
     } else {

-        dict *set = sortval->ptr;
+        dict *set;

         dictIterator *di;
         dictEntry *setele;
 
         dictIterator *di;
         dictEntry *setele;
 

+        if (sortval->type == REDIS_SET) {
+            set = sortval->ptr;
+        } else {
+            zset *zs = sortval->ptr;
+            set = zs->dict;
+        }
+

         di = dictGetIterator(set);
         while((setele = dictNext(di)) != NULL) {
             vector[j].obj = dictGetEntryKey(setele);
         di = dictGetIterator(set);
         while((setele = dictNext(di)) != NULL) {
             vector[j].obj = dictGetEntryKey(setele);


@@ -4537,7 +4939,7 @@ static void sortCommand(redisClient *c) {
         }
         dictReleaseIterator(di);
     }
         }
         dictReleaseIterator(di);
     }

-    assert(j == vectorlen);
+    redisAssert(j == vectorlen);

 
     /* Now it's time to load the right scores in the sorting vector */
     if (dontsort == 0) {
 
     /* Now it's time to load the right scores in the sorting vector */
     if (dontsort == 0) {


@@ -4548,20 +4950,18 @@ static void sortCommand(redisClient *c) {
                 byval = lookupKeyByPattern(c->db,sortby,vector[j].obj);
                 if (!byval || byval->type != REDIS_STRING) continue;
                 if (alpha) {
                 byval = lookupKeyByPattern(c->db,sortby,vector[j].obj);
                 if (!byval || byval->type != REDIS_STRING) continue;
                 if (alpha) {

-                    if (byval->encoding == REDIS_ENCODING_RAW) {
-                        vector[j].u.cmpobj = byval;
-                        incrRefCount(byval);
-                    } else {
-                        vector[j].u.cmpobj = getDecodedObject(byval);
-                    }
+                    vector[j].u.cmpobj = getDecodedObject(byval);

                 } else {
                     if (byval->encoding == REDIS_ENCODING_RAW) {
                         vector[j].u.score = strtod(byval->ptr,NULL);
                     } else {
                 } else {
                     if (byval->encoding == REDIS_ENCODING_RAW) {
                         vector[j].u.score = strtod(byval->ptr,NULL);
                     } else {

+                        /* Don't need to decode the object if it's
+                         * integer-encoded (the only encoding supported) so
+                         * far. We can just cast it */

                         if (byval->encoding == REDIS_ENCODING_INT) {
                             vector[j].u.score = (long)byval->ptr;
                         } else
                         if (byval->encoding == REDIS_ENCODING_INT) {
                             vector[j].u.score = (long)byval->ptr;
                         } else

-                            assert(1 != 1);
+                            redisAssert(1 != 1);

                     }
                 }
             } else {
                     }
                 }
             } else {


@@ -4572,7 +4972,7 @@ static void sortCommand(redisClient *c) {
                         if (vector[j].obj->encoding == REDIS_ENCODING_INT)
                             vector[j].u.score = (long) vector[j].obj->ptr;
                         else
                         if (vector[j].obj->encoding == REDIS_ENCODING_INT)
                             vector[j].u.score = (long) vector[j].obj->ptr;
                         else

-                            assert(1 != 1);
+                            redisAssert(1 != 1);

                     }
                 }
             }
                     }
                 }
             }


@@ -4627,7 +5027,7 @@ static void sortCommand(redisClient *c) {
                         addReply(c,shared.crlf);
                     }
                 } else {
                         addReply(c,shared.crlf);
                     }
                 } else {

-                    assert(sop->type == REDIS_SORT_GET); /* always fails */
+                    redisAssert(sop->type == REDIS_SORT_GET); /* always fails */

                 }
             }
         }
                 }
             }
         }


@@ -4656,11 +5056,13 @@ static void sortCommand(redisClient *c) {
                         incrRefCount(val);
                     }
                 } else {
                         incrRefCount(val);
                     }
                 } else {

-                    assert(sop->type == REDIS_SORT_GET); /* always fails */
+                    redisAssert(sop->type == REDIS_SORT_GET); /* always fails */

                 }
             }
         }
                 }
             }
         }

-        dictReplace(c->db->dict,storekey,listObject);
+        if (dictReplace(c->db->dict,storekey,listObject)) {
+            incrRefCount(storekey);
+        }

         /* Note: we add 1 because the DB is dirty anyway since even if the
          * SORT result is empty a new key is set and maybe the old content
          * replaced. */
         /* Note: we add 1 because the DB is dirty anyway since even if the
          * SORT result is empty a new key is set and maybe the old content
          * replaced. */


@@ -4678,7 +5080,10 @@ static void sortCommand(redisClient *c) {
     zfree(vector);
 }
 
     zfree(vector);
 }
 

-static void infoCommand(redisClient *c) {
+/* Create the string returned by the INFO command. This is decoupled
+ * by the INFO command itself as we need to report the same information
+ * on memory corruption problems. */
+static sds genRedisInfoString(void) {

     sds info;
     time_t uptime = time(NULL)-server.stat_starttime;
     int j;
     sds info;
     time_t uptime = time(NULL)-server.stat_starttime;
     int j;


@@ -4686,27 +5091,31 @@ static void infoCommand(redisClient *c) {
     info = sdscatprintf(sdsempty(),
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
     info = sdscatprintf(sdsempty(),
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"

-        "uptime_in_seconds:%d\r\n"
-        "uptime_in_days:%d\r\n"
+        "multiplexing_api:%s\r\n"
+        "uptime_in_seconds:%ld\r\n"
+        "uptime_in_days:%ld\r\n"

         "connected_clients:%d\r\n"
         "connected_slaves:%d\r\n"
         "used_memory:%zu\r\n"
         "changes_since_last_save:%lld\r\n"
         "bgsave_in_progress:%d\r\n"
         "connected_clients:%d\r\n"
         "connected_slaves:%d\r\n"
         "used_memory:%zu\r\n"
         "changes_since_last_save:%lld\r\n"
         "bgsave_in_progress:%d\r\n"

-        "last_save_time:%d\r\n"
+        "last_save_time:%ld\r\n"
+        "bgrewriteaof_in_progress:%d\r\n"

         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "role:%s\r\n"
         ,REDIS_VERSION,
         (sizeof(long) == 8) ? "64" : "32",
         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "role:%s\r\n"
         ,REDIS_VERSION,
         (sizeof(long) == 8) ? "64" : "32",

+        aeGetApiName(),

         uptime,
         uptime/(3600*24),
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),
         server.usedmemory,
         server.dirty,
         uptime,
         uptime/(3600*24),
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),
         server.usedmemory,
         server.dirty,

-        server.bgsaveinprogress,
+        server.bgsavechildpid != -1,

         server.lastsave,
         server.lastsave,

+        server.bgrewritechildpid != -1,

         server.stat_numconnections,
         server.stat_numcommands,
         server.masterhost == NULL ? "master" : "slave"
         server.stat_numconnections,
         server.stat_numcommands,
         server.masterhost == NULL ? "master" : "slave"


@@ -4730,11 +5139,17 @@ static void infoCommand(redisClient *c) {
         keys = dictSize(server.db[j].dict);
         vkeys = dictSize(server.db[j].expires);
         if (keys || vkeys) {
         keys = dictSize(server.db[j].dict);
         vkeys = dictSize(server.db[j].expires);
         if (keys || vkeys) {

-            info = sdscatprintf(info, "db%d: keys=%lld,expires=%lld\r\n",
+            info = sdscatprintf(info, "db%d:keys=%lld,expires=%lld\r\n",

                 j, keys, vkeys);
         }
     }
                 j, keys, vkeys);
         }
     }

-    addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",sdslen(info)));
+    return info;
+}
+
+static void infoCommand(redisClient *c) {
+    sds info = genRedisInfoString();
+    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
+        (unsigned long)sdslen(info)));

     addReplySds(c,info);
     addReply(c,shared.crlf);
 }
     addReplySds(c,info);
     addReply(c,shared.crlf);
 }


@@ -4853,54 +5268,11 @@ static void ttlCommand(redisClient *c) {
     addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",ttl));
 }
 
     addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",ttl));
 }
 

-static void msetGenericCommand(redisClient *c, int nx) {
-    int j;
+/* =============================== Replication  ============================= */

 
 

-    if ((c->argc % 2) == 0) {
-        addReplySds(c,sdsnew("-ERR wrong number of arguments\r\n"));
-        return;
-    }
-    /* Handle the NX flag. The MSETNX semantic is to return zero and don't
-     * set nothing at all if at least one already key exists. */
-    if (nx) {
-        for (j = 1; j < c->argc; j += 2) {
-            if (dictFind(c->db->dict,c->argv[j]) != NULL) {
-                addReply(c, shared.czero);
-                return;
-            }
-        }
-    }
-
-    for (j = 1; j < c->argc; j += 2) {
-        int retval;
-
-        retval = dictAdd(c->db->dict,c->argv[j],c->argv[j+1]);
-        if (retval == DICT_ERR) {
-            dictReplace(c->db->dict,c->argv[j],c->argv[j+1]);
-            incrRefCount(c->argv[j+1]);
-        } else {
-            incrRefCount(c->argv[j]);
-            incrRefCount(c->argv[j+1]);
-        }
-        removeExpire(c->db,c->argv[j]);
-    }
-    server.dirty += (c->argc-1)/2;
-    addReply(c, nx ? shared.cone : shared.ok);
-}
-
-static void msetCommand(redisClient *c) {
-    msetGenericCommand(c,0);
-}
-
-static void msetnxCommand(redisClient *c) {
-    msetGenericCommand(c,1);
-}
-
-/* =============================== Replication  ============================= */
-
-static int syncWrite(int fd, char *ptr, ssize_t size, int timeout) {
-    ssize_t nwritten, ret = size;
-    time_t start = time(NULL);
+static int syncWrite(int fd, char *ptr, ssize_t size, int timeout) {
+    ssize_t nwritten, ret = size;
+    time_t start = time(NULL);

 
     timeout++;
     while(size) {
 
     timeout++;
     while(size) {


@@ -4976,7 +5348,7 @@ static void syncCommand(redisClient *c) {
     redisLog(REDIS_NOTICE,"Slave ask for synchronization");
     /* Here we need to check if there is a background saving operation
      * in progress, or if it is required to start one */
     redisLog(REDIS_NOTICE,"Slave ask for synchronization");
     /* Here we need to check if there is a background saving operation
      * in progress, or if it is required to start one */

-    if (server.bgsaveinprogress) {
+    if (server.bgsavechildpid != -1) {

         /* Ok a background save is in progress. Let's check if it is a good
          * one for replication, i.e. if there is another slave that is
          * registering differences since the server forked to save */
         /* Ok a background save is in progress. Let's check if it is a good
          * one for replication, i.e. if there is another slave that is
          * registering differences since the server forked to save */


@@ -5063,7 +5435,7 @@ static void sendBulkToSlave(aeEventLoop *el, int fd, void *privdata, int mask) {
         aeDeleteFileEvent(server.el,slave->fd,AE_WRITABLE);
         slave->replstate = REDIS_REPL_ONLINE;
         if (aeCreateFileEvent(server.el, slave->fd, AE_WRITABLE,
         aeDeleteFileEvent(server.el,slave->fd,AE_WRITABLE);
         slave->replstate = REDIS_REPL_ONLINE;
         if (aeCreateFileEvent(server.el, slave->fd, AE_WRITABLE,

-            sendReplyToClient, slave, NULL) == AE_ERR) {
+            sendReplyToClient, slave) == AE_ERR) {

             freeClient(slave);
             return;
         }
             freeClient(slave);
             return;
         }


@@ -5107,7 +5479,7 @@ static void updateSlavesWaitingBgsave(int bgsaveerr) {
             slave->repldbsize = buf.st_size;
             slave->replstate = REDIS_REPL_SEND_BULK;
             aeDeleteFileEvent(server.el,slave->fd,AE_WRITABLE);
             slave->repldbsize = buf.st_size;
             slave->replstate = REDIS_REPL_SEND_BULK;
             aeDeleteFileEvent(server.el,slave->fd,AE_WRITABLE);

-            if (aeCreateFileEvent(server.el, slave->fd, AE_WRITABLE, sendBulkToSlave, slave, NULL) == AE_ERR) {
+            if (aeCreateFileEvent(server.el, slave->fd, AE_WRITABLE, sendBulkToSlave, slave) == AE_ERR) {

                 freeClient(slave);
                 continue;
             }
                 freeClient(slave);
                 continue;
             }


@@ -5128,7 +5500,7 @@ static void updateSlavesWaitingBgsave(int bgsaveerr) {
 }
 
 static int syncWithMaster(void) {
 }
 
 static int syncWithMaster(void) {

-    char buf[1024], tmpfile[256];
+    char buf[1024], tmpfile[256], authcmd[1024];

     int dumpsize;
     int fd = anetTcpConnect(NULL,server.masterhost,server.masterport);
     int dfd;
     int dumpsize;
     int fd = anetTcpConnect(NULL,server.masterhost,server.masterport);
     int dfd;


@@ -5138,6 +5510,30 @@ static int syncWithMaster(void) {
             strerror(errno));
         return REDIS_ERR;
     }
             strerror(errno));
         return REDIS_ERR;
     }

+
+    /* AUTH with the master if required. */
+    if(server.masterauth) {
+       snprintf(authcmd, 1024, "AUTH %s\r\n", server.masterauth);
+       if (syncWrite(fd, authcmd, strlen(server.masterauth)+7, 5) == -1) {
+            close(fd);
+            redisLog(REDIS_WARNING,"Unable to AUTH to MASTER: %s",
+                strerror(errno));
+            return REDIS_ERR;
+       }
+        /* Read the AUTH result.  */
+        if (syncReadLine(fd,buf,1024,3600) == -1) {
+            close(fd);
+            redisLog(REDIS_WARNING,"I/O error reading auth result from MASTER: %s",
+                strerror(errno));
+            return REDIS_ERR;
+        }
+        if (buf[0] != '+') {
+            close(fd);
+            redisLog(REDIS_WARNING,"Cannot AUTH to MASTER, is the masterauth password correct?");
+            return REDIS_ERR;
+        }
+    }
+

     /* Issue the SYNC command */
     if (syncWrite(fd,"SYNC \r\n",7,5) == -1) {
         close(fd);
     /* Issue the SYNC command */
     if (syncWrite(fd,"SYNC \r\n",7,5) == -1) {
         close(fd);


@@ -5202,6 +5598,7 @@ static int syncWithMaster(void) {
     }
     server.master = createClient(fd);
     server.master->flags |= REDIS_MASTER;
     }
     server.master = createClient(fd);
     server.master->flags |= REDIS_MASTER;

+    server.master->authenticated = 1;

     server.replstate = REDIS_REPL_CONNECTED;
     return REDIS_OK;
 }
     server.replstate = REDIS_REPL_CONNECTED;
     return REDIS_OK;
 }


@@ -5295,8 +5692,8 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
         char seldb[64];
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);
         char seldb[64];
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);

-        buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%d\r\n%s\r\n",
-            strlen(seldb),seldb);
+        buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",
+            (unsigned long)strlen(seldb),seldb);

         server.appendseldb = dictid;
     }
 
         server.appendseldb = dictid;
     }
 


@@ -5319,13 +5716,11 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
     for (j = 0; j < argc; j++) {
         robj *o = argv[j];
 
     for (j = 0; j < argc; j++) {
         robj *o = argv[j];
 

-        if (o->encoding != REDIS_ENCODING_RAW)
-            o = getDecodedObject(o);
-        buf = sdscatprintf(buf,"$%d\r\n",sdslen(o->ptr));
+        o = getDecodedObject(o);
+        buf = sdscatprintf(buf,"$%lu\r\n",(unsigned long)sdslen(o->ptr));

         buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
         buf = sdscatlen(buf,"\r\n",2);
         buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
         buf = sdscatlen(buf,"\r\n",2);

-        if (o != argv[j])
-            decrRefCount(o);
+        decrRefCount(o);

     }
 
     /* Free the objects from the modified argv for EXPIREAT */
     }
 
     /* Free the objects from the modified argv for EXPIREAT */


@@ -5351,6 +5746,14 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
          }
          exit(1);
     }
          }
          exit(1);
     }

+    /* If a background append only file rewriting is in progress we want to
+     * accumulate the differences between the child DB and the current one
+     * in a buffer, so that when the child process will do its work we
+     * can append the differences to the new append only file. */
+    if (server.bgrewritechildpid != -1)
+        server.bgrewritebuf = sdscatlen(server.bgrewritebuf,buf,sdslen(buf));
+
+    sdsfree(buf);

     now = time(NULL);
     if (server.appendfsync == APPENDFSYNC_ALWAYS ||
         (server.appendfsync == APPENDFSYNC_EVERYSEC &&
     now = time(NULL);
     if (server.appendfsync == APPENDFSYNC_ALWAYS ||
         (server.appendfsync == APPENDFSYNC_EVERYSEC &&


@@ -5426,7 +5829,7 @@ int loadAppendOnlyFile(char *filename) {
             if (buf[0] != '$') goto fmterr;
             len = strtol(buf+1,NULL,10);
             argsds = sdsnewlen(NULL,len);
             if (buf[0] != '$') goto fmterr;
             len = strtol(buf+1,NULL,10);
             argsds = sdsnewlen(NULL,len);

-            if (fread(argsds,len,1,fp) == 0) goto fmterr;
+            if (len && fread(argsds,len,1,fp) == 0) goto fmterr;

             argv[j] = createObject(REDIS_STRING,argsds);
             if (fread(buf,2,1,fp) == 0) goto fmterr; /* discard CRLF */
         }
             argv[j] = createObject(REDIS_STRING,argsds);
             if (fread(buf,2,1,fp) == 0) goto fmterr; /* discard CRLF */
         }


@@ -5472,11 +5875,269 @@ fmterr:
     exit(1);
 }
 
     exit(1);
 }
 

+/* Write an object into a file in the bulk format $<count>\r\n<payload>\r\n */
+static int fwriteBulk(FILE *fp, robj *obj) {
+    char buf[128];
+    obj = getDecodedObject(obj);
+    snprintf(buf,sizeof(buf),"$%ld\r\n",(long)sdslen(obj->ptr));
+    if (fwrite(buf,strlen(buf),1,fp) == 0) goto err;
+    if (sdslen(obj->ptr) && fwrite(obj->ptr,sdslen(obj->ptr),1,fp) == 0)
+        goto err;
+    if (fwrite("\r\n",2,1,fp) == 0) goto err;
+    decrRefCount(obj);
+    return 1;
+err:
+    decrRefCount(obj);
+    return 0;
+}
+
+/* Write a double value in bulk format $<count>\r\n<payload>\r\n */
+static int fwriteBulkDouble(FILE *fp, double d) {
+    char buf[128], dbuf[128];
+
+    snprintf(dbuf,sizeof(dbuf),"%.17g\r\n",d);
+    snprintf(buf,sizeof(buf),"$%lu\r\n",(unsigned long)strlen(dbuf)-2);
+    if (fwrite(buf,strlen(buf),1,fp) == 0) return 0;
+    if (fwrite(dbuf,strlen(dbuf),1,fp) == 0) return 0;
+    return 1;
+}
+
+/* Write a long value in bulk format $<count>\r\n<payload>\r\n */
+static int fwriteBulkLong(FILE *fp, long l) {
+    char buf[128], lbuf[128];
+
+    snprintf(lbuf,sizeof(lbuf),"%ld\r\n",l);
+    snprintf(buf,sizeof(buf),"$%lu\r\n",(unsigned long)strlen(lbuf)-2);
+    if (fwrite(buf,strlen(buf),1,fp) == 0) return 0;
+    if (fwrite(lbuf,strlen(lbuf),1,fp) == 0) return 0;
+    return 1;
+}
+
+/* Write a sequence of commands able to fully rebuild the dataset into
+ * "filename". Used both by REWRITEAOF and BGREWRITEAOF. */
+static int rewriteAppendOnlyFile(char *filename) {
+    dictIterator *di = NULL;
+    dictEntry *de;
+    FILE *fp;
+    char tmpfile[256];
+    int j;
+    time_t now = time(NULL);
+
+    /* Note that we have to use a different temp name here compared to the
+     * one used by rewriteAppendOnlyFileBackground() function. */
+    snprintf(tmpfile,256,"temp-rewriteaof-%d.aof", (int) getpid());
+    fp = fopen(tmpfile,"w");
+    if (!fp) {
+        redisLog(REDIS_WARNING, "Failed rewriting the append only file: %s", strerror(errno));
+        return REDIS_ERR;
+    }
+    for (j = 0; j < server.dbnum; j++) {
+        char selectcmd[] = "*2\r\n$6\r\nSELECT\r\n";
+        redisDb *db = server.db+j;
+        dict *d = db->dict;
+        if (dictSize(d) == 0) continue;
+        di = dictGetIterator(d);
+        if (!di) {
+            fclose(fp);
+            return REDIS_ERR;
+        }
+
+        /* SELECT the new DB */
+        if (fwrite(selectcmd,sizeof(selectcmd)-1,1,fp) == 0) goto werr;
+        if (fwriteBulkLong(fp,j) == 0) goto werr;
+
+        /* Iterate this DB writing every entry */
+        while((de = dictNext(di)) != NULL) {
+            robj *key = dictGetEntryKey(de);
+            robj *o = dictGetEntryVal(de);
+            time_t expiretime = getExpire(db,key);
+
+            /* Save the key and associated value */
+            if (o->type == REDIS_STRING) {
+                /* Emit a SET command */
+                char cmd[]="*3\r\n$3\r\nSET\r\n";
+                if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
+                /* Key and value */
+                if (fwriteBulk(fp,key) == 0) goto werr;
+                if (fwriteBulk(fp,o) == 0) goto werr;
+            } else if (o->type == REDIS_LIST) {
+                /* Emit the RPUSHes needed to rebuild the list */
+                list *list = o->ptr;
+                listNode *ln;
+
+                listRewind(list);
+                while((ln = listYield(list))) {
+                    char cmd[]="*3\r\n$5\r\nRPUSH\r\n";
+                    robj *eleobj = listNodeValue(ln);
+
+                    if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
+                    if (fwriteBulk(fp,key) == 0) goto werr;
+                    if (fwriteBulk(fp,eleobj) == 0) goto werr;
+                }
+            } else if (o->type == REDIS_SET) {
+                /* Emit the SADDs needed to rebuild the set */
+                dict *set = o->ptr;
+                dictIterator *di = dictGetIterator(set);
+                dictEntry *de;
+
+                while((de = dictNext(di)) != NULL) {
+                    char cmd[]="*3\r\n$4\r\nSADD\r\n";
+                    robj *eleobj = dictGetEntryKey(de);
+
+                    if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
+                    if (fwriteBulk(fp,key) == 0) goto werr;
+                    if (fwriteBulk(fp,eleobj) == 0) goto werr;
+                }
+                dictReleaseIterator(di);
+            } else if (o->type == REDIS_ZSET) {
+                /* Emit the ZADDs needed to rebuild the sorted set */
+                zset *zs = o->ptr;
+                dictIterator *di = dictGetIterator(zs->dict);
+                dictEntry *de;
+
+                while((de = dictNext(di)) != NULL) {
+                    char cmd[]="*4\r\n$4\r\nZADD\r\n";
+                    robj *eleobj = dictGetEntryKey(de);
+                    double *score = dictGetEntryVal(de);
+
+                    if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
+                    if (fwriteBulk(fp,key) == 0) goto werr;
+                    if (fwriteBulkDouble(fp,*score) == 0) goto werr;
+                    if (fwriteBulk(fp,eleobj) == 0) goto werr;
+                }
+                dictReleaseIterator(di);
+            } else {
+                redisAssert(0 != 0);
+            }
+            /* Save the expire time */
+            if (expiretime != -1) {
+                char cmd[]="*3\r\n$8\r\nEXPIREAT\r\n";
+                /* If this key is already expired skip it */
+                if (expiretime < now) continue;
+                if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
+                if (fwriteBulk(fp,key) == 0) goto werr;
+                if (fwriteBulkLong(fp,expiretime) == 0) goto werr;
+            }
+        }
+        dictReleaseIterator(di);
+    }
+
+    /* Make sure data will not remain on the OS's output buffers */
+    fflush(fp);
+    fsync(fileno(fp));
+    fclose(fp);
+    
+    /* Use RENAME to make sure the DB file is changed atomically only
+     * if the generate DB file is ok. */
+    if (rename(tmpfile,filename) == -1) {
+        redisLog(REDIS_WARNING,"Error moving temp append only file on the final destination: %s", strerror(errno));
+        unlink(tmpfile);
+        return REDIS_ERR;
+    }
+    redisLog(REDIS_NOTICE,"SYNC append only file rewrite performed");
+    return REDIS_OK;
+
+werr:
+    fclose(fp);
+    unlink(tmpfile);
+    redisLog(REDIS_WARNING,"Write error writing append only file on disk: %s", strerror(errno));
+    if (di) dictReleaseIterator(di);
+    return REDIS_ERR;
+}
+
+/* This is how rewriting of the append only file in background works:
+ *
+ * 1) The user calls BGREWRITEAOF
+ * 2) Redis calls this function, that forks():
+ *    2a) the child rewrite the append only file in a temp file.
+ *    2b) the parent accumulates differences in server.bgrewritebuf.
+ * 3) When the child finished '2a' exists.
+ * 4) The parent will trap the exit code, if it's OK, will append the
+ *    data accumulated into server.bgrewritebuf into the temp file, and
+ *    finally will rename(2) the temp file in the actual file name.
+ *    The the new file is reopened as the new append only file. Profit!
+ */
+static int rewriteAppendOnlyFileBackground(void) {
+    pid_t childpid;
+
+    if (server.bgrewritechildpid != -1) return REDIS_ERR;
+    if ((childpid = fork()) == 0) {
+        /* Child */
+        char tmpfile[256];
+        close(server.fd);
+
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
+        if (rewriteAppendOnlyFile(tmpfile) == REDIS_OK) {
+            exit(0);
+        } else {
+            exit(1);
+        }
+    } else {
+        /* Parent */
+        if (childpid == -1) {
+            redisLog(REDIS_WARNING,
+                "Can't rewrite append only file in background: fork: %s",
+                strerror(errno));
+            return REDIS_ERR;
+        }
+        redisLog(REDIS_NOTICE,
+            "Background append only file rewriting started by pid %d",childpid);
+        server.bgrewritechildpid = childpid;
+        /* We set appendseldb to -1 in order to force the next call to the
+         * feedAppendOnlyFile() to issue a SELECT command, so the differences
+         * accumulated by the parent into server.bgrewritebuf will start
+         * with a SELECT statement and it will be safe to merge. */
+        server.appendseldb = -1;
+        return REDIS_OK;
+    }
+    return REDIS_OK; /* unreached */
+}
+
+static void bgrewriteaofCommand(redisClient *c) {
+    if (server.bgrewritechildpid != -1) {
+        addReplySds(c,sdsnew("-ERR background append only file rewriting already in progress\r\n"));
+        return;
+    }
+    if (rewriteAppendOnlyFileBackground() == REDIS_OK) {
+        char *status = "+Background append only file rewriting started\r\n";
+        addReplySds(c,sdsnew(status));
+    } else {
+        addReply(c,shared.err);
+    }
+}
+
+static void aofRemoveTempFile(pid_t childpid) {
+    char tmpfile[256];
+
+    snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) childpid);
+    unlink(tmpfile);
+}
+

 /* ================================= Debugging ============================== */
 
 static void debugCommand(redisClient *c) {
     if (!strcasecmp(c->argv[1]->ptr,"segfault")) {
         *((char*)-1) = 'x';
 /* ================================= Debugging ============================== */
 
 static void debugCommand(redisClient *c) {
     if (!strcasecmp(c->argv[1]->ptr,"segfault")) {
         *((char*)-1) = 'x';

+    } else if (!strcasecmp(c->argv[1]->ptr,"reload")) {
+        if (rdbSave(server.dbfilename) != REDIS_OK) {
+            addReply(c,shared.err);
+            return;
+        }
+        emptyDb();
+        if (rdbLoad(server.dbfilename) != REDIS_OK) {
+            addReply(c,shared.err);
+            return;
+        }
+        redisLog(REDIS_WARNING,"DB reloaded by DEBUG RELOAD");
+        addReply(c,shared.ok);
+    } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
+        emptyDb();
+        if (loadAppendOnlyFile(server.appendfilename) != REDIS_OK) {
+            addReply(c,shared.err);
+            return;
+        }
+        redisLog(REDIS_WARNING,"Append Only File loaded by DEBUG LOADAOF");
+        addReply(c,shared.ok);

     } else if (!strcasecmp(c->argv[1]->ptr,"object") && c->argc == 3) {
         dictEntry *de = dictFind(c->db->dict,c->argv[2]);
         robj *key, *val;
     } else if (!strcasecmp(c->argv[1]->ptr,"object") && c->argc == 3) {
         dictEntry *de = dictFind(c->db->dict,c->argv[2]);
         robj *key, *val;


@@ -5489,164 +6150,120 @@ static void debugCommand(redisClient *c) {
         val = dictGetEntryVal(de);
         addReplySds(c,sdscatprintf(sdsempty(),
             "+Key at:%p refcount:%d, value at:%p refcount:%d encoding:%d\r\n",
         val = dictGetEntryVal(de);
         addReplySds(c,sdscatprintf(sdsempty(),
             "+Key at:%p refcount:%d, value at:%p refcount:%d encoding:%d\r\n",

-                key, key->refcount, val, val->refcount, val->encoding));
+                (void*)key, key->refcount, (void*)val, val->refcount,
+                val->encoding));

     } else {
         addReplySds(c,sdsnew(
     } else {
         addReplySds(c,sdsnew(

-            "-ERR Syntax error, try DEBUG [SEGFAULT|OBJECT <key>]\r\n"));
+            "-ERR Syntax error, try DEBUG [SEGFAULT|OBJECT <key>|RELOAD]\r\n"));

     }
 }
 
     }
 }
 

+static void _redisAssert(char *estr) {
+    redisLog(REDIS_WARNING,"=== ASSERTION FAILED ===");
+    redisLog(REDIS_WARNING,"==> %s\n",estr);

 #ifdef HAVE_BACKTRACE
 #ifdef HAVE_BACKTRACE

-static struct redisFunctionSym symsTable[] = {
-{"compareStringObjects", (unsigned long)compareStringObjects},
-{"isStringRepresentableAsLong", (unsigned long)isStringRepresentableAsLong},
-{"dictEncObjKeyCompare", (unsigned long)dictEncObjKeyCompare},
-{"dictEncObjHash", (unsigned long)dictEncObjHash},
-{"incrDecrCommand", (unsigned long)incrDecrCommand},
-{"freeStringObject", (unsigned long)freeStringObject},
-{"freeListObject", (unsigned long)freeListObject},
-{"freeSetObject", (unsigned long)freeSetObject},
-{"decrRefCount", (unsigned long)decrRefCount},
-{"createObject", (unsigned long)createObject},
-{"freeClient", (unsigned long)freeClient},
-{"rdbLoad", (unsigned long)rdbLoad},
-{"rdbSaveStringObject", (unsigned long)rdbSaveStringObject},
-{"rdbSaveStringObjectRaw", (unsigned long)rdbSaveStringObjectRaw},
-{"addReply", (unsigned long)addReply},
-{"addReplySds", (unsigned long)addReplySds},
-{"incrRefCount", (unsigned long)incrRefCount},
-{"rdbSaveBackground", (unsigned long)rdbSaveBackground},
-{"createStringObject", (unsigned long)createStringObject},
-{"replicationFeedSlaves", (unsigned long)replicationFeedSlaves},
-{"syncWithMaster", (unsigned long)syncWithMaster},
-{"tryObjectSharing", (unsigned long)tryObjectSharing},
-{"tryObjectEncoding", (unsigned long)tryObjectEncoding},
-{"getDecodedObject", (unsigned long)getDecodedObject},
-{"removeExpire", (unsigned long)removeExpire},
-{"expireIfNeeded", (unsigned long)expireIfNeeded},
-{"deleteIfVolatile", (unsigned long)deleteIfVolatile},
-{"deleteKey", (unsigned long)deleteKey},
-{"getExpire", (unsigned long)getExpire},
-{"setExpire", (unsigned long)setExpire},
-{"updateSlavesWaitingBgsave", (unsigned long)updateSlavesWaitingBgsave},
-{"freeMemoryIfNeeded", (unsigned long)freeMemoryIfNeeded},
-{"authCommand", (unsigned long)authCommand},
-{"pingCommand", (unsigned long)pingCommand},
-{"echoCommand", (unsigned long)echoCommand},
-{"setCommand", (unsigned long)setCommand},
-{"setnxCommand", (unsigned long)setnxCommand},
-{"getCommand", (unsigned long)getCommand},
-{"delCommand", (unsigned long)delCommand},
-{"existsCommand", (unsigned long)existsCommand},
-{"incrCommand", (unsigned long)incrCommand},
-{"decrCommand", (unsigned long)decrCommand},
-{"incrbyCommand", (unsigned long)incrbyCommand},
-{"decrbyCommand", (unsigned long)decrbyCommand},
-{"selectCommand", (unsigned long)selectCommand},
-{"randomkeyCommand", (unsigned long)randomkeyCommand},
-{"keysCommand", (unsigned long)keysCommand},
-{"dbsizeCommand", (unsigned long)dbsizeCommand},
-{"lastsaveCommand", (unsigned long)lastsaveCommand},
-{"saveCommand", (unsigned long)saveCommand},
-{"bgsaveCommand", (unsigned long)bgsaveCommand},
-{"shutdownCommand", (unsigned long)shutdownCommand},
-{"moveCommand", (unsigned long)moveCommand},
-{"renameCommand", (unsigned long)renameCommand},
-{"renamenxCommand", (unsigned long)renamenxCommand},
-{"lpushCommand", (unsigned long)lpushCommand},
-{"rpushCommand", (unsigned long)rpushCommand},
-{"lpopCommand", (unsigned long)lpopCommand},
-{"rpopCommand", (unsigned long)rpopCommand},
-{"llenCommand", (unsigned long)llenCommand},
-{"lindexCommand", (unsigned long)lindexCommand},
-{"lrangeCommand", (unsigned long)lrangeCommand},
-{"ltrimCommand", (unsigned long)ltrimCommand},
-{"typeCommand", (unsigned long)typeCommand},
-{"lsetCommand", (unsigned long)lsetCommand},
-{"saddCommand", (unsigned long)saddCommand},
-{"sremCommand", (unsigned long)sremCommand},
-{"smoveCommand", (unsigned long)smoveCommand},
-{"sismemberCommand", (unsigned long)sismemberCommand},
-{"scardCommand", (unsigned long)scardCommand},
-{"spopCommand", (unsigned long)spopCommand},
-{"srandmemberCommand", (unsigned long)srandmemberCommand},
-{"sinterCommand", (unsigned long)sinterCommand},
-{"sinterstoreCommand", (unsigned long)sinterstoreCommand},
-{"sunionCommand", (unsigned long)sunionCommand},
-{"sunionstoreCommand", (unsigned long)sunionstoreCommand},
-{"sdiffCommand", (unsigned long)sdiffCommand},
-{"sdiffstoreCommand", (unsigned long)sdiffstoreCommand},
-{"syncCommand", (unsigned long)syncCommand},
-{"flushdbCommand", (unsigned long)flushdbCommand},
-{"flushallCommand", (unsigned long)flushallCommand},
-{"sortCommand", (unsigned long)sortCommand},
-{"lremCommand", (unsigned long)lremCommand},
-{"infoCommand", (unsigned long)infoCommand},
-{"mgetCommand", (unsigned long)mgetCommand},
-{"monitorCommand", (unsigned long)monitorCommand},
-{"expireCommand", (unsigned long)expireCommand},
-{"expireatCommand", (unsigned long)expireatCommand},
-{"getsetCommand", (unsigned long)getsetCommand},
-{"ttlCommand", (unsigned long)ttlCommand},
-{"slaveofCommand", (unsigned long)slaveofCommand},
-{"debugCommand", (unsigned long)debugCommand},
-{"processCommand", (unsigned long)processCommand},
-{"setupSigSegvAction", (unsigned long)setupSigSegvAction},
-{"readQueryFromClient", (unsigned long)readQueryFromClient},
-{"rdbRemoveTempFile", (unsigned long)rdbRemoveTempFile},
-{"msetGenericCommand", (unsigned long)msetGenericCommand},
-{"msetCommand", (unsigned long)msetCommand},
-{"msetnxCommand", (unsigned long)msetnxCommand},
-{"zslCreateNode", (unsigned long)zslCreateNode},
-{"zslCreate", (unsigned long)zslCreate},
-{"zslFreeNode",(unsigned long)zslFreeNode},
-{"zslFree",(unsigned long)zslFree},
-{"zslRandomLevel",(unsigned long)zslRandomLevel},
-{"zslInsert",(unsigned long)zslInsert},
-{"zslDelete",(unsigned long)zslDelete},
-{"createZsetObject",(unsigned long)createZsetObject},
-{"zaddCommand",(unsigned long)zaddCommand},
-{"zrangeGenericCommand",(unsigned long)zrangeGenericCommand},
-{"zrangeCommand",(unsigned long)zrangeCommand},
-{"zrevrangeCommand",(unsigned long)zrevrangeCommand},
-{"zremCommand",(unsigned long)zremCommand},
-{"rdbSaveDoubleValue",(unsigned long)rdbSaveDoubleValue},
-{"rdbLoadDoubleValue",(unsigned long)rdbLoadDoubleValue},
-{"feedAppendOnlyFile",(unsigned long)feedAppendOnlyFile},
-{NULL,0}
-};
+    redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)");
+    *((char*)-1) = 'x';
+#endif
+}

 
 

-/* This function try to convert a pointer into a function name. It's used in
- * oreder to provide a backtrace under segmentation fault that's able to
- * display functions declared as static (otherwise the backtrace is useless). */
-static char *findFuncName(void *pointer, unsigned long *offset){
-    int i, ret = -1;
-    unsigned long off, minoff = 0;
+/* =================================== Main! ================================ */

 
 

-    /* Try to match against the Symbol with the smallest offset */
-    for (i=0; symsTable[i].pointer; i++) {
-        unsigned long lp = (unsigned long) pointer;
+#ifdef __linux__
+int linuxOvercommitMemoryValue(void) {
+    FILE *fp = fopen("/proc/sys/vm/overcommit_memory","r");
+    char buf[64];

 
 

-        if (lp != (unsigned long)-1 && lp >= symsTable[i].pointer) {
-            off=lp-symsTable[i].pointer;
-            if (ret < 0 || off < minoff) {
-                minoff=off;
-                ret=i;
-            }
-        }
+    if (!fp) return -1;
+    if (fgets(buf,64,fp) == NULL) {
+        fclose(fp);
+        return -1;

     }
     }

-    if (ret == -1) return NULL;
-    *offset = minoff;
-    return symsTable[ret].name;
+    fclose(fp);
+
+    return atoi(buf);
+}
+
+void linuxOvercommitMemoryWarning(void) {
+    if (linuxOvercommitMemoryValue() == 0) {
+        redisLog(REDIS_WARNING,"WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect.");
+    }
+}
+#endif /* __linux__ */
+
+static void daemonize(void) {
+    int fd;
+    FILE *fp;
+
+    if (fork() != 0) exit(0); /* parent exits */
+    printf("New pid: %d\n", getpid());
+    setsid(); /* create a new session */
+
+    /* Every output goes to /dev/null. If Redis is daemonized but
+     * the 'logfile' is set to 'stdout' in the configuration file
+     * it will not log at all. */
+    if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
+        dup2(fd, STDIN_FILENO);
+        dup2(fd, STDOUT_FILENO);
+        dup2(fd, STDERR_FILENO);
+        if (fd > STDERR_FILENO) close(fd);
+    }
+    /* Try to write the pid file */
+    fp = fopen(server.pidfile,"w");
+    if (fp) {
+        fprintf(fp,"%d\n",getpid());
+        fclose(fp);
+    }
+}
+
+int main(int argc, char **argv) {
+    initServerConfig();
+    if (argc == 2) {
+        resetServerSaveParams();
+        loadServerConfig(argv[1]);
+    } else if (argc > 2) {
+        fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
+        exit(1);
+    } else {
+        redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'");
+    }
+    if (server.daemonize) daemonize();
+    initServer();
+    redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION);
+#ifdef __linux__
+    linuxOvercommitMemoryWarning();
+#endif
+    if (server.appendonly) {
+        if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
+            redisLog(REDIS_NOTICE,"DB loaded from append only file");
+    } else {
+        if (rdbLoad(server.dbfilename) == REDIS_OK)
+            redisLog(REDIS_NOTICE,"DB loaded from disk");
+    }
+    if (aeCreateFileEvent(server.el, server.fd, AE_READABLE,
+        acceptHandler, NULL) == AE_ERR) oom("creating file event");
+    redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
+    aeMain(server.el);
+    aeDeleteEventLoop(server.el);
+    return 0;

 }
 
 }
 

+/* ============================= Backtrace support ========================= */
+
+#ifdef HAVE_BACKTRACE
+static char *findFuncName(void *pointer, unsigned long *offset);
+

 static void *getMcontextEip(ucontext_t *uc) {
 #if defined(__FreeBSD__)
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)
     return (void*) uc->uc_mcontext.eip;
 #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 static void *getMcontextEip(ucontext_t *uc) {
 #if defined(__FreeBSD__)
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)
     return (void*) uc->uc_mcontext.eip;
 #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)

+  #if __x86_64__
+    return (void*) uc->uc_mcontext->__ss.__rip;
+  #else

     return (void*) uc->uc_mcontext->__ss.__eip;
     return (void*) uc->uc_mcontext->__ss.__eip;

+  #endif

 #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
   #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
     return (void*) uc->uc_mcontext->__ss.__rip;
 #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
   #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
     return (void*) uc->uc_mcontext->__ss.__rip;


@@ -5667,36 +6284,16 @@ static void segvHandler(int sig, siginfo_t *info, void *secret) {
     char **messages = NULL;
     int i, trace_size = 0;
     unsigned long offset=0;
     char **messages = NULL;
     int i, trace_size = 0;
     unsigned long offset=0;

-    time_t uptime = time(NULL)-server.stat_starttime;

     ucontext_t *uc = (ucontext_t*) secret;
     ucontext_t *uc = (ucontext_t*) secret;

+    sds infostring;

     REDIS_NOTUSED(info);
 
     redisLog(REDIS_WARNING,
         "======= Ooops! Redis %s got signal: -%d- =======", REDIS_VERSION, sig);
     REDIS_NOTUSED(info);
 
     redisLog(REDIS_WARNING,
         "======= Ooops! Redis %s got signal: -%d- =======", REDIS_VERSION, sig);

-    redisLog(REDIS_WARNING, "%s", sdscatprintf(sdsempty(),
-        "redis_version:%s; "
-        "uptime_in_seconds:%d; "
-        "connected_clients:%d; "
-        "connected_slaves:%d; "
-        "used_memory:%zu; "
-        "changes_since_last_save:%lld; "
-        "bgsave_in_progress:%d; "
-        "last_save_time:%d; "
-        "total_connections_received:%lld; "
-        "total_commands_processed:%lld; "
-        "role:%s;"
-        ,REDIS_VERSION,
-        uptime,
-        listLength(server.clients)-listLength(server.slaves),
-        listLength(server.slaves),
-        server.usedmemory,
-        server.dirty,
-        server.bgsaveinprogress,
-        server.lastsave,
-        server.stat_numconnections,
-        server.stat_numcommands,
-        server.masterhost == NULL ? "master" : "slave"
-    ));
+    infostring = genRedisInfoString();
+    redisLog(REDIS_WARNING, "%s",infostring);
+    /* It's not safe to sdsfree() the returned string under memory
+     * corruption conditions. Let it leak as we are going to abort */

     
     trace_size = backtrace(trace, 100);
     /* overwrite sigaction with caller's address */
     
     trace_size = backtrace(trace, 100);
     /* overwrite sigaction with caller's address */


@@ -5715,7 +6312,7 @@ static void segvHandler(int sig, siginfo_t *info, void *secret) {
             redisLog(REDIS_WARNING,"%d redis-server %p %s + %d", i, trace[i], fn, (unsigned int)offset);
         }
     }
             redisLog(REDIS_WARNING,"%d redis-server %p %s + %d", i, trace[i], fn, (unsigned int)offset);
         }
     }

-    free(messages);
+    // free(messages); Don't call free() with possibly corrupted memory.

     exit(0);
 }
 
     exit(0);
 }
 


@@ -5734,87 +6331,39 @@ static void setupSigSegvAction(void) {
     sigaction (SIGBUS, &act, NULL);
     return;
 }
     sigaction (SIGBUS, &act, NULL);
     return;
 }

-#else /* HAVE_BACKTRACE */
-static void setupSigSegvAction(void) {
-}
-#endif /* HAVE_BACKTRACE */

 
 

-/* =================================== Main! ================================ */
+#include "staticsymbols.h"
+/* This function try to convert a pointer into a function name. It's used in
+ * oreder to provide a backtrace under segmentation fault that's able to
+ * display functions declared as static (otherwise the backtrace is useless). */
+static char *findFuncName(void *pointer, unsigned long *offset){
+    int i, ret = -1;
+    unsigned long off, minoff = 0;

 
 

-#ifdef __linux__
-int linuxOvercommitMemoryValue(void) {
-    FILE *fp = fopen("/proc/sys/vm/overcommit_memory","r");
-    char buf[64];
+    /* Try to match against the Symbol with the smallest offset */
+    for (i=0; symsTable[i].pointer; i++) {
+        unsigned long lp = (unsigned long) pointer;

 
 

-    if (!fp) return -1;
-    if (fgets(buf,64,fp) == NULL) {
-        fclose(fp);
-        return -1;
+        if (lp != (unsigned long)-1 && lp >= symsTable[i].pointer) {
+            off=lp-symsTable[i].pointer;
+            if (ret < 0 || off < minoff) {
+                minoff=off;
+                ret=i;
+            }
+        }

     }
     }

-    fclose(fp);
-
-    return atoi(buf);
+    if (ret == -1) return NULL;
+    *offset = minoff;
+    return symsTable[ret].name;

 }
 }

-
-void linuxOvercommitMemoryWarning(void) {
-    if (linuxOvercommitMemoryValue() == 0) {
-        redisLog(REDIS_WARNING,"WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect.");
-    }
+#else /* HAVE_BACKTRACE */
+static void setupSigSegvAction(void) {

 }
 }

-#endif /* __linux__ */
+#endif /* HAVE_BACKTRACE */

 
 

-static void daemonize(void) {
-    int fd;
-    FILE *fp;

 
 

-    if (fork() != 0) exit(0); /* parent exits */
-    setsid(); /* create a new session */

 
 

-    /* Every output goes to /dev/null. If Redis is daemonized but
-     * the 'logfile' is set to 'stdout' in the configuration file
-     * it will not log at all. */
-    if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
-        dup2(fd, STDIN_FILENO);
-        dup2(fd, STDOUT_FILENO);
-        dup2(fd, STDERR_FILENO);
-        if (fd > STDERR_FILENO) close(fd);
-    }
-    /* Try to write the pid file */
-    fp = fopen(server.pidfile,"w");
-    if (fp) {
-        fprintf(fp,"%d\n",getpid());
-        fclose(fp);
-    }
-}
+/* The End */
+
+

 
 

-int main(int argc, char **argv) {
-    initServerConfig();
-    if (argc == 2) {
-        ResetServerSaveParams();
-        loadServerConfig(argv[1]);
-    } else if (argc > 2) {
-        fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
-        exit(1);
-    } else {
-        redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'");
-    }
-    initServer();
-    if (server.daemonize) daemonize();
-    redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION);
-#ifdef __linux__
-    linuxOvercommitMemoryWarning();
-#endif
-    if (server.appendonly) {
-        if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
-            redisLog(REDIS_NOTICE,"DB loaded from append only file");
-    } else {
-        if (rdbLoad(server.dbfilename) == REDIS_OK)
-            redisLog(REDIS_NOTICE,"DB loaded from disk");
-    }
-    if (aeCreateFileEvent(server.el, server.fd, AE_READABLE,
-        acceptHandler, NULL, NULL) == AE_ERR) oom("creating file event");
-    redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
-    aeMain(server.el);
-    aeDeleteEventLoop(server.el);
-    return 0;
-}