Added ByScore, Limit for ZRANGE

integration_tests/commands/http/zset_test.go

@@ -906,6 +906,32 @@ func TestZRANGE_HTTP(t *testing.T) {
 			},
 			expected: []interface{}{float64(6), []interface{}{"member1", "1", "member2", "2"}},
 		},
+		{
+			name: "ZRANGE with byscore option",
+			commands: []HTTPCommand{
+				{Command: "ZADD", Body: map[string]interface{}{"key": "leaderboard", "values": []string{"50", "Alice", "70", "Bob", "60", "Charlie", "80", "Dave"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": []string{"-1", "0"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": []string{"1", "0"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": []string{"(60", "80", "BYSCORE"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": []string{"(60", "(80", "BYSCORE"}}},
+			},
+			expected: []interface{}{
+				float64(4),
+				[]interface{}{},
+				[]interface{}{},
+				[]interface{}{"Bob", "Dave"},
+				[]interface{}{"Bob"},
+			},
+		},
+		{
+			name: "ZRANGE with score and limit",
+			commands: []HTTPCommand{
+				{Command: "ZADD", Body: map[string]interface{}{"key": "leaderboard", "values": [...]string{"50", "Alice", "70", "Bob", "60", "Charlie", "80", "Dave"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": [...]string{"0", "3", "WITHSCORES", "REV"}}},
+				{Command: "ZRANGE", Body: map[string]interface{}{"key": "leaderboard", "values": [...]string{"(1", "+inf", "BYSCORE", "LIMIT", "0", "2"}}},
+			},
+			expected: []interface{}{float64(0), []interface{}{"Dave", "80", "Bob", "70", "Charlie", "60", "Alice", "50"}, []interface{}{"Alice", "Charlie"}},
+		},
 	}
 
 	for _, tc := range testCases {

integration_tests/commands/resp/zset_test.go

@@ -659,6 +659,16 @@ func TestZRANGE(t *testing.T) {
 			commands: []string{"ZADD key 1 member1 2 member2 3 member3 4 member4 5 member5 6 member6", "ZRANGE key -8 -5 WITHSCORES"},
 			expected: []interface{}{int64(6), []interface{}{"member1", "1", "member2", "2"}},
 		},
+		{
+			name:     "ZRANGE with byscore",
+			commands: []string{"ZADD leaderboard 50 Alice 70 Bob 60 Charlie 80 Dave", "ZRANGE leaderboard -1 0", "ZRANGE leaderboard 1 0", "ZRANGE leaderboard (60 80 BYSCORE", "ZRANGE leaderboard (60 (80 BYSCORE"},
+			expected: []interface{}{int64(4), []interface{}{}, []interface{}{}, []interface{}{"Bob", "Dave"}, []interface{}{"Bob"}},
+		},
+		{
+			name:     "ZRANGE with score and limit",
+			commands: []string{"ZADD leaderboard 50 Alice 70 Bob 60 Charlie 80 Dave", "ZRANGE leaderboard 0 3 WITHSCORES REV", "ZRANGE leaderboard (1 +inf BYSCORE LIMIT 0 2"},
+			expected: []interface{}{int64(0), []interface{}{"Dave", "80", "Bob", "70", "Charlie", "60", "Alice", "50"}, []interface{}{"Alice", "Charlie"}},
+		},
 	}
 
 	for _, tc := range testCases {

integration_tests/commands/websocket/zset_test.go

@@ -679,6 +679,16 @@ func TestZRANGE(t *testing.T) {
 			commands: []string{"ZADD key 1 member1 2 member2 3 member3 4 member4 5 member5 6 member6", "ZRANGE key -8 -5 WITHSCORES"},
 			expected: []interface{}{float64(6), []interface{}{"member1", "1", "member2", "2"}},
 		},
+		{
+			name:     "ZRANGE with byscore",
+			commands: []string{"ZADD leaderboard 50 Alice 70 Bob 60 Charlie 80 Dave", "ZRANGE leaderboard -1 0", "ZRANGE leaderboard 1 0", "ZRANGE leaderboard (60 80 BYSCORE", "ZRANGE leaderboard (60 (80 BYSCORE"},
+			expected: []interface{}{float64(4), []interface{}{}, []interface{}{}, []interface{}{"Bob", "Dave"}, []interface{}{"Bob"}},
+		},
+		{
+			name:     "ZRANGE with score and limit",
+			commands: []string{"ZADD leaderboard 50 Alice 70 Bob 60 Charlie 80 Dave", "ZRANGE leaderboard 0 3 WITHSCORES REV", "ZRANGE leaderboard (1 +inf BYSCORE LIMIT 0 2"},
+			expected: []interface{}{float64(0), []interface{}{"Dave", "80", "Bob", "70", "Charlie", "60", "Alice", "50"}, []interface{}{"Alice", "Charlie"}},
+		},
 	}
 
 	for _, tc := range testCases {

internal/eval/constants.go

@@ -66,4 +66,9 @@ const (
 	FILTERS         string = "FILTER"
 	ITEMS           string = "ITEMS"
 	EXPANSION       string = "EXPANSION"
+	BYSCORE         string = "BYSCORE"
+	BYLEX           string = "BYLEX"
+	LIMIT           string = "LIMIT"
+	PLUSINF         string = "+inf"
+	MINUSINF        string = "-inf"
 )

internal/eval/sortedset/sorted_set.go

@@ -325,3 +325,52 @@ func DeserializeSortedSet(buf *bytes.Reader) (*Set, error) {
 
 	return ss, nil
 }
+
+// GetRangeByScore returns a slice of members with scores between min and max, inclusive.
+func (ss *Set) GetRangeByScore(minScore, maxScore float64, withScores, reverse bool, offset, count int) []string {
+	var result []string
+	index := 0
+	returned := 0
+
+	iterFunc := func(item btree.Item) bool {
+		ssi := item.(*Item)
+
+		if reverse {
+			if ssi.Score > maxScore {
+				return true
+			}
+			if ssi.Score < minScore {
+				return false
+			}
+		} else {
+			if ssi.Score < minScore {
+				return true
+			}
+			if ssi.Score > maxScore {
+				return false
+			}
+		}
+
+		if index >= offset {
+			result = append(result, ssi.Member)
+			if withScores {
+				scoreStr := strings.ToLower(strconv.FormatFloat(ssi.Score, 'g', -1, 64))
+				result = append(result, scoreStr)
+			}
+			returned++
+			if count > 0 && returned >= count {
+				return false
+			}
+		}
+		index++
+		return true
+	}
+
+	if reverse {
+		ss.tree.Descend(iterFunc)
+	} else {
+		ss.tree.Ascend(iterFunc)
+	}
+
+	return result
+}