Merge pull request #391 from daniel-cohere/streamCmp-in-xtrim

use streamCmp in Xtrim
alicebob · Dec 18, 2024 · 5320c5c · 5320c5c
2 parents ef93126 + e4791b5
commit 5320c5c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/cmd_stream_test.go b/cmd_stream_test.go
@@ -1076,16 +1076,22 @@ func TestStreamTrim(t *testing.T) {
 	ok(t, err)
 	_, err = c.Do("XADD", "planets", "5-1", "name", "Saturn")
 	ok(t, err)
+	_, err = c.Do("XADD", "planets", "5-2", "name", "Uranus")
+	ok(t, err)
+	_, err = c.Do("XADD", "planets", "5-11", "name", "Pluto")
+	ok(t, err)
 
 	mustDo(t, c,
-		"XTRIM", "planets", "MAXLEN", "=", "3", proto.Int(3))
+		"XTRIM", "planets", "MAXLEN", "=", "5", proto.Int(3))
 
 	mustDo(t, c,
 		"XRANGE", "planets", "-", "+",
 		proto.Array(
 			proto.Array(proto.String("3-0"), proto.Strings("name", "Mars")),
 			proto.Array(proto.String("4-1"), proto.Strings("name", "Jupiter")),
 			proto.Array(proto.String("5-1"), proto.Strings("name", "Saturn")),
+			proto.Array(proto.String("5-2"), proto.Strings("name", "Uranus")),
+			proto.Array(proto.String("5-11"), proto.Strings("name", "Pluto")),
 		))
 
 	mustDo(t, c,
@@ -1096,6 +1102,8 @@ func TestStreamTrim(t *testing.T) {
 		proto.Array(
 			proto.Array(proto.String("4-1"), proto.Strings("name", "Jupiter")),
 			proto.Array(proto.String("5-1"), proto.Strings("name", "Saturn")),
+			proto.Array(proto.String("5-2"), proto.Strings("name", "Uranus")),
+			proto.Array(proto.String("5-11"), proto.Strings("name", "Pluto")),
 		))
 
 	mustDo(t, c,
@@ -1105,6 +1113,17 @@ func TestStreamTrim(t *testing.T) {
 		"XRANGE", "planets", "-", "+",
 		proto.Array(
 			proto.Array(proto.String("5-1"), proto.Strings("name", "Saturn")),
+			proto.Array(proto.String("5-2"), proto.Strings("name", "Uranus")),
+			proto.Array(proto.String("5-11"), proto.Strings("name", "Pluto")),
+		))
+
+	mustDo(t, c,
+		"XTRIM", "planets", "MINID", "5-11", proto.Int(2))
+
+	mustDo(t, c,
+		"XRANGE", "planets", "-", "+",
+		proto.Array(
+			proto.Array(proto.String("5-11"), proto.Strings("name", "Pluto")),
 		))
 }
 

diff --git a/stream.go b/stream.go
@@ -273,7 +273,7 @@ func (s *streamKey) trimBefore(id string) int {
 	s.mu.Lock()
 	var delete []string
 	for _, entry := range s.entries {
-		if entry.ID < id {
+		if streamCmp(entry.ID, id) < 0 {
 			delete = append(delete, entry.ID)
 		} else {
 			break