opensourcemirror
/
redis
mirror of https://github.com/antirez/redis.git
1
0
Fork 0
Code Issues Releases Wiki Activity

while loading the rdb file don't add the key to the dictionary at all if it's already expired, instead of removing it just after the insertion.

This commit is contained in:
antirez 2010-05-10 15:26:01 +02:00
parent 45ae650129
commit 89e689c592
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
redis.c
View File

@ -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 */