Two important fixes to append only file: zero length values and expires. A pretty...

diff --git a/redis.c b/redis.c
index d3339f875aa78f4a615009ca0080047bc6a2971f..b200b76264e7cfee1e574f90f2893cf315e9ee9a 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -5868,7 +5868,8 @@ static int fwriteBulk(FILE *fp, robj *obj) {
     obj = getDecodedObject(obj);
     snprintf(buf,sizeof(buf),"$%ld\r\n",(long)sdslen(obj->ptr));
     if (fwrite(buf,strlen(buf),1,fp) == 0) goto err;
     obj = getDecodedObject(obj);
     snprintf(buf,sizeof(buf),"$%ld\r\n",(long)sdslen(obj->ptr));
     if (fwrite(buf,strlen(buf),1,fp) == 0) goto err;

-    if (fwrite(obj->ptr,sdslen(obj->ptr),1,fp) == 0) goto err;
+    if (sdslen(obj->ptr) && fwrite(obj->ptr,sdslen(obj->ptr),1,fp) == 0)
+        goto err;

     if (fwrite("\r\n",2,1,fp) == 0) goto err;
     decrRefCount(obj);
     return 1;
     if (fwrite("\r\n",2,1,fp) == 0) goto err;
     decrRefCount(obj);
     return 1;


@@ -5997,7 +5998,7 @@ static int rewriteAppendOnlyFile(char *filename) {
             }
             /* Save the expire time */
             if (expiretime != -1) {
             }
             /* Save the expire time */
             if (expiretime != -1) {

-                char cmd[]="*3\r\n$6\r\nEXPIRE\r\n";
+                char cmd[]="*3\r\n$8\r\nEXPIREAT\r\n";

                 /* If this key is already expired skip it */
                 if (expiretime < now) continue;
                 if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
                 /* If this key is already expired skip it */
                 if (expiretime < now) continue;
                 if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;


@@ -6026,7 +6027,7 @@ static int rewriteAppendOnlyFile(char *filename) {
 werr:
     fclose(fp);
     unlink(tmpfile);
 werr:
     fclose(fp);
     unlink(tmpfile);

-    redisLog(REDIS_WARNING,"Write error writing append only fileon disk: %s", strerror(errno));
+    redisLog(REDIS_WARNING,"Write error writing append only file on disk: %s", strerror(errno));

     if (di) dictReleaseIterator(di);
     return REDIS_ERR;
 }
     if (di) dictReleaseIterator(di);
     return REDIS_ERR;
 }

diff --git a/test-redis.tcl b/test-redis.tcl
index e679b7fa142b85c45e282334601e3f9a4f978d89..034363095b5588fe1a5eaf70533a213cc8984fcd 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -65,6 +65,19 @@ proc waitForBgsave r {
     }
 }
 
     }
 }
 

+proc waitForBgrewriteaof r {
+    while 1 {
+        set i [$r info]
+        if {[string match {*bgrewriteaof_in_progress:1*} $i]} {
+            puts -nonewline "\nWaiting for background AOF rewrite to finish... "
+            flush stdout
+            after 1000
+        } else {
+            break
+        }
+    }
+}
+

 proc randomInt {max} {
     expr {int(rand()*$max)}
 }
 proc randomInt {max} {
     expr {int(rand()*$max)}
 }


@@ -154,17 +167,36 @@ proc createComplexDataset {r ops} {
 
 proc datasetDigest r {
     set keys [lsort [split [$r keys *] " "]]
 
 proc datasetDigest r {
     set keys [lsort [split [$r keys *] " "]]

-    set digest [::sha1::sha1 -hex $keys]
+    set digest {}

     foreach k $keys {
         set t [$r type $k]
     foreach k $keys {
         set t [$r type $k]

-        switch t {
-            {string} {set aux [::sha1::sha1 -hex [$r get $k]]} \
-            {list} {set aux [::sha1::sha1 -hex [$r lrange $k 0 -1]]} \
-            {set} {set aux [::sha1::sha1 -hex [$r smembers $k]]} \
-            {zset} {set aux [::sha1::sha1 -hex [$r zrange $k 0 -1]]}
+        switch $t {
+            {string} {
+                set aux [::sha1::sha1 -hex [$r get $k]]
+            } {list} {
+                if {[$r llen $k] == 0} {
+                    set aux {}
+                } else {
+                    set aux [::sha1::sha1 -hex [$r lrange $k 0 -1]]
+                }
+            } {set} {
+                if {[$r scard $k] == 0} {
+                    set aux {}
+                } else {
+                    set aux [::sha1::sha1 -hex [lsort [$r smembers $k]]]
+                }
+            } {zset} {
+                if {[$r zcard $k] == 0} {
+                    set aux {}
+                } else {
+                    set aux [::sha1::sha1 -hex [$r zrange $k 0 -1]]
+                }
+            } default {
+                error "Type not supported"
+            }

         }
         }

-        append aux $digest
-        set digest [::sha1::sha1 -hex $aux]
+        if {$aux eq {}} continue
+        set digest [::sha1::sha1 -hex [join [list $aux $digest $k] "\n"]]

     }
     return $digest
 }
     }
     return $digest
 }


@@ -1392,17 +1424,30 @@ proc main {server port} {
             set sha1_after [datasetDigest $r]
             expr {$sha1 eq $sha1_after}
         } {1}
             set sha1_after [datasetDigest $r]
             expr {$sha1 eq $sha1_after}
         } {1}

+
+        test {Same dataset digest if saving/reloading as AOF?} {
+            $r bgrewriteaof
+            waitForBgrewriteaof $r
+            $r debug loadaof
+            set sha1_after [datasetDigest $r]
+            expr {$sha1 eq $sha1_after}
+        } {1}

     }
 
     }
 

-    test {EXPIRES after a reload} {
+    test {EXPIRES after a reload (snapshot + append only file)} {

         $r flushdb
         $r set x 10
         $r expire x 1000
         $r save
         $r debug reload
         set ttl [$r ttl x]
         $r flushdb
         $r set x 10
         $r expire x 1000
         $r save
         $r debug reload
         set ttl [$r ttl x]

-        expr {$ttl > 900 && $ttl <= 1000}
-    } {1}
+        set e1 [expr {$ttl > 900 && $ttl <= 1000}]
+        $r bgrewriteaof
+        waitForBgrewriteaof $r
+        set ttl [$r ttl x]
+        set e2 [expr {$ttl > 900 && $ttl <= 1000}]
+        list $e1 $e2
+    } {1 1}

 
     # Leave the user with a clean DB before to exit
     test {FLUSHDB} {
 
     # Leave the user with a clean DB before to exit
     test {FLUSHDB} {

diff --git a/utils/redis-sha1.rb b/utils/redis-sha1.rb
index a50f5610aa7bc7784261be767bc8076224862c59..24498e25a545ac6784191a8baf68f0ec4e012915 100644 (file)
--- a/utils/redis-sha1.rb
+++ b/utils/redis-sha1.rb
@@ -47,5 +47,6 @@ end
 
 host = ARGV[0] || "127.0.0.1"
 port = ARGV[1] || "6379"
 
 host = ARGV[0] || "127.0.0.1"
 port = ARGV[1] || "6379"

-puts "Performing SHA1 of Redis server #{host} #{port}"
-p "Dataset SHA1: #{redisSha1(:host => host, :port => port.to_i)}"
+db = ARGV[2] || "0"
+puts "Performing SHA1 of Redis server #{host} #{port} DB: #{db}"
+p "Dataset SHA1: #{redisSha1(:host => host, :port => port.to_i, :db => db)}"