Merge pull request #178 from johnpena/set-keepttl

Implement KEEPTTL option on SET

Author: alicebob

cmd_string.go

@@ -55,6 +55,7 @@ func (m *Miniredis) cmdSet(c *server.Peer, cmd string, args []string) {
 	var (
 		nx  = false // set iff not exists
 		xx  = false // set iff exists
+		keepttl = false // set keepttl
 		ttl time.Duration
 	)
 
@@ -70,6 +71,10 @@ func (m *Miniredis) cmdSet(c *server.Peer, cmd string, args []string) {
 			xx = true
 			args = args[1:]
 			continue
+		case "KEEPTTL":
+			keepttl = true
+			args = args[1:]
+			continue
 		case "PX":
 			timeUnit = time.Millisecond
 			fallthrough
@@ -116,6 +121,11 @@ func (m *Miniredis) cmdSet(c *server.Peer, cmd string, args []string) {
 				return
 			}
 		}
+		if keepttl {
+			if val, ok := db.ttl[key]; ok {
+				ttl = val
+			}
+		}
 
 		db.del(key, true) // be sure to remove existing values of other type keys.
 		// a vanilla SET clears the expire

cmd_string_test.go

@@ -156,6 +156,17 @@ func TestSet(t *testing.T) {
 		)
 	}
 
+	// KEEPTTL argument
+	{
+		s.Set("foo", "bar")
+		s.SetTTL("foo", time.Second*1337)
+		mustOK(t, c,
+			"SET", "foo", "baz", "KEEPTTL",
+		)
+		s.CheckGet(t, "foo", "baz")
+		equals(t, time.Second*1337, s.TTL("foo"))
+	}
+
 	// Invalid argument
 	mustDo(t, c,
 		"SET", "one", "two", "FOO",

integration/string_test.go

@@ -16,6 +16,7 @@ func TestString(t *testing.T) {
 		c.Do("SET", "foo", "bar", "EX", "100")
 		c.Do("SET", "foo", "bar", "EX", "noint")
 		c.Do("SET", "utf8", "❆❅❄☃")
+		c.Do("SET", "foo", "baz", "KEEPTTL")
 
 		// Failure cases
 		c.Do("SET")