fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-13 01:01:22 +00:00
Code Issues Projects Releases Wiki Activity

BGREWRITEAOF now works with swapping on

Browse Source
This commit is contained in:
antirez
2010-01-05 19:15:15 -05:00
parent 1b03836c0e
commit e7546c6393
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
redis.c
View File

@ -6527,9 +6527,20 @@ static int rewriteAppendOnlyFile(char *filename) {
/* Iterate this DB writing every entry */
while((de = dictNext(di)) != NULL) {
robj *key = dictGetEntryKey(de);
robj *o = dictGetEntryVal(de);
time_t expiretime = getExpire(db,key);
robj *key, *o;
time_t expiretime;
int swapped;
key = dictGetEntryKey(de);
if (key->storage == REDIS_VM_MEMORY) {
o = dictGetEntryVal(de);
swapped = 0;
} else {
o = vmPreviewObject(key);
key = dupStringObject(key);
swapped = 1;
}
expiretime = getExpire(db,key);
/* Save the key and associated value */
if (o->type == REDIS_STRING) {
@ -6597,6 +6608,12 @@ static int rewriteAppendOnlyFile(char *filename) {
if (fwriteBulk(fp,key) == 0) goto werr;
if (fwriteBulkLong(fp,expiretime) == 0) goto werr;
}
/* We created a few temp objects if the key->value pair
* was about a swapped out object. Free both. */
if (swapped) {
decrRefCount(key);
decrRefCount(o);
}
}
dictReleaseIterator(di);
}