From: antirez <antirez@gmail.com>
Date: Tue, 10 May 2011 09:31:37 +0000 (+0200)
Subject: RDB version signature bumped to 2, now that direct saving of specially encoded types... 
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/6b52ad87c05ca2162a2d21f1f5b5329bf52a7678?ds=inline

RDB version signature bumped to 2, now that direct saving of specially encoded types is implemented 2.2 instances are no longer able to read rdb files produced by 2.4 or unstable.
---

diff --git a/src/rdb.c b/src/rdb.c
index 2557f5b8..eeafc053 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -425,7 +425,7 @@ int rdbSave(char *filename) {
             strerror(errno));
         return REDIS_ERR;
     }
-    if (fwrite("REDIS0001",9,1,fp) == 0) goto werr;
+    if (fwrite("REDIS0002",9,1,fp) == 0) goto werr;
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;
         dict *d = db->dict;
@@ -931,7 +931,7 @@ int rdbLoad(char *filename) {
         return REDIS_ERR;
     }
     rdbver = atoi(buf+5);
-    if (rdbver != 1) {
+    if (rdbver < 1 || rdbver > 2) {
         fclose(fp);
         redisLog(REDIS_WARNING,"Can't handle RDB format version %d",rdbver);
         return REDIS_ERR;