Another fix for MIGRATE.

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index 113856d43207d58a2bc52ef7937e175e03c4303c..481efe9de8be2fd6ad73762d66dbd9e2f0c69abc 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -602,6 +602,7 @@ int rdbSave(char *filename) {
     dictIterator *di = NULL;
     dictEntry *de;
     char tmpfile[256];
     dictIterator *di = NULL;
     dictEntry *de;
     char tmpfile[256];

+    char magic[10];

     int j;
     long long now = mstime();
     FILE *fp;
     int j;
     long long now = mstime();
     FILE *fp;


@@ -616,7 +617,8 @@ int rdbSave(char *filename) {
     }
 
     rioInitWithFile(&rdb,fp);
     }
 
     rioInitWithFile(&rdb,fp);

-    if (rdbWriteRaw(&rdb,"REDIS0003",9) == -1) goto werr;
+    snprintf(magic,sizeof(magic),"REDIS%04d",REDIS_RDB_VERSION);
+    if (rdbWriteRaw(&rdb,magic,9) == -1) goto werr;

 
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;
 
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;


@@ -844,9 +846,10 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
             hashTypeConvert(o, REDIS_ENCODING_HT);
 
         /* Load every field and value into the ziplist */
             hashTypeConvert(o, REDIS_ENCODING_HT);
 
         /* Load every field and value into the ziplist */

-        while (o->encoding == REDIS_ENCODING_ZIPLIST && len-- > 0) {
+        while (o->encoding == REDIS_ENCODING_ZIPLIST && len > 0) {

             robj *field, *value;
 
             robj *field, *value;
 

+            len--;

             /* Load raw strings */
             field = rdbLoadStringObject(rdb);
             if (field == NULL) return NULL;
             /* Load raw strings */
             field = rdbLoadStringObject(rdb);
             if (field == NULL) return NULL;


@@ -855,23 +858,27 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
             if (value == NULL) return NULL;
             redisAssert(field->encoding == REDIS_ENCODING_RAW);
 
             if (value == NULL) return NULL;
             redisAssert(field->encoding == REDIS_ENCODING_RAW);
 

+            /* Add pair to ziplist */
+            o->ptr = ziplistPush(o->ptr, field->ptr, sdslen(field->ptr), ZIPLIST_TAIL);
+            o->ptr = ziplistPush(o->ptr, value->ptr, sdslen(value->ptr), ZIPLIST_TAIL);

             /* Convert to hash table if size threshold is exceeded */
             if (sdslen(field->ptr) > server.hash_max_ziplist_value ||
                 sdslen(value->ptr) > server.hash_max_ziplist_value)
             {
             /* Convert to hash table if size threshold is exceeded */
             if (sdslen(field->ptr) > server.hash_max_ziplist_value ||
                 sdslen(value->ptr) > server.hash_max_ziplist_value)
             {

+                decrRefCount(field);
+                decrRefCount(value);

                 hashTypeConvert(o, REDIS_ENCODING_HT);
                 break;
             }
                 hashTypeConvert(o, REDIS_ENCODING_HT);
                 break;
             }

-
-            /* Add pair to ziplist */
-            o->ptr = ziplistPush(o->ptr, field->ptr, sdslen(field->ptr), ZIPLIST_TAIL);
-            o->ptr = ziplistPush(o->ptr, value->ptr, sdslen(value->ptr), ZIPLIST_TAIL);
+            decrRefCount(field);
+            decrRefCount(value);

         }
 
         /* Load remaining fields and values into the hash table */
         }
 
         /* Load remaining fields and values into the hash table */

-        while (o->encoding == REDIS_ENCODING_HT && len-- > 0) {
+        while (o->encoding == REDIS_ENCODING_HT && len > 0) {

             robj *field, *value;
 
             robj *field, *value;
 

+            len--;

             /* Load encoded strings */
             field = rdbLoadEncodedStringObject(rdb);
             if (field == NULL) return NULL;
             /* Load encoded strings */
             field = rdbLoadEncodedStringObject(rdb);
             if (field == NULL) return NULL;


@@ -1023,7 +1030,7 @@ int rdbLoad(char *filename) {
         return REDIS_ERR;
     }
     rdbver = atoi(buf+5);
         return REDIS_ERR;
     }
     rdbver = atoi(buf+5);

-    if (rdbver < 1 || rdbver > 3) {
+    if (rdbver < 1 || rdbver > 4) {

         fclose(fp);
         redisLog(REDIS_WARNING,"Can't handle RDB format version %d",rdbver);
         errno = EINVAL;
         fclose(fp);
         redisLog(REDIS_WARNING,"Can't handle RDB format version %d",rdbver);
         errno = EINVAL;