X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/52d46855d90bfddb3e03d957c48101d123e4dfe7..e394114d95395fe9babb0a658de263a0811ec330:/src/db.c

diff --git a/src/db.c b/src/db.c
index 755e295e..616b1fa1 100644
--- a/src/db.c
+++ b/src/db.c
@@ -328,8 +328,22 @@ 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.");
 }
 
@@ -473,7 +487,7 @@ void propagateExpire(redisDb *db, robj *key) {
     argv[1] = key;
     incrRefCount(key);
 
-    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);
@@ -522,25 +536,15 @@ int stringObjectEqualsMs(robj *a) {
     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);
@@ -578,33 +582,23 @@ void expireGenericCommand(redisClient *c, long long offset) {
 }
 
 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) {
@@ -618,6 +612,14 @@ void ttlCommand(redisClient *c) {
     }
 }
 
+void ttlCommand(redisClient *c) {
+    ttlGenericCommand(c, 0);
+}
+
+void pttlCommand(redisClient *c) {
+    ttlGenericCommand(c, 1);
+}
+
 void persistCommand(redisClient *c) {
     dictEntry *de;