Clean up Makefiles

[redis.git] / src / redis-check-dump.c

diff --git a/src/redis-check-dump.c b/src/redis-check-dump.c
index a7e859735de16679413e1e21396792d9c7f01865..42fe5181087a19be3ec0914fabc82dcaa0d38d49 100644 (file)
--- a/src/redis-check-dump.c
+++ b/src/redis-check-dump.c
@@ -16,6 +16,11 @@
 #define REDIS_SET 2
 #define REDIS_ZSET 3
 #define REDIS_HASH 4
 #define REDIS_SET 2
 #define REDIS_ZSET 3
 #define REDIS_HASH 4

+#define REDIS_HASH_ZIPMAP 9
+#define REDIS_LIST_ZIPLIST 10
+#define REDIS_SET_INTSET 11
+#define REDIS_ZSET_ZIPLIST 12
+#define REDIS_HASH_ZIPLIST 13

 
 /* Objects encoding. Some kind of objects like Strings and Hashes can be
  * internally represented in multiple ways. The 'encoding' field of the object
 
 /* Objects encoding. Some kind of objects like Strings and Hashes can be
  * internally represented in multiple ways. The 'encoding' field of the object


@@ -65,8 +70,8 @@
 /* data type to hold offset in file and size */
 typedef struct {
     void *data;
 /* data type to hold offset in file and size */
 typedef struct {
     void *data;

-    uint64_t size;
-    uint64_t offset;
+    size_t size;
+    size_t offset;

 } pos;
 
 static unsigned char level = 0;
 } pos;
 
 static unsigned char level = 0;


@@ -77,8 +82,8 @@ static pos positions[16];
 /* Hold a stack of errors */
 typedef struct {
     char error[16][1024];
 /* Hold a stack of errors */
 typedef struct {
     char error[16][1024];

-    uint64_t offset[16];
-    uint32_t level;
+    size_t offset[16];
+    size_t level;

 } errors_t;
 static errors_t errors;
 
 } errors_t;
 static errors_t errors;
 


@@ -112,7 +117,7 @@ int readBytes(void *target, long num) {
     if (p.offset + num > p.size) {
         return 0;
     } else {
     if (p.offset + num > p.size) {
         return 0;
     } else {

-        memcpy(target, (void*)((unsigned long)p.data + p.offset), num);
+        memcpy(target, (void*)((size_t)p.data + p.offset), num);

         if (!peek) positions[level].offset += num;
     }
     return 1;
         if (!peek) positions[level].offset += num;
     }
     return 1;


@@ -132,7 +137,7 @@ int processHeader() {
     }
 
     dump_version = (int)strtol(buf + 5, NULL, 10);
     }
 
     dump_version = (int)strtol(buf + 5, NULL, 10);

-    if (dump_version != 1) {
+    if (dump_version < 1 || dump_version > 4) {

         ERROR("Unknown RDB format version: %d\n", dump_version);
     }
     return 1;
         ERROR("Unknown RDB format version: %d\n", dump_version);
     }
     return 1;


@@ -144,7 +149,7 @@ int loadType(entry *e) {
     /* this byte needs to qualify as type */
     unsigned char t;
     if (readBytes(&t, 1)) {
     /* this byte needs to qualify as type */
     unsigned char t;
     if (readBytes(&t, 1)) {

-        if (t <= 4 || t >= 253) {
+        if (t <= 4 || (t >=9 && t <= 12) || t >= 253) {

             e->type = t;
             return 1;
         } else {
             e->type = t;
             return 1;
         } else {


@@ -160,7 +165,8 @@ int loadType(entry *e) {
 
 int peekType() {
     unsigned char t;
 
 int peekType() {
     unsigned char t;

-    if (readBytes(&t, -1) && (t <= 4 || t >= 253)) return t;
+    if (readBytes(&t, -1) && (t <= 4 || (t >=9 && t <= 12) || t >= 253))
+        return t;

     return -1;
 }
 
     return -1;
 }
 


@@ -375,6 +381,11 @@ int loadPair(entry *e) {
 
     switch(e->type) {
     case REDIS_STRING:
 
     switch(e->type) {
     case REDIS_STRING:

+    case REDIS_HASH_ZIPMAP:
+    case REDIS_LIST_ZIPLIST:
+    case REDIS_SET_INTSET:
+    case REDIS_ZSET_ZIPLIST:
+    case REDIS_HASH_ZIPLIST:

         if (!processStringObject(NULL)) {
             SHIFT_ERROR(offset, "Error reading entry value");
             return 0;
         if (!processStringObject(NULL)) {
             SHIFT_ERROR(offset, "Error reading entry value");
             return 0;


@@ -496,13 +507,15 @@ void printCentered(int indent, int width, char* body) {
 
 void printValid(uint64_t ops, uint64_t bytes) {
     char body[80];
 
 void printValid(uint64_t ops, uint64_t bytes) {
     char body[80];

-    sprintf(body, "Processed %llu valid opcodes (in %llu bytes)", ops, bytes);
+    sprintf(body, "Processed %llu valid opcodes (in %llu bytes)",
+        (unsigned long long) ops, (unsigned long long) bytes);

     printCentered(4, 80, body);
 }
 
 void printSkipped(uint64_t bytes, uint64_t offset) {
     char body[80];
     printCentered(4, 80, body);
 }
 
 void printSkipped(uint64_t bytes, uint64_t offset) {
     char body[80];

-    sprintf(body, "Skipped %llu bytes (resuming at 0x%08llx)", bytes, offset);
+    sprintf(body, "Skipped %llu bytes (resuming at 0x%08llx)",
+        (unsigned long long) bytes, (unsigned long long) offset);

     printCentered(4, 80, body);
 }
 
     printCentered(4, 80, body);
 }
 


@@ -536,7 +549,8 @@ void printErrorStack(entry *e) {
 
     /* display error stack */
     for (i = 0; i < errors.level; i++) {
 
     /* display error stack */
     for (i = 0; i < errors.level; i++) {

-        printf("0x%08llx - %s\n", errors.offset[i], errors.error[i]);
+        printf("0x%08lx - %s\n",
+            (unsigned long) errors.offset[i], errors.error[i]);

     }
 }
 
     }
 }
 


@@ -588,6 +602,7 @@ void process() {
             /* advance position */
             positions[0] = positions[1];
         }
             /* advance position */
             positions[0] = positions[1];
         }

+        free(entry.key);

     }
 
     /* because there is another potential error,
     }
 
     /* because there is another potential error,


@@ -610,7 +625,8 @@ void process() {
     /* print summary on errors */
     if (num_errors) {
         printf("\n");
     /* print summary on errors */
     if (num_errors) {
         printf("\n");

-        printf("Total unprocessable opcodes: %llu\n", num_errors);
+        printf("Total unprocessable opcodes: %llu\n",
+            (unsigned long long) num_errors);

     }
 }
 
     }
 }
 


@@ -622,7 +638,7 @@ int main(int argc, char **argv) {
     }
 
     int fd;
     }
 
     int fd;

-    size_t size;
+    off_t size;

     struct stat stat;
     void *data;
 
     struct stat stat;
     void *data;
 


@@ -636,6 +652,10 @@ int main(int argc, char **argv) {
         size = stat.st_size;
     }
 
         size = stat.st_size;
     }
 

+    if (sizeof(size_t) == sizeof(int32_t) && size >= INT_MAX) {
+        ERROR("Cannot check dump files >2GB on a 32-bit platform\n");
+    }
+

     data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
     if (data == MAP_FAILED) {
         ERROR("Cannot mmap: %s\n", argv[1]);
     data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
     if (data == MAP_FAILED) {
         ERROR("Cannot mmap: %s\n", argv[1]);