Skip to content

Use correct slot for COUNTKEYSINSLOT command #3327

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
merged 3 commits into from
Apr 16, 2025
Merged

Use correct slot for COUNTKEYSINSLOT command #3327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbd8876
Use correct slot for COUNTKEYSINSLOT command
khasanovbi Mar 29, 2025
edfcfee
Add tests
khasanovbi Apr 15, 2025
797c982
Merge branch 'master' into count_keys_in_slot
khasanovbi Apr 16, 2025
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
24 changes: 24 additions & 0 deletions internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,27 @@ var _ = Describe("withConn", func() {
Expect(client.connPool.Len()).To(Equal(1))
})
})

var _ = Describe("ClusterClient", func() {
var client *ClusterClient

BeforeEach(func() {
client = &ClusterClient{}
})

Describe("cmdSlot", func() {
It("select slot from args for GETKEYSINSLOT command", func() {
cmd := NewStringSliceCmd(ctx, "cluster", "getkeysinslot", 100, 200)

slot := client.cmdSlot(context.Background(), cmd)
Expect(slot).To(Equal(100))
})

It("select slot from args for COUNTKEYSINSLOT command", func() {
cmd := NewStringSliceCmd(ctx, "cluster", "countkeysinslot", 100)

slot := client.cmdSlot(context.Background(), cmd)
Expect(slot).To(Equal(100))
})
})
})
2 changes: 1 addition & 1 deletion osscluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@ func (c *ClusterClient) cmdInfo(ctx context.Context, name string) *CommandInfo {

func (c *ClusterClient) cmdSlot(ctx context.Context, cmd Cmder) int {
args := cmd.Args()
if args[0] == "cluster" && args[1] == "getkeysinslot" {
if args[0] == "cluster" && (args[1] == "getkeysinslot" || args[1] == "countkeysinslot") {
return args[2].(int)
}

Expand Down
Loading