#include "redis.h"
#include <signal.h>
+#include <ctype.h>
void SlotToKeyAdd(robj *key);
void SlotToKeyDel(robj *key);
* C-level DB API
*----------------------------------------------------------------------------*/
-/* Important notes on lookup and disk store.
- *
- * When disk store is enabled on lookup we can have different cases.
- *
- * a) The key is in memory:
- * - If the key is not in IO_SAVEINPROG state we can access it.
- * As if it's just IO_SAVE this means we have the key in the IO queue
- * but can't be accessed by the IO thread (it requires to be
- * translated into an IO Job by the cache cron function.)
- * - If the key is in IO_SAVEINPROG we can't touch the key and have
- * to blocking wait completion of operations.
- * b) The key is not in memory:
- * - If it's marked as non existing on disk as well (negative cache)
- * we don't need to perform the disk access.
- * - if the key MAY EXIST, but is not in memory, and it is marked as IO_SAVE
- * then the key can only be a deleted one. As IO_SAVE keys are never
- * evicted (dirty state), so the only possibility is that key was deleted.
- * - if the key MAY EXIST we need to blocking load it.
- * We check that the key is not in IO_SAVEINPROG state before accessing
- * the disk object. If it is in this state, we wait.
- */
-
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
* a copy on write madness. */
- if (server.bgsavechildpid == -1 && server.bgrewritechildpid == -1)
+ if (server.rdb_child_pid == -1 && server.aof_child_pid == -1)
val->lru = server.lruclock;
- server.stat_keyspace_hits++;
return val;
} else {
- server.stat_keyspace_misses++;
return NULL;
}
}
robj *lookupKeyRead(redisDb *db, robj *key) {
+ robj *val;
+
expireIfNeeded(db,key);
- return lookupKey(db,key);
+ val = lookupKey(db,key);
+ if (val == NULL)
+ server.stat_keyspace_misses++;
+ else
+ server.stat_keyspace_hits++;
+ return val;
}
robj *lookupKeyWrite(redisDb *db, robj *key) {
}
incrRefCount(val);
removeExpire(db,key);
- touchWatchedKey(db,key);
+ signalModifiedKey(db,key);
}
int dbExists(redisDb *db, robj *key) {
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)) {
}
}
-/* Empty the whole database.
- * If diskstore is enabled this function will just flush the in-memory cache. */
long long emptyDb() {
int j;
long long removed = 0;
signalFlushedDb(-1);
server.dirty += emptyDb();
addReply(c,shared.ok);
- if (server.bgsavechildpid != -1) {
- kill(server.bgsavechildpid,SIGKILL);
- rdbRemoveTempFile(server.bgsavechildpid);
+ if (server.rdb_child_pid != -1) {
+ kill(server.rdb_child_pid,SIGKILL);
+ rdbRemoveTempFile(server.rdb_child_pid);
+ }
+ 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.rdb_filename);
+ server.dirty = saved_dirty;
}
- rdbSave(server.dbfilename);
server.dirty++;
}
}
void selectCommand(redisClient *c) {
- int id = atoi(c->argv[1]->ptr);
+ long id;
+
+ if (getLongFromObjectOrReply(c, c->argv[1], &id,
+ "invalid DB index") != REDIS_OK)
+ return;
if (server.cluster_enabled && id != 0) {
addReplyError(c,"SELECT is not allowed in cluster mode");
unsigned long numkeys = 0;
void *replylen = addDeferredMultiBulkLength(c);
- di = dictGetIterator(c->db->dict);
+ di = dictGetSafeIterator(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)) {
}
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) {
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 */
/* 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.
void propagateExpire(redisDb *db, robj *key) {
robj *argv[2];
- argv[0] = createStringObject("DEL",3);
+ argv[0] = shared.del;
argv[1] = key;
- incrRefCount(key);
+ incrRefCount(argv[0]);
+ incrRefCount(argv[1]);
- if (server.appendonly)
+ if (server.aof_state != REDIS_AOF_OFF)
feedAppendOnlyFile(server.delCommand,db->id,argv,2);
if (listLength(server.slaves))
replicationFeedSlaves(server.slaves,db->id,argv,2);
}
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 */
* that is, 0 if we think the key should be still valid, 1 if
* we think the key is expired at this time. */
if (server.masterhost != NULL) {
- return time(NULL) > when;
+ return mstime() > when;
}
/* Return when this key has not expired */
- if (time(NULL) <= when) return 0;
+ if (mstime() <= when) return 0;
/* Delete the key */
server.stat_expiredkeys++;
* Expires Commands
*----------------------------------------------------------------------------*/
-void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
+/* This is the generic command implementation for EXPIRE, PEXPIRE, EXPIREAT
+ * and PEXPIREAT. Because the commad second argument may be relative or absolute
+ * the "basetime" argument is used to signal what the base time is (either 0
+ * for *AT variants of the command, or the current time for relative expires).
+ *
+ * unit is either UNIT_SECONDS or UNIT_MILLISECONDS, and is only used for
+ * the argv[2] parameter. The basetime is always specified in milliesconds. */
+void expireGenericCommand(redisClient *c, long long basetime, int unit) {
dictEntry *de;
- long seconds;
+ robj *key = c->argv[1], *param = c->argv[2];
+ long long when; /* unix time in milliseconds when the key will expire. */
- if (getLongFromObjectOrReply(c, param, &seconds, NULL) != REDIS_OK) return;
+ if (getLongLongFromObjectOrReply(c, param, &when, NULL) != REDIS_OK)
+ return;
- seconds -= offset;
+ if (unit == UNIT_SECONDS) when *= 1000;
+ when += basetime;
de = dictFind(c->db->dict,key->ptr);
if (de == NULL) {
*
* 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 (when <= mstime() && !server.loading && !server.masterhost) {
robj *aux;
redisAssertWithInfo(c,key,dbDelete(c->db,key));
addReply(c, shared.cone);
return;
} else {
- time_t when = time(NULL)+seconds;
setExpire(c->db,key,when);
addReply(c,shared.cone);
signalModifiedKey(c->db,key);
}
void expireCommand(redisClient *c) {
- expireGenericCommand(c,c->argv[1],c->argv[2],0);
+ expireGenericCommand(c,mstime(),UNIT_SECONDS);
}
void expireatCommand(redisClient *c) {
- expireGenericCommand(c,c->argv[1],c->argv[2],time(NULL));
+ expireGenericCommand(c,0,UNIT_SECONDS);
}
-void ttlCommand(redisClient *c) {
- time_t expire, ttl = -1;
+void pexpireCommand(redisClient *c) {
+ expireGenericCommand(c,mstime(),UNIT_MILLISECONDS);
+}
+
+void pexpireatCommand(redisClient *c) {
+ expireGenericCommand(c,0,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) {
projects / redis.git / blobdiff