Query the archive to provide a complete KEYS list.

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index 61e5769968e7445c7d86485b870192c0e73ea909..da22cc9806db11bf44a86e791d19e933c6e4dd02 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -162,7 +162,7 @@ robj *dbRandomKey(redisDb *db) {
 }
 
 /* Delete a key, value, and associated expiration entry if any, from the DB */
-int dbDelete(redisDb *db, robj *key) {
+int dbDeleteSoft(redisDb *db, robj *key) {
     /* Deleting an entry from the expires dict will not free the sds of
      * the key, because it is shared with the main dictionary. */
     if (dictSize(db->expires) > 0) dictDelete(db->expires,key->ptr);
@@ -173,6 +173,12 @@ int dbDelete(redisDb *db, robj *key) {
     }
 }
 
+/* Delete a key, value, and associated expiration entry if any, even archived */
+int dbDelete(redisDb *db, robj *key) {
+    purge(key);
+    return dbDeleteSoft(db, key);
+}
+
 long long emptyDb() {
     int j;
     long long removed = 0;
@@ -311,6 +317,9 @@ void keysCommand(redisClient *c) {
         }
     }
     dictReleaseIterator(di);
+
+    rummage(c, &numkeys);
+
     setDeferredMultiBulkLength(c,replylen,numkeys);
 }