X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/9d65a1bbae9e59269472e8067cb2fff1e1cce24c..7c49733ce3f550a96f60a9213911fdc9265cedc8:/redis.c diff --git a/redis.c b/redis.c index ca88add3..61bb81cf 100644 --- a/redis.c +++ b/redis.c @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define REDIS_VERSION "1.07" +#define REDIS_VERSION "1.1.91" #include "fmacros.h" #include "config.h" @@ -198,6 +198,10 @@ #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 */ @@ -209,6 +213,17 @@ typedef struct redisObject { 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; @@ -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}, - {"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}, @@ -521,7 +536,7 @@ static struct redisCommand cmdTable[] = { {"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}, @@ -791,7 +806,7 @@ static dictType zsetDictType = { NULL, /* val dup */ dictEncObjKeyCompare, /* key compare */ dictRedisObjectDestructor, /* key destructor */ - dictVanillaFree /* val destructor */ + dictVanillaFree /* val destructor of malloc(sizeof(double)) */ }; 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) { - fprintf(stderr, "%s: Out of memory\n",msg); - fflush(stderr); + redisLog(REDIS_WARNING, "%s: Out of memory\n",msg); sleep(1); abort(); } @@ -909,7 +923,7 @@ void backgroundRewriteDoneHandler(int statloc) { close(fd); goto cleanup; } - redisLog(REDIS_WARNING,"Parent diff flushed into the new append log file with success"); + 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) { @@ -924,6 +938,7 @@ void backgroundRewriteDoneHandler(int statloc) { 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 @@ -1396,14 +1411,14 @@ static void freeClient(redisClient *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); - assert(ln != NULL); + redisAssert(ln != NULL); listDelNode(l,ln); } if (c->flags & REDIS_MASTER) { @@ -1698,7 +1713,10 @@ static int processCommand(redisClient *c) { 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) { @@ -1786,8 +1804,8 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di 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; } @@ -1862,6 +1880,7 @@ again: if (sdslen(query) == 0) { /* Ignore empty query */ sdsfree(query); + if (sdslen(c->querybuf)) goto again; return; } argv = sdssplitlen(query,sdslen(query)," ",1,&argc); @@ -1879,10 +1898,16 @@ again: } } 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"); @@ -2003,8 +2028,8 @@ static void addReplyDouble(redisClient *c, double 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) { @@ -2024,7 +2049,7 @@ static void addReplyBulkLen(redisClient *c, robj *obj) { 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) { @@ -2154,7 +2179,7 @@ static void decrRefCount(void *obj) { 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)) @@ -2199,7 +2224,7 @@ static robj *tryObjectSharing(robj *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); @@ -2217,7 +2242,7 @@ static robj *tryObjectSharing(robj *o) { 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) { @@ -2230,7 +2255,7 @@ static robj *tryObjectSharing(robj *o) { int retval; retval = dictAdd(server.sharingpool,o,(void*)1); - assert(retval == DICT_OK); + redisAssert(retval == DICT_OK); incrRefCount(o); } return o; @@ -2273,7 +2298,7 @@ static int tryObjectEncoding(robj *o) { 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; @@ -2301,16 +2326,20 @@ static robj *getDecodedObject(robj *o) { 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 - * 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) { - 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; @@ -2333,7 +2362,7 @@ static int compareStringObjects(robj *a, robj *b) { } 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 { @@ -2606,7 +2635,7 @@ static int rdbSave(char *filename) { } dictReleaseIterator(di); } else { - assert(0 != 0); + redisAssert(0 != 0); } } dictReleaseIterator(di); @@ -2740,7 +2769,7 @@ static robj *rdbLoadIntegerObject(FILE *fp, int enctype) { val = (int32_t)v; } else { val = 0; /* anti-warning */ - assert(0!=0); + redisAssert(0!=0); } return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val)); } @@ -2779,7 +2808,7 @@ static robj *rdbLoadStringObject(FILE*fp, int rdbver) { case REDIS_RDB_ENC_LZF: return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver)); default: - assert(0!=0); + redisAssert(0!=0); } } @@ -2804,6 +2833,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; + buf[len] = '\0'; sscanf(buf, "%lg", val); return 0; } @@ -2905,7 +2935,7 @@ static int rdbLoad(char *filename) { 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); @@ -2959,6 +2989,7 @@ static void echoCommand(redisClient *c) { 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) { @@ -3034,26 +3065,30 @@ static void mgetCommand(redisClient *c) { } static void msetGenericCommand(redisClient *c, int nx) { - int j; + int j, busykeys = 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) { - 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; + 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]); @@ -3095,7 +3130,7 @@ static void incrDecrCommand(redisClient *c, long long incr) { else if (o->encoding == REDIS_ENCODING_INT) value = (long)o->ptr; else - assert(1 != 1); + redisAssert(1 != 1); } } @@ -3193,7 +3228,7 @@ static void keysCommand(redisClient *c) { 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); @@ -3267,7 +3302,8 @@ static void bgsaveCommand(redisClient *c) { 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); } @@ -3850,7 +3886,7 @@ static void scardCommand(redisClient *c) { addReply(c,shared.wrongtypeerr); } else { s = o->ptr; - addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n", + addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n", dictSize(s))); } } @@ -3915,12 +3951,12 @@ static int qsortCompareSetsByCardinality(const void *s1, const void *s2) { 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; - int j, cardinality = 0; + unsigned long j, cardinality = 0; for (j = 0; j < setsnum; j++) { robj *setobj; @@ -3932,7 +3968,7 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r zfree(dv); if (dstkey) { deleteKey(c->db,dstkey); - addReply(c,shared.ok); + addReply(c,shared.czero); } else { addReply(c,shared.nullmultibulk); } @@ -3997,9 +4033,9 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r } if (!dstkey) { - lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",cardinality); + lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",cardinality); } else { - addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n", + addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n", dictSize((dict*)dstset->ptr))); server.dirty++; } @@ -4101,7 +4137,7 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu 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++; } @@ -4387,14 +4423,14 @@ static void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scor /* 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); - assert(deleted != 0); + redisAssert(deleted != 0); zslInsert(zs->zsl,*score,ele); incrRefCount(ele); /* Update the score in the hash table */ @@ -4449,7 +4485,7 @@ static void zremCommand(redisClient *c) { /* 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]); @@ -4553,6 +4589,20 @@ static void zrangebyscoreCommand(redisClient *c) { 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) { @@ -4581,14 +4631,22 @@ static void zrangebyscoreCommand(redisClient *c) { * it later */ lenobj = createObject(REDIS_STRING,NULL); addReply(c,lenobj); + decrRefCount(lenobj); 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++; + if (limit > 0) limit--; } lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",rangelen); } @@ -4608,7 +4666,7 @@ static void zcardCommand(redisClient *c) { 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)); } } } @@ -4706,10 +4764,7 @@ static robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst) { 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); */ @@ -4779,7 +4834,9 @@ static void sortCommand(redisClient *c) { 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; } @@ -4832,11 +4889,15 @@ static void sortCommand(redisClient *c) { } /* 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; + if (sortval->type == REDIS_LIST) { list *list = sortval->ptr; listNode *ln; @@ -4850,10 +4911,17 @@ static void sortCommand(redisClient *c) { j++; } } else { - dict *set = sortval->ptr; + dict *set; 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); @@ -4863,7 +4931,7 @@ static void sortCommand(redisClient *c) { } dictReleaseIterator(di); } - assert(j == vectorlen); + redisAssert(j == vectorlen); /* Now it's time to load the right scores in the sorting vector */ if (dontsort == 0) { @@ -4885,7 +4953,7 @@ static void sortCommand(redisClient *c) { if (byval->encoding == REDIS_ENCODING_INT) { vector[j].u.score = (long)byval->ptr; } else - assert(1 != 1); + redisAssert(1 != 1); } } } else { @@ -4896,7 +4964,7 @@ static void sortCommand(redisClient *c) { if (vector[j].obj->encoding == REDIS_ENCODING_INT) vector[j].u.score = (long) vector[j].obj->ptr; else - assert(1 != 1); + redisAssert(1 != 1); } } } @@ -4951,7 +5019,7 @@ static void sortCommand(redisClient *c) { addReply(c,shared.crlf); } } else { - assert(sop->type == REDIS_SORT_GET); /* always fails */ + redisAssert(sop->type == REDIS_SORT_GET); /* always fails */ } } } @@ -4980,7 +5048,7 @@ static void sortCommand(redisClient *c) { incrRefCount(val); } } else { - assert(sop->type == REDIS_SORT_GET); /* always fails */ + redisAssert(sop->type == REDIS_SORT_GET); /* always fails */ } } } @@ -5004,7 +5072,10 @@ static void sortCommand(redisClient *c) { 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; @@ -5012,19 +5083,22 @@ static void infoCommand(redisClient *c) { 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" - "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", + aeGetApiName(), uptime, uptime/(3600*24), listLength(server.clients)-listLength(server.slaves), @@ -5033,6 +5107,7 @@ static void infoCommand(redisClient *c) { server.dirty, server.bgsavechildpid != -1, server.lastsave, + server.bgrewritechildpid != -1, server.stat_numconnections, server.stat_numcommands, server.masterhost == NULL ? "master" : "slave" @@ -5060,7 +5135,13 @@ static void infoCommand(redisClient *c) { 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); } @@ -5509,6 +5590,7 @@ static int syncWithMaster(void) { } server.master = createClient(fd); server.master->flags |= REDIS_MASTER; + server.master->authenticated = 1; server.replstate = REDIS_REPL_CONNECTED; return REDIS_OK; } @@ -5602,8 +5684,8 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv 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; } @@ -5627,7 +5709,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv 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); @@ -5656,6 +5738,14 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv } 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 && @@ -5731,7 +5821,7 @@ int loadAppendOnlyFile(char *filename) { 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 */ } @@ -5845,7 +5935,7 @@ static int rewriteAppendOnlyFile(char *filename) { /* SELECT the new DB */ if (fwrite(selectcmd,sizeof(selectcmd)-1,1,fp) == 0) goto werr; - if (fwriteBulkLong(fp,j+1) == 0) goto werr; + if (fwriteBulkLong(fp,j) == 0) goto werr; /* Iterate this DB writing every entry */ while((de = dictNext(di)) != NULL) { @@ -5854,7 +5944,6 @@ static int rewriteAppendOnlyFile(char *filename) { time_t expiretime = getExpire(db,key); /* Save the key and associated value */ - if (rdbSaveStringObject(fp,key) == -1) goto werr; if (o->type == REDIS_STRING) { /* Emit a SET command */ char cmd[]="*3\r\n$3\r\nSET\r\n"; @@ -5909,7 +5998,7 @@ static int rewriteAppendOnlyFile(char *filename) { } dictReleaseIterator(di); } else { - assert(0 != 0); + redisAssert(0 != 0); } /* Save the expire time */ if (expiretime != -1) { @@ -5985,6 +6074,11 @@ static int rewriteAppendOnlyFileBackground(void) { 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 */ @@ -5996,7 +6090,8 @@ static void bgrewriteaofCommand(redisClient *c) { return; } if (rewriteAppendOnlyFileBackground() == REDIS_OK) { - addReply(c,shared.ok); + char *status = "+Background append only file rewriting started\r\n"; + addReplySds(c,sdsnew(status)); } else { addReply(c,shared.err); } @@ -6038,13 +6133,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", - 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 |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__ @@ -6074,6 +6179,7 @@ static void daemonize(void) { 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 @@ -6104,8 +6210,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'"); } - initServer(); if (server.daemonize) daemonize(); + initServer(); redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION); #ifdef __linux__ linuxOvercommitMemoryWarning(); @@ -6136,7 +6242,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) + #if __x86_64__ + return (void*) uc->uc_mcontext->__ss.__rip; + #else 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; @@ -6157,36 +6267,16 @@ static void segvHandler(int sig, siginfo_t *info, void *secret) { 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; + sds infostring; 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.bgsavechildpid != -1, - 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 */ @@ -6205,7 +6295,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); } } - free(messages); + // free(messages); Don't call free() with possibly corrupted memory. exit(0); }