Merge pull request #4 from justonia/fix-expiry

Fix issue #3 where key expiry is incorrectly propagated to keys without expiry
tent · Dec 7, 2015 · f5614b4 · f5614b4
2 parents 3454dca + 0c276fd
commit f5614b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/decoder.go b/decoder.go
@@ -188,6 +188,7 @@ func (d *decode) decode() error {
 			if err != nil {
 				return err
 			}
+			expiry = 0
 		}
 	}
 

diff --git a/decoder_test.go b/decoder_test.go
@@ -38,6 +38,15 @@ func (s *DecoderSuite) TestExpiry(c *C) {
 	c.Assert(r.expiries[0]["expires_ms_precision"], Equals, int64(1671963072573))
 }
 
+func (s *DecoderSuite) TestMixedExpiry(c *C) {
+	r := decodeRDB("keys_with_mixed_expiry")
+	c.Assert(r.expiries[0]["key01"], Not(Equals), int64(0))
+	c.Assert(r.expiries[0]["key04"], Not(Equals), int64(0))
+
+	c.Assert(r.expiries[0]["key02"], Equals, int64(0))
+	c.Assert(r.expiries[0]["key03"], Equals, int64(0))
+}
+
 func (s *DecoderSuite) TestIntegerKeys(c *C) {
 	r := decodeRDB("integer_keys")
 	c.Assert(r.dbs[0]["125"], Equals, "Positive 8 bit integer")

diff --git a/fixtures/keys_with_mixed_expiry.rdb b/fixtures/keys_with_mixed_expiry.rdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,6 +188,7 @@ func (d *decode) decode() error { @@
     			if err != nil {
     				return err
     			}
+    			expiry = 0
     		}
     	}
@@ Expand Down @@