a bit more verbose -ERR wrong number o arguments error, now gives info about the...

[redis.git] / redis.c

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

-#define REDIS_VERSION "1.07"
+#define REDIS_VERSION "1.1.91"

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


@@ -198,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 */


@@ -209,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;


@@ -501,7 +516,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},
+    {"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},


@@ -791,7 +806,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 = {


@@ -811,8 +826,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();
 }


@@ -1397,14 +1411,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) {


@@ -1699,7 +1713,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) {


@@ -1787,8 +1804,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;
         }


@@ -2004,8 +2021,8 @@ static void addReplyDouble(redisClient *c, double d) {
     char buf[128];
 
     snprintf(buf,sizeof(buf),"%.17g",d);
     char buf[128];
 
     snprintf(buf,sizeof(buf),"%.17g",d);

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

 }
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {
 }
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {


@@ -2025,7 +2042,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) {


@@ -2155,7 +2172,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))


@@ -2200,7 +2217,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);


@@ -2218,7 +2235,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) {


@@ -2231,7 +2248,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;


@@ -2274,7 +2291,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;


@@ -2302,7 +2319,7 @@ static robj *getDecodedObject(robj *o) {
         dec = createStringObject(buf,strlen(buf));
         return dec;
     } else {
         dec = createStringObject(buf,strlen(buf));
         return dec;
     } else {

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

     }
 }
 
     }
 }
 


@@ -2315,7 +2332,7 @@ static robj *getDecodedObject(robj *o) {
  * sdscmp() from sds.c will apply memcmp() so this function ca be considered
  * binary safe. */
 static int compareStringObjects(robj *a, robj *b) {
  * sdscmp() from sds.c will apply memcmp() so this function ca be considered
  * binary safe. */
 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;
 


@@ -2338,7 +2355,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 {


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

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

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


@@ -2745,7 +2762,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));
 }


@@ -2784,7 +2801,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);

         }
     }
 
         }
     }
 


@@ -2809,6 +2826,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;
     }


@@ -2910,7 +2928,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);


@@ -2964,6 +2982,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) {


@@ -3039,22 +3058,25 @@ static void mgetCommand(redisClient *c) {
 }
 
 static void msetGenericCommand(redisClient *c, int nx) {
 }
 
 static void msetGenericCommand(redisClient *c, int nx) {

-    int j;
+    int j, busykeys = 0;

 
     if ((c->argc % 2) == 0) {
 
     if ((c->argc % 2) == 0) {

-        addReplySds(c,sdsnew("-ERR wrong number of arguments\r\n"));
+        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) {
         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;
+            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;
 
     for (j = 1; j < c->argc; j += 2) {
         int retval;


@@ -3101,7 +3123,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);

         }
     }
 
         }
     }
 


@@ -3199,7 +3221,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);


@@ -3856,7 +3878,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)));
         }
     }


@@ -3921,12 +3943,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;


@@ -4003,9 +4025,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++;
     }


@@ -4107,7 +4129,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++;
     }


@@ -4393,14 +4415,14 @@ static void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scor
         
         /* case 2: Score update operation */
         de = dictFind(zs->dict,ele);
         
         /* case 2: Score update operation */
         de = dictFind(zs->dict,ele);

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

         oldscore = dictGetEntryVal(de);
         if (*score != *oldscore) {
             int deleted;
 
             /* Remove and insert the element in the skip list with new score */
             deleted = zslDelete(zs->zsl,*oldscore,ele);
         oldscore = dictGetEntryVal(de);
         if (*score != *oldscore) {
             int deleted;
 
             /* Remove and insert the element in the skip list with new score */
             deleted = zslDelete(zs->zsl,*oldscore,ele);

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

             zslInsert(zs->zsl,*score,ele);
             incrRefCount(ele);
             /* Update the score in the hash table */
             zslInsert(zs->zsl,*score,ele);
             incrRefCount(ele);
             /* Update the score in the hash table */


@@ -4455,7 +4477,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]);


@@ -4562,7 +4584,8 @@ static void zrangebyscoreCommand(redisClient *c) {
     int offset = 0, limit = -1;
 
     if (c->argc != 4 && c->argc != 7) {
     int offset = 0, limit = -1;
 
     if (c->argc != 4 && c->argc != 7) {

-        addReplySds(c,sdsnew("-ERR wrong number of arguments\r\n"));
+        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 && strcasecmp(c->argv[4]->ptr,"limit")) {
         addReply(c,shared.syntaxerr);


@@ -4570,6 +4593,7 @@ static void zrangebyscoreCommand(redisClient *c) {
     } else if (c->argc == 7) {
         offset = atoi(c->argv[5]->ptr);
         limit = atoi(c->argv[6]->ptr);
     } 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]);
     }
 
     o = lookupKeyRead(c->db,c->argv[1]);


@@ -4634,7 +4658,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));

         }
     }
 }
         }
     }
 }


@@ -4732,10 +4756,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); */


@@ -4805,7 +4826,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;
     }


@@ -4858,11 +4881,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;


@@ -4876,10 +4903,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);


@@ -4889,7 +4923,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) {


@@ -4911,7 +4945,7 @@ static void sortCommand(redisClient *c) {
                         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 {


@@ -4922,7 +4956,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);

                     }
                 }
             }
                     }
                 }
             }


@@ -4977,7 +5011,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 */

                 }
             }
         }
                 }
             }
         }


@@ -5006,7 +5040,7 @@ 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 */

                 }
             }
         }
                 }
             }
         }


@@ -5042,14 +5076,14 @@ static sds genRedisInfoString(void) {
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
         "multiplexing_api:%s\r\n"
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
         "multiplexing_api:%s\r\n"

-        "uptime_in_seconds:%d\r\n"
-        "uptime_in_days:%d\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"

         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "role:%s\r\n"
         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "role:%s\r\n"


@@ -5096,7 +5130,8 @@ static sds genRedisInfoString(void) {
 
 static void infoCommand(redisClient *c) {
     sds info = genRedisInfoString();
 
 static void infoCommand(redisClient *c) {
     sds info = genRedisInfoString();

-    addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",sdslen(info)));
+    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);
 }


@@ -5638,8 +5673,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;
     }
 


@@ -5663,7 +5698,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
         robj *o = argv[j];
 
         o = getDecodedObject(o);
         robj *o = argv[j];
 
         o = getDecodedObject(o);

-        buf = sdscatprintf(buf,"$%d\r\n",sdslen(o->ptr));
+        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);
         decrRefCount(o);
         buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
         buf = sdscatlen(buf,"\r\n",2);
         decrRefCount(o);


@@ -5952,7 +5987,7 @@ static int rewriteAppendOnlyFile(char *filename) {
                 }
                 dictReleaseIterator(di);
             } else {
                 }
                 dictReleaseIterator(di);
             } else {

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

             }
             /* Save the expire time */
             if (expiretime != -1) {
             }
             /* Save the expire time */
             if (expiretime != -1) {


@@ -6086,13 +6121,23 @@ 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(
             "-ERR Syntax error, try DEBUG [SEGFAULT|OBJECT <key>|RELOAD]\r\n"));
     }
 }
 
     } else {
         addReplySds(c,sdsnew(
             "-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
+    redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)");
+    *((char*)-1) = 'x';
+#endif
+}
+

 /* =================================== Main! ================================ */
 
 #ifdef __linux__
 /* =================================== Main! ================================ */
 
 #ifdef __linux__


@@ -6122,6 +6167,7 @@ static void daemonize(void) {
     FILE *fp;
 
     if (fork() != 0) exit(0); /* parent exits */
     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
     setsid(); /* create a new session */
 
     /* Every output goes to /dev/null. If Redis is daemonized but


@@ -6152,8 +6198,8 @@ int main(int argc, char **argv) {
     } 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'");
     }
     } 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();
     if (server.daemonize) daemonize();

+    initServer();

     redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION);
 #ifdef __linux__
     linuxOvercommitMemoryWarning();
     redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION);
 #ifdef __linux__
     linuxOvercommitMemoryWarning();


@@ -6184,7 +6230,11 @@ static void *getMcontextEip(ucontext_t *uc) {
 #elif defined(__dietlibc__)
     return (void*) uc->uc_mcontext.eip;
 #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 #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;