master-slave replication fixed, it was not listing any key using KEYS command in...

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index 6276c992b27be23db0b15801fc96fdfbd674729a..669fba13e8e7d7f6b12494920ef965ec735f372a 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -201,7 +201,8 @@ int dbDelete(redisDb *db, robj *key) {
     return dictDelete(db->dict,key->ptr) == DICT_OK;
 }
 
     return dictDelete(db->dict,key->ptr) == DICT_OK;
 }
 

-/* Empty the whole database */
+/* 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;
 long long emptyDb() {
     int j;
     long long removed = 0;


@@ -210,6 +211,7 @@ long long emptyDb() {
         removed += dictSize(server.db[j].dict);
         dictEmpty(server.db[j].dict);
         dictEmpty(server.db[j].expires);
         removed += dictSize(server.db[j].dict);
         dictEmpty(server.db[j].dict);
         dictEmpty(server.db[j].expires);

+        if (server.ds_enabled) dictEmpty(server.db[j].io_negcache);

     }
     return removed;
 }
     }
     return removed;
 }


@@ -525,6 +527,8 @@ void propagateExpire(redisDb *db, robj *key) {
 int expireIfNeeded(redisDb *db, robj *key) {
     time_t when = getExpire(db,key);
 
 int expireIfNeeded(redisDb *db, robj *key) {
     time_t when = getExpire(db,key);
 

+    if (when < 0) return 0; /* No expire for this key */
+

     /* If we are running in the context of a slave, return ASAP:
      * the slave key expiration is controlled by the master that will
      * send us synthesized DEL operations for expired keys.
     /* If we are running in the context of a slave, return ASAP:
      * the slave key expiration is controlled by the master that will
      * send us synthesized DEL operations for expired keys.


@@ -536,8 +540,6 @@ int expireIfNeeded(redisDb *db, robj *key) {
         return time(NULL) > when;
     }
 
         return time(NULL) > when;
     }
 

-    if (when < 0) return 0;
-

     /* Return when this key has not expired */
     if (time(NULL) <= when) return 0;
 
     /* Return when this key has not expired */
     if (time(NULL) <= when) return 0;