while loading the rdb file don't add the key to the dictionary at all if it's already...

diff --git a/redis.c b/redis.c
index 4c68d69210fbcae7b55d9c0bdc5e760e8d5a3aff..b1035efc252183a33959ddb44ebeb342a90b074e 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -3999,6 +3999,12 @@ static int rdbLoad(char *filename) {
         if ((key = rdbLoadStringObject(fp)) == NULL) goto eoferr;
         /* Read value */
         if ((val = rdbLoadObject(type,fp)) == NULL) goto eoferr;
+        /* Check if the key already expired */
+        if (expiretime != -1 && expiretime < now) {
+            decrRefCount(key);
+            decrRefCount(val);
+            continue;
+        }
         /* Add the new object in the hash table */
         retval = dictAdd(d,key,val);
         if (retval == DICT_ERR) {
@@ -4007,14 +4013,7 @@ static int rdbLoad(char *filename) {
         }
         loadedkeys++;
         /* Set the expire time if needed */
-        if (expiretime != -1) {
-            setExpire(db,key,expiretime);
-            /* Delete this key if already expired */
-            if (expiretime < now) {
-                deleteKey(db,key);
-                continue; /* don't try to swap this out */
-            }
-        }
+        if (expiretime != -1) setExpire(db,key,expiretime);
 
         /* Handle swapping while loading big datasets when VM is on */