Delete keys from the archive when deleting from DB.

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index eb4418e772735b7b931ad0f0b6910fe38b2ac908..00eaab2a0759b47ca190ae21b48162dfb4a33808 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -49,6 +49,7 @@
 #include <math.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #include <math.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>

+#include <lmdb.h>

 
 /* Our shared "common" objects */
 
 
 /* Our shared "common" objects */
 


@@ -1119,6 +1120,9 @@ void initServerConfig() {
     server.pidfile = zstrdup("/var/run/redis.pid");
     server.rdb_filename = zstrdup("dump.rdb");
     server.aof_filename = zstrdup("appendonly.aof");
     server.pidfile = zstrdup("/var/run/redis.pid");
     server.rdb_filename = zstrdup("dump.rdb");
     server.aof_filename = zstrdup("appendonly.aof");

+    server.mdb_state = REDIS_MDB_OFF;
+    server.mdb_environment = zstrdup("archive");
+    server.mdb_mapsize = 10485760;

     server.requirepass = NULL;
     server.rdb_compression = 1;
     server.rdb_checksum = 1;
     server.requirepass = NULL;
     server.rdb_compression = 1;
     server.rdb_checksum = 1;


@@ -1344,6 +1348,15 @@ void initServer() {
         }
     }
 
         }
     }
 

+    if (server.mdb_state == REDIS_MDB_ON) {
+        int retval = startKeyArchive();
+        if (retval != 0) {
+            redisLog(REDIS_WARNING, "Can't open the key-archive environment: %s",
+                mdb_strerror(retval));
+            exit(1);
+        }
+    }
+

     /* 32 bit instances are limited to 4GB of address space, so if there is
      * no explicit limit in the user provided configuration we set a limit
      * at 3 GB using maxmemory with 'noeviction' policy'. This avoids
     /* 32 bit instances are limited to 4GB of address space, so if there is
      * no explicit limit in the user provided configuration we set a limit
      * at 3 GB using maxmemory with 'noeviction' policy'. This avoids


@@ -2337,6 +2350,8 @@ int freeMemoryIfNeeded(void) {
                 long long delta;
 
                 robj *keyobj = createStringObject(bestkey,sdslen(bestkey));
                 long long delta;
 
                 robj *keyobj = createStringObject(bestkey,sdslen(bestkey));

+                int archived = archive(db, keyobj);
+                redisAssert(archived != 0);

                 propagateExpire(db,keyobj);
                 /* We compute the amount of memory freed by dbDelete() alone.
                  * It is possible that actually the memory needed to propagate
                 propagateExpire(db,keyobj);
                 /* We compute the amount of memory freed by dbDelete() alone.
                  * It is possible that actually the memory needed to propagate


@@ -2347,7 +2362,7 @@ int freeMemoryIfNeeded(void) {
                  * AOF and Output buffer memory will be freed eventually so
                  * we only care about memory used by the key space. */
                 delta = (long long) zmalloc_used_memory();
                  * AOF and Output buffer memory will be freed eventually so
                  * we only care about memory used by the key space. */
                 delta = (long long) zmalloc_used_memory();

-                dbDelete(db,keyobj);
+                dbDeleteSoft(db,keyobj);

                 delta -= (long long) zmalloc_used_memory();
                 mem_freed += delta;
                 server.stat_evictedkeys++;
                 delta -= (long long) zmalloc_used_memory();
                 mem_freed += delta;
                 server.stat_evictedkeys++;