Merge pull request #435 from evan-choi/fix/xadd-equals-trim-modifier

fix: accept = trim modifier in xadd

Author: alicebob

cmd_stream.go

@@ -49,8 +49,8 @@ func (m *Miniredis) cmdXadd(c *server.Peer, cmd string, args []string) {
 		}
 		if strings.ToLower(args[0]) == "maxlen" {
 			args = args[1:]
-			// we don't treat "~" special
-			if args[0] == "~" {
+			// ignore exact/approximate trimming modifiers
+			if args[0] == "~" || args[0] == "=" {
 				args = args[1:]
 			}
 			n, err := strconv.Atoi(args[0])
@@ -66,8 +66,8 @@ func (m *Miniredis) cmdXadd(c *server.Peer, cmd string, args []string) {
 			args = args[1:]
 		} else if strings.ToLower(args[0]) == "minid" {
 			args = args[1:]
-			// we don't treat "~" special
-			if args[0] == "~" {
+			// ignore exact/approximate trimming modifiers
+			if args[0] == "~" || args[0] == "=" {
 				args = args[1:]
 			}
 			minID = args[0]

cmd_stream_test.go

@@ -150,6 +150,15 @@ func TestStreamAdd(t *testing.T) {
 		}
 		nowz, _ := s.Stream("nowz")
 		equals(t, 10, len(nowz))
+
+		for i := 0; i < 100; i++ {
+			_, err := c.Do("XADD", "nowexact", "MAXLEN", "=", "10", "*", "one", "1")
+			ok(t, err)
+			nowexact, _ := s.Stream("nowexact")
+			assert(t, len(nowexact) <= 10, "deleted entries")
+		}
+		nowexact, _ := s.Stream("nowexact")
+		equals(t, 10, len(nowexact))
 	})
 
 	t.Run("XADD MINID", func(t *testing.T) {
@@ -193,6 +202,20 @@ func TestStreamAdd(t *testing.T) {
 				proto.Array(proto.String("1672545848004-0"), proto.Strings("five", "5")),
 			),
 		)
+
+		now = now.Add(time.Second)
+		s.SetTime(now)
+		minID = strconv.FormatInt(now.Add(-time.Second).UnixNano()/time.Millisecond.Nanoseconds(), 10)
+		_, err = c.Do("XADD", "mid", "MINID", "=", minID, "*", "six", "6")
+		ok(t, err)
+
+		mustDo(t, c,
+			"XRANGE", "mid", "-", "+",
+			proto.Array(
+				proto.Array(proto.String("1672545848004-0"), proto.Strings("five", "5")),
+				proto.Array(proto.String("1672545849004-0"), proto.Strings("six", "6")),
+			),
+		)
 	})
 
 	t.Run("XADD NOMKSTREAM", func(t *testing.T) {

integration/stream_test.go

@@ -79,6 +79,8 @@ func TestStream(t *testing.T) {
 			c.Do("XADD", "planets", "MAXLEN", "4", "456-6", "name", "Mercury")
 			c.Do("XLEN", "planets")
 			c.Do("XADD", "planets", "MAXLEN", "~", "4", "456-7", "name", "Mercury")
+			c.Do("XADD", "planets", "MAXLEN", "=", "4", "456-8", "name", "Mercury")
+			c.Do("XRANGE", "planets", "-", "+")
 
 			c.Error("not an integer", "XADD", "planets", "MAXLEN", "!", "4", "*", "name", "Mercury")
 			c.Error("not an integer", "XADD", "planets", "MAXLEN", " ~", "4", "*", "name", "Mercury")
@@ -89,7 +91,7 @@ func TestStream(t *testing.T) {
 			c.Error("wrong number", "XADD", "planets", "MAXLEN", "~")
 			c.Error("wrong number", "XADD", "planets", "MAXLEN")
 
-			c.Do("XADD", "planets", "MAXLEN", "0", "456-8", "name", "Mercury")
+			c.Do("XADD", "planets", "MAXLEN", "0", "456-9", "name", "Mercury")
 			c.Do("XLEN", "planets")
 
 			c.Do("SET", "str", "I am a string")
@@ -107,6 +109,8 @@ func TestStream(t *testing.T) {
 			c.Do("XADD", "planets", "MINID", "450", "456-6", "name", "Mercury")
 			c.Do("XADD", "planets", "MINID", "~", "450", "456-7", "name", "Mercury")
 			c.Do("XLEN", "planets")
+			c.Do("XADD", "planets", "MINID", "=", "456-8", "456-8", "name", "Mercury")
+			c.Do("XRANGE", "planets", "-", "+")
 
 			c.Error("equal or smaller than the target", "XADD", "planets", "MINID", "450", "449-0", "name", "Earth")
 			c.Error("equal or smaller than the target", "XADD", "planets", "MINID", "450", "450", "name", "Earth")