Skip to content

fix: remove incorrect Start/Stop swap in ZRange Rev+ByScore/ByLex #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rueian merged 2 commits into from
Apr 6, 2026
+20 −32
Merged

fix: remove incorrect Start/Stop swap in ZRange Rev+ByScore/ByLex #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63e4c0d
fix: remove incorrect Start/Stop swap in ZRange Rev+ByScore/ByLex
tmchow Apr 5, 2026
5f52ae6
fix: update pipeline_test.go Start/Stop order for Rev+ByScore tests
tmchow Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions rueidiscompat/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2494,11 +2494,7 @@ func (c *Compat) ZPopMin(ctx context.Context, key string, count ...int64) *ZSlic

func (c *Compat) zRangeArgs(withScores bool, z ZRangeArgs) rueidis.Completed {
cmd := c.client.B().Arbitrary("ZRANGE").Keys(z.Key)
if z.Rev && (z.ByScore || z.ByLex) {
cmd = cmd.Args(str(z.Stop), str(z.Start))
} else {
cmd = cmd.Args(str(z.Start), str(z.Stop))
}
cmd = cmd.Args(str(z.Start), str(z.Stop))
if z.ByScore {
cmd = cmd.Args("BYSCORE")
} else if z.ByLex {
Expand Down Expand Up @@ -2580,11 +2576,7 @@ func (c *Compat) ZRangeArgsWithScores(ctx context.Context, z ZRangeArgs) *ZSlice

func (c *Compat) ZRangeStore(ctx context.Context, dst string, z ZRangeArgs) *IntCmd {
cmd := c.client.B().Arbitrary("ZRANGESTORE").Keys(dst, z.Key)
if z.Rev && (z.ByScore || z.ByLex) {
cmd = cmd.Args(str(z.Stop), str(z.Start))
} else {
cmd = cmd.Args(str(z.Start), str(z.Stop))
}
cmd = cmd.Args(str(z.Start), str(z.Stop))
if z.ByScore {
cmd = cmd.Args("BYSCORE")
} else if z.ByLex {
Expand Down Expand Up @@ -6268,11 +6260,7 @@ func (c CacheCompat) ZMScore(ctx context.Context, key string, members ...string)

func (c CacheCompat) zRangeArgs(withScores bool, z ZRangeArgs) rueidis.Cacheable {
cmd := c.client.B().Arbitrary("ZRANGE").Keys(z.Key)
if z.Rev && (z.ByScore || z.ByLex) {
cmd = cmd.Args(str(z.Stop), str(z.Start))
} else {
cmd = cmd.Args(str(z.Start), str(z.Stop))
}
cmd = cmd.Args(str(z.Start), str(z.Stop))
if z.ByScore {
cmd = cmd.Args("BYSCORE")
} else if z.ByLex {
Expand Down
28 changes: 14 additions & 14 deletions rueidiscompat/adapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4641,8 +4641,8 @@ func testAdapter(resp3 bool) {

zRange, err := adapter.ZRangeArgs(ctx, ZRangeArgs{
Key: "zset",
Start: 1,
Stop: 4,
Start: 4,
Stop: 1,
ByScore: true,
Rev: true,
Offset: 1,
Expand All @@ -4653,8 +4653,8 @@ func testAdapter(resp3 bool) {

zRange, err = adapter.ZRangeArgs(ctx, ZRangeArgs{
Key: "zset",
Start: "-",
Stop: "+",
Start: "+",
Stop: "-",
ByLex: true,
Rev: true,
Offset: 2,
Expand All @@ -4675,8 +4675,8 @@ func testAdapter(resp3 bool) {
// withScores.
zSlice, err := adapter.ZRangeArgsWithScores(ctx, ZRangeArgs{
Key: "zset",
Start: 1,
Stop: 4,
Start: 4,
Stop: 1,
ByScore: true,
Rev: true,
Offset: 1,
Expand Down Expand Up @@ -4901,8 +4901,8 @@ func testAdapter(resp3 bool) {

rangeStore, err := adapter.ZRangeStore(ctx, "new-zset", ZRangeArgs{
Key: "zset",
Start: 1,
Stop: 4,
Start: 4,
Stop: 1,
ByScore: true,
Rev: true,
Offset: 1,
Expand Down Expand Up @@ -8378,8 +8378,8 @@ func testAdapterCache(resp3 bool) {

zRange, err := adapter.Cache(time.Hour).ZRangeArgs(ctx, ZRangeArgs{
Key: "zset",
Start: 1,
Stop: 4,
Start: 4,
Stop: 1,
ByScore: true,
Rev: true,
Offset: 1,
Expand All @@ -8390,8 +8390,8 @@ func testAdapterCache(resp3 bool) {

zRange, err = adapter.Cache(time.Hour).ZRangeArgs(ctx, ZRangeArgs{
Key: "zset",
Start: "-",
Stop: "+",
Start: "+",
Stop: "-",
ByLex: true,
Rev: true,
Offset: 2,
Expand All @@ -8412,8 +8412,8 @@ func testAdapterCache(resp3 bool) {
// withScores.
zSlice, err := adapter.Cache(time.Hour).ZRangeArgsWithScores(ctx, ZRangeArgs{
Key: "zset",
Start: 1,
Stop: 4,
Start: 4,
Stop: 1,
ByScore: true,
Rev: true,
Offset: 1,
Expand Down
6 changes: 3 additions & 3 deletions rueidiscompat/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,9 @@ func TestPipeliner(t *testing.T) {
p.ZRangeByScore(ctx, "1", ZRangeBy{Min: "-inf", Max: "+inf", Offset: 1, Count: 2})
p.ZRangeByLex(ctx, "1", ZRangeBy{Min: "-inf", Max: "+inf", Offset: 1, Count: 2})
p.ZRangeByScoreWithScores(ctx, "1", ZRangeBy{Min: "-inf", Max: "+inf", Offset: 1, Count: 2})
p.ZRangeArgs(ctx, ZRangeArgs{Key: "zset", Start: 1, Stop: 4, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRangeArgsWithScores(ctx, ZRangeArgs{Key: "zset", Start: 1, Stop: 4, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRangeStore(ctx, "1", ZRangeArgs{Key: "zset", Start: 1, Stop: 4, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRangeArgs(ctx, ZRangeArgs{Key: "zset", Start: 4, Stop: 1, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRangeArgsWithScores(ctx, ZRangeArgs{Key: "zset", Start: 4, Stop: 1, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRangeStore(ctx, "1", ZRangeArgs{Key: "zset", Start: 4, Stop: 1, ByScore: true, Rev: true, Offset: 1, Count: 2})
p.ZRank(ctx, "1", "2")
p.ZRankWithScore(ctx, "1", "2")
p.ZRem(ctx, "1", "1", "2")
Expand Down
Loading