Update rdb.c to properly work with new memory strategy for sorted sets

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index 019aa9a00da0a0cf4c6b8031f61b38904b500fd0..a401a5b9dd2d5e59c525796c3be63fe22aeeb950 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -273,7 +273,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
             dictReleaseIterator(di);
         } else if (o->encoding == REDIS_ENCODING_INTSET) {
             intset *is = o->ptr;
             dictReleaseIterator(di);
         } else if (o->encoding == REDIS_ENCODING_INTSET) {
             intset *is = o->ptr;

-            long long llval;
+            int64_t llval;

             int i = 0;
 
             if (rdbSaveLen(fp,intsetLen(is)) == -1) return -1;
             int i = 0;
 
             if (rdbSaveLen(fp,intsetLen(is)) == -1) return -1;


@@ -457,6 +457,7 @@ int rdbSaveBackground(char *filename) {
 
     if (server.bgsavechildpid != -1) return REDIS_ERR;
     if (server.vm_enabled) waitEmptyIOJobsQueue();
 
     if (server.bgsavechildpid != -1) return REDIS_ERR;
     if (server.vm_enabled) waitEmptyIOJobsQueue();

+    server.dirty_before_bgsave = server.dirty;

     if ((childpid = fork()) == 0) {
         /* Child */
         if (server.vm_enabled) vmReopenSwapFile();
     if ((childpid = fork()) == 0) {
         /* Child */
         if (server.vm_enabled) vmReopenSwapFile();


@@ -702,7 +703,7 @@ robj *rdbLoadObject(int type, FILE *fp) {
 
             if (o->encoding == REDIS_ENCODING_INTSET) {
                 /* Fetch integer value from element */
 
             if (o->encoding == REDIS_ENCODING_INTSET) {
                 /* Fetch integer value from element */

-                if (getLongLongFromObject(ele,&llval) == REDIS_OK) {
+                if (isObjectRepresentableAsLongLong(ele,&llval) == REDIS_OK) {

                     o->ptr = intsetAdd(o->ptr,llval,NULL);
                 } else {
                     setTypeConvert(o,REDIS_ENCODING_HT);
                     o->ptr = intsetAdd(o->ptr,llval,NULL);
                 } else {
                     setTypeConvert(o,REDIS_ENCODING_HT);


@@ -714,6 +715,8 @@ robj *rdbLoadObject(int type, FILE *fp) {
              * to regular hashtable encoded set */
             if (o->encoding == REDIS_ENCODING_HT) {
                 dictAdd((dict*)o->ptr,ele,NULL);
              * to regular hashtable encoded set */
             if (o->encoding == REDIS_ENCODING_HT) {
                 dictAdd((dict*)o->ptr,ele,NULL);

+            } else {
+                decrRefCount(ele);

             }
         }
     } else if (type == REDIS_ZSET) {
             }
         }
     } else if (type == REDIS_ZSET) {


@@ -727,13 +730,14 @@ robj *rdbLoadObject(int type, FILE *fp) {
         /* Load every single element of the list/set */
         while(zsetlen--) {
             robj *ele;
         /* Load every single element of the list/set */
         while(zsetlen--) {
             robj *ele;

-            double *score = zmalloc(sizeof(double));
+            double score;
+            zskiplistNode *znode;

 
             if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
             ele = tryObjectEncoding(ele);
 
             if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
             ele = tryObjectEncoding(ele);

-            if (rdbLoadDoubleValue(fp,score) == -1) return NULL;
-            dictAdd(zs->dict,ele,score);
-            zslInsert(zs->zsl,*score,ele);
+            if (rdbLoadDoubleValue(fp,&score) == -1) return NULL;
+            znode = zslInsert(zs->zsl,score,ele);
+            dictAdd(zs->dict,ele,&znode->score);

             incrRefCount(ele); /* added to skiplist */
         }
     } else if (type == REDIS_HASH) {
             incrRefCount(ele); /* added to skiplist */
         }
     } else if (type == REDIS_HASH) {


@@ -911,7 +915,7 @@ void backgroundSaveDoneHandler(int statloc) {
     if (!bysignal && exitcode == 0) {
         redisLog(REDIS_NOTICE,
             "Background saving terminated with success");
     if (!bysignal && exitcode == 0) {
         redisLog(REDIS_NOTICE,
             "Background saving terminated with success");

-        server.dirty = 0;
+        server.dirty = server.dirty - server.dirty_before_bgsave;

         server.lastsave = time(NULL);
     } else if (!bysignal && exitcode != 0) {
         redisLog(REDIS_WARNING, "Background saving error");
         server.lastsave = time(NULL);
     } else if (!bysignal && exitcode != 0) {
         redisLog(REDIS_WARNING, "Background saving error");