Merge pull request #102 from alicebob/lex

zrangebylex test
alicebob · Aug 17, 2019 · 0195e13 · 0195e13
2 parents 4acafe3 + 7d1fb49
commit 0195e13
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/cmd_sorted_set.go b/cmd_sorted_set.go
@@ -1125,10 +1125,12 @@ func withLexRange(members []string, min string, minIncl bool, max string, maxInc
 		return nil
 	}
 	if min != "-" {
+		found := false
 		if minIncl {
 			for i, m := range members {
 				if m >= min {
 					members = members[i:]
+					found = true
 					break
 				}
 			}
@@ -1137,10 +1139,14 @@ func withLexRange(members []string, min string, minIncl bool, max string, maxInc
 			for i, m := range members {
 				if m > min {
 					members = members[i:]
+					found = true
 					break
 				}
 			}
 		}
+		if !found {
+			return nil
+		}
 	}
 	if max != "+" {
 		if maxIncl {

diff --git a/cmd_sorted_set_test.go b/cmd_sorted_set_test.go
@@ -886,6 +886,10 @@ func TestSortedSetRangeByLex(t *testing.T) {
 			"zwei",
 		}, b)
 
+		b, err = redis.Strings(c.Do("ZRANGEBYLEX", "z", "[zz", "+"))
+		ok(t, err)
+		equals(t, []string{}, b)
+
 		b, err = redis.Strings(c.Do("ZREVRANGEBYLEX", "z", "+", "-"))
 		ok(t, err)
 		equals(t, []string{

diff --git a/integration/sorted_set_test.go b/integration/sorted_set_test.go
@@ -501,6 +501,12 @@ func TestSortedSetRangeByLex(t *testing.T) {
 		fail("ZLEXCOUNT", "key", "!a", "[b"),
 		fail("ZLEXCOUNT", "str", "[a", "[b"),
 	)
+
+	testCommands(t,
+		succ("ZADD", "idx", 0, "ccc"),
+		succ("ZRANGEBYLEX", "idx", "[d", "[e"),
+		succ("ZRANGEBYLEX", "idx", "[c", "[d"),
+	)
 }
 
 func TestSortedSetIncyby(t *testing.T) {