/* 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) {
int retval = dictAdd(db->dict, copy, val);
redisAssertWithInfo(NULL,key,retval == REDIS_OK);
- if (server.cluster_enabled) SlotToKeyAdd(key);
}
/* Overwrite an existing key with a new value. Incrementing the reference
}
incrRefCount(val);
removeExpire(db,key);
- touchWatchedKey(db,key);
+ signalModifiedKey(db,key);
}
int dbExists(redisDb *db, robj *key) {
* the key, because it is shared with the main dictionary. */
if (dictSize(db->expires) > 0) dictDelete(db->expires,key->ptr);
if (dictDelete(db->dict,key->ptr) == DICT_OK) {
- if (server.cluster_enabled) SlotToKeyDel(key);
return 1;
} else {
return 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.dbfilename);
+ rdbSave(server.rdb_filename);
server.dirty = saved_dirty;
}
server.dirty++;
void selectCommand(redisClient *c) {
int id = atoi(c->argv[1]->ptr);
- if (server.cluster_enabled && id != 0) {
- addReplyError(c,"SELECT is not allowed in cluster mode");
- return;
- }
if (selectDb(c,id) == REDIS_ERR) {
addReplyError(c,"invalid DB index");
} else {
}
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.");
}
redisDb *src, *dst;
int srcid;
- if (server.cluster_enabled) {
- addReplyError(c,"MOVE is not allowed in cluster mode");
- return;
- }
-
/* Obtain source and target DB pointers */
src = c->db;
srcid = c->db->id;
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);
return tolower(arg[0]) == 'm' && tolower(arg[1]) == 's' && arg[2] == '\0';
}
-void expireGenericCommand(redisClient *c, long long offset) {
+void expireGenericCommand(redisClient *c, long long offset, int unit) {
dictEntry *de;
robj *key = c->argv[1], *param = c->argv[2];
long long milliseconds;
- int time_in_seconds = 1;
if (getLongLongFromObjectOrReply(c, param, &milliseconds, NULL) != REDIS_OK)
return;
- /* If no "ms" argument was passed the time is in second, so we need
- * to multilpy it by 1000 */
- if (c->argc == 4) {
- if (!stringObjectEqualsMs(c->argv[3])) {
- addReply(c,shared.syntaxerr);
- return;
- }
- time_in_seconds = 0; /* "ms" argument passed. */
- }
- if (time_in_seconds) milliseconds *= 1000;
+ if (unit == UNIT_SECONDS) milliseconds *= 1000;
milliseconds -= offset;
de = dictFind(c->db->dict,key->ptr);
}
void expireCommand(redisClient *c) {
- if (c->argc > 4) {
- addReply(c,shared.syntaxerr);
- return;
- }
- expireGenericCommand(c,0);
+ expireGenericCommand(c,0,UNIT_SECONDS);
}
void expireatCommand(redisClient *c) {
- if (c->argc > 4) {
- addReply(c,shared.syntaxerr);
- return;
- }
- expireGenericCommand(c,mstime());
+ expireGenericCommand(c,mstime(),UNIT_SECONDS);
}
-void ttlCommand(redisClient *c) {
- long long expire, ttl = -1;
- int output_ms = 0;
+void pexpireCommand(redisClient *c) {
+ expireGenericCommand(c,0,UNIT_MILLISECONDS);
+}
- if (c->argc == 3) {
- if (stringObjectEqualsMs(c->argv[2])) {
- output_ms = 1;
- } else {
- addReply(c,shared.syntaxerr);
- return;
- }
- }
+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) {
}
}
+void ttlCommand(redisClient *c) {
+ ttlGenericCommand(c, 0);
+}
+
+void pttlCommand(redisClient *c) {
+ ttlGenericCommand(c, 1);
+}
+
void persistCommand(redisClient *c) {
dictEntry *de;
*numkeys = num;
return keys;
}
-
-/* Slot to Key API. This is used by Redis Cluster in order to obtain in
- * a fast way a key that belongs to a specified hash slot. This is useful
- * while rehashing the cluster. */
-void SlotToKeyAdd(robj *key) {
- unsigned int hashslot = keyHashSlot(key->ptr,sdslen(key->ptr));
-
- zslInsert(server.cluster.slots_to_keys,hashslot,key);
- incrRefCount(key);
-}
-
-void SlotToKeyDel(robj *key) {
- unsigned int hashslot = keyHashSlot(key->ptr,sdslen(key->ptr));
-
- zslDelete(server.cluster.slots_to_keys,hashslot,key);
-}
-
-unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count) {
- zskiplistNode *n;
- zrangespec range;
- int j = 0;
-
- range.min = range.max = hashslot;
- range.minex = range.maxex = 0;
-
- n = zslFirstInRange(server.cluster.slots_to_keys, range);
- while(n && n->score == hashslot && count--) {
- keys[j++] = n->obj;
- n = n->level[0].forward;
- }
- return j;
-}
projects / redis.git / blobdiff