X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/70cb03e172a892e75542d895932b320ee7bf5167..c6f9ee88fa81468261d3cc771112e4ea9fd2e6da:/src/db.c diff --git a/src/db.c b/src/db.c index 9620b6e8..3135795d 100644 --- a/src/db.c +++ b/src/db.c @@ -1,6 +1,7 @@ #include "redis.h" #include +#include void SlotToKeyAdd(robj *key); void SlotToKeyDel(robj *key); @@ -34,7 +35,7 @@ void SlotToKeyDel(robj *key); robj *lookupKey(redisDb *db, robj *key) { dictEntry *de = dictFind(db->dict,key->ptr); if (de) { - robj *val = dictGetEntryVal(de); + robj *val = dictGetVal(de); /* Update the access time for the aging algorithm. * Don't do it if we have a saving child, as this will trigger @@ -130,7 +131,7 @@ robj *dbRandomKey(redisDb *db) { de = dictGetRandomKey(db->dict); if (de == NULL) return NULL; - key = dictGetEntryKey(de); + key = dictGetKey(de); keyobj = createStringObject(key,sdslen(key)); if (dictFind(db->expires,key)) { if (expireIfNeeded(db,keyobj)) { @@ -213,7 +214,13 @@ void flushallCommand(redisClient *c) { kill(server.bgsavechildpid,SIGKILL); rdbRemoveTempFile(server.bgsavechildpid); } - rdbSave(server.dbfilename); + if (server.saveparamslen > 0) { + /* Normally rdbSave() will reset dirty, but we don't want this here + * as otherwise FLUSHALL will not be replicated nor put into the AOF. */ + int saved_dirty = server.dirty; + rdbSave(server.dbfilename); + server.dirty = saved_dirty; + } server.dirty++; } @@ -276,7 +283,7 @@ void keysCommand(redisClient *c) { di = dictGetIterator(c->db->dict); allkeys = (pattern[0] == '*' && pattern[1] == '\0'); while((de = dictNext(di)) != NULL) { - sds key = dictGetEntryKey(de); + sds key = dictGetKey(de); robj *keyobj; if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) { @@ -321,14 +328,28 @@ void typeCommand(redisClient *c) { } void shutdownCommand(redisClient *c) { - if (prepareForShutdown() == REDIS_OK) - exit(0); + int flags = 0; + + if (c->argc > 2) { + addReply(c,shared.syntaxerr); + return; + } else if (c->argc == 2) { + if (!strcasecmp(c->argv[1]->ptr,"nosave")) { + flags |= REDIS_SHUTDOWN_NOSAVE; + } else if (!strcasecmp(c->argv[1]->ptr,"save")) { + flags |= REDIS_SHUTDOWN_SAVE; + } else { + addReply(c,shared.syntaxerr); + return; + } + } + if (prepareForShutdown(flags) == REDIS_OK) exit(0); addReplyError(c,"Errors trying to SHUTDOWN. Check logs."); } void renameGenericCommand(redisClient *c, int nx) { robj *o; - time_t expire; + long long expire; /* To use the same key as src and dst is probably an error */ if (sdscmp(c->argv[1]->ptr,c->argv[2]->ptr) == 0) { @@ -426,18 +447,19 @@ int removeExpire(redisDb *db, robj *key) { return dictDelete(db->expires,key->ptr) == DICT_OK; } -void setExpire(redisDb *db, robj *key, time_t when) { - dictEntry *de; +void setExpire(redisDb *db, robj *key, long long when) { + dictEntry *kde, *de; /* Reuse the sds from the main dict in the expire dict */ - de = dictFind(db->dict,key->ptr); - redisAssertWithInfo(NULL,key,de != NULL); - dictReplace(db->expires,dictGetEntryKey(de),(void*)when); + kde = dictFind(db->dict,key->ptr); + redisAssertWithInfo(NULL,key,kde != NULL); + de = dictReplaceRaw(db->expires,dictGetKey(kde)); + dictSetSignedIntegerVal(de,when); } /* Return the expire time of the specified key, or -1 if no expire * is associated with this key (i.e. the key is non volatile) */ -time_t getExpire(redisDb *db, robj *key) { +long long getExpire(redisDb *db, robj *key) { dictEntry *de; /* No expire? return ASAP */ @@ -447,7 +469,7 @@ time_t getExpire(redisDb *db, robj *key) { /* The entry was found in the expire dict, this means it should also * be present in the main dict (safety check). */ redisAssertWithInfo(NULL,key,dictFind(db->dict,key->ptr) != NULL); - return (time_t) dictGetEntryVal(de); + return dictGetSignedIntegerVal(de); } /* Propagate expires into slaves and the AOF file. @@ -475,7 +497,7 @@ void propagateExpire(redisDb *db, robj *key) { } int expireIfNeeded(redisDb *db, robj *key) { - time_t when = getExpire(db,key); + long long when = getExpire(db,key); if (when < 0) return 0; /* No expire for this key */ @@ -494,7 +516,7 @@ int expireIfNeeded(redisDb *db, robj *key) { } /* Return when this key has not expired */ - if (time(NULL) <= when) return 0; + if (mstime() <= when) return 0; /* Delete the key */ server.stat_expiredkeys++; @@ -506,13 +528,24 @@ int expireIfNeeded(redisDb *db, robj *key) { * Expires Commands *----------------------------------------------------------------------------*/ -void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) { +/* Given an string object return true if it contains exactly the "ms" + * or "MS" string. This is used in order to check if the last argument + * of EXPIRE, EXPIREAT or TTL is "ms" to switch into millisecond input/output */ +int stringObjectEqualsMs(robj *a) { + char *arg = a->ptr; + return tolower(arg[0]) == 'm' && tolower(arg[1]) == 's' && arg[2] == '\0'; +} + +void expireGenericCommand(redisClient *c, long long offset, int unit) { dictEntry *de; - long seconds; + robj *key = c->argv[1], *param = c->argv[2]; + long long milliseconds; - if (getLongFromObjectOrReply(c, param, &seconds, NULL) != REDIS_OK) return; + if (getLongLongFromObjectOrReply(c, param, &milliseconds, NULL) != REDIS_OK) + return; - seconds -= offset; + if (unit == UNIT_SECONDS) milliseconds *= 1000; + milliseconds -= offset; de = dictFind(c->db->dict,key->ptr); if (de == NULL) { @@ -525,7 +558,7 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) { * * Instead we take the other branch of the IF statement setting an expire * (possibly in the past) and wait for an explicit DEL from the master. */ - if (seconds <= 0 && !server.loading && !server.masterhost) { + if (milliseconds <= 0 && !server.loading && !server.masterhost) { robj *aux; redisAssertWithInfo(c,key,dbDelete(c->db,key)); @@ -539,7 +572,7 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) { addReply(c, shared.cone); return; } else { - time_t when = time(NULL)+seconds; + long long when = mstime()+milliseconds; setExpire(c->db,key,when); addReply(c,shared.cone); signalModifiedKey(c->db,key); @@ -549,22 +582,42 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) { } void expireCommand(redisClient *c) { - expireGenericCommand(c,c->argv[1],c->argv[2],0); + expireGenericCommand(c,0,UNIT_SECONDS); } void expireatCommand(redisClient *c) { - expireGenericCommand(c,c->argv[1],c->argv[2],time(NULL)); + expireGenericCommand(c,mstime(),UNIT_SECONDS); } -void ttlCommand(redisClient *c) { - time_t expire, ttl = -1; +void pexpireCommand(redisClient *c) { + expireGenericCommand(c,0,UNIT_MILLISECONDS); +} + +void pexpireatCommand(redisClient *c) { + expireGenericCommand(c,mstime(),UNIT_MILLISECONDS); +} + +void ttlGenericCommand(redisClient *c, int output_ms) { + long long expire, ttl = -1; expire = getExpire(c->db,c->argv[1]); if (expire != -1) { - ttl = (expire-time(NULL)); + ttl = expire-mstime(); if (ttl < 0) ttl = -1; } - addReplyLongLong(c,(long long)ttl); + if (ttl == -1) { + addReplyLongLong(c,-1); + } else { + addReplyLongLong(c,output_ms ? ttl : ((ttl+500)/1000)); + } +} + +void ttlCommand(redisClient *c) { + ttlGenericCommand(c, 0); +} + +void pttlCommand(redisClient *c) { + ttlGenericCommand(c, 1); } void persistCommand(redisClient *c) {