Skip to content
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.

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

feat: minor increase in rueidiscompat coverage #583

Merged
merged 8 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 50 additions & 0 deletions rueidiscompat/adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@ func testCluster(resp3 bool) {
Expect(err).NotTo(HaveOccurred())
Expect(strings.Split(strings.TrimSpace(nodes), "\n")).To(HaveLen(3))
})
It("ClusterMeet", func() {
Expect(adapter.ClusterMeet(ctx, "localhost", 8080).Err()).To(MatchError("Invalid node address specified: localhost:8080"))
})
It("ClusterForget", func() {
Expect(adapter.ClusterForget(ctx, "1").Err()).To(MatchError("Unknown node 1"))
})
It("ClusterReplicate", func() {
Expect(adapter.ClusterReplicate(ctx, "1").Err()).To(MatchError("Unknown node 1"))
})
It("ClusterInfo", func() {
info, err := adapter.ClusterInfo(ctx).Result()
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -8934,6 +8943,11 @@ func testAdapterCache(resp3 bool) {
resultAdd, err = adapter.TFunctionLoadArgs(ctx, libCodeWithConfig("lib1"), opt).Result()
Expect(err).NotTo(HaveOccurred())
Expect(resultAdd).To(BeEquivalentTo("OK"))
opt.Replace = false
adapter.TFunctionDelete(ctx, libCodeWithConfig("lib2")).Result()
resultAdd, err = adapter.TFunctionLoadArgs(ctx, libCodeWithConfig("lib2"), opt).Result()
Expect(err).NotTo(HaveOccurred())
Expect(resultAdd).To(BeEquivalentTo("OK"))
})
It("should TFunctionList", Label("gears", "tfunctionlist"), func() {
resultAdd, err := adapter.TFunctionLoad(ctx, libCode("lib1")).Result()
Expand All @@ -8946,6 +8960,10 @@ func testAdapterCache(resp3 bool) {
resultListArgs, err := adapter.TFunctionListArgs(ctx, opt).Result()
Expect(err).NotTo(HaveOccurred())
Expect(resultListArgs[0]["code"]).NotTo(BeEquivalentTo(""))
opt.Library = "VERBOSE"
resultListArgs, err = adapter.TFunctionListArgs(ctx, opt).Result()
Expect(err).NotTo(HaveOccurred())
Expect(resultListArgs[0]["code"]).NotTo(BeEquivalentTo(""))
})

It("should TFCall", Label("gears", "tfcall"), func() {
Expand Down Expand Up @@ -9156,6 +9174,21 @@ func testAdapterCache(resp3 bool) {
Expect(result).To(BeAssignableToTypeOf(BFInfo{}))
Expect(result.Capacity).To(BeEquivalentTo(int64(2000)))
Expect(result.ExpansionRate).To(BeEquivalentTo(int64(3)))

options.NonScaling = true
resultInsert, err = adapter.BFInsert(ctx, "testbf2", options, "item1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(len(resultInsert)).To(BeEquivalentTo(1))

exists, err = adapter.BFExists(ctx, "testbf2", "item1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(exists).To(BeTrue())

result, err = adapter.BFInfo(ctx, "testbf2").Result()
Expect(err).NotTo(HaveOccurred())
Expect(result).To(BeAssignableToTypeOf(BFInfo{}))
Expect(result.Capacity).To(BeEquivalentTo(int64(2000)))
Expect(result.ExpansionRate).To(BeEquivalentTo(int64(0)))
})

It("should BFMAdd", Label("bloom", "bfmadd"), func() {
Expand Down Expand Up @@ -9256,6 +9289,10 @@ func testAdapterCache(resp3 bool) {
Expect(result).To(BeAssignableToTypeOf(BFInfo{}))
Expect(result.Capacity).To(BeEquivalentTo(int64(2000)))
Expect(result.ExpansionRate).To(BeEquivalentTo(int64(3)))

options.NonScaling = true
err = adapter.BFReserveWithArgs(ctx, "testbf2", options).Err()
Expect(err).To(HaveOccurred())
})
})

Expand Down Expand Up @@ -9742,6 +9779,19 @@ func testAdapterCache(resp3 bool) {
max, err := adapter.TDigestMax(ctx, "tdigest1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(max).To(BeEquivalentTo(float64(140)))

options.Override = true
err = adapter.TDigestMerge(ctx, "tdigest1", options, "tdigest2", "tdigest3").Err()
Expect(err).NotTo(HaveOccurred())

info, err = adapter.TDigestInfo(ctx, "tdigest1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(info.Observations).To(BeEquivalentTo(int64(20)))
Expect(info.Compression).To(BeEquivalentTo(int64(1000)))

max, err = adapter.TDigestMax(ctx, "tdigest1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(max).To(BeEquivalentTo(float64(140)))
})
})
})
Expand Down
269 changes: 269 additions & 0 deletions rueidiscompat/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redis/rueidis/mock"
)

var _ = Describe("Commands", func() {
Expand Down Expand Up @@ -370,6 +371,14 @@ var _ = Describe("Commands", func() {
Expect(cursor).To(Equal(uint64(1)))
Expect(cmd.Err()).To(BeNil())
}
{
cmd := &ScanCmd{err: errors.New("invalid error")}
cmd.SetVal([]string{"1"}, 1)
keys, cursor := cmd.Val()
Expect(keys).To(Equal([]string{"1"}))
Expect(cursor).To(Equal(uint64(1)))
Expect(cmd.Err().Error()).To(Equal("invalid error"))
}
{
cmd := &ZSliceCmd{}
cmd.SetVal([]Z{{Score: 1}})
Expand Down Expand Up @@ -882,3 +891,263 @@ func TestFormatMs(t *testing.T) {
t.Errorf("Test case 2 failed: Expected %d, got %d", expected2, result2)
}
}

func TestCommandErrorHandling(t *testing.T) {
mockRes := mock.ErrorResult(errors.New("initial error"))

tests := []struct {
name string
command func() error
expected string
}{
{
name: "JSONSliceCmd",
command: func() error {
cmd := newJSONSliceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "IntPointerSliceCmd",
command: func() error {
cmd := newIntPointerSliceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "MapStringSliceInterfaceCmd",
command: func() error {
cmd := newMapStringSliceInterfaceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "TSTimestampValueSliceCmd",
command: func() error {
cmd := newTSTimestampValueSliceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "MapStringInterfaceCmd",
command: func() error {
cmd := newMapStringInterfaceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "TSTimestampValueCmd",
command: func() error {
cmd := newTSTimestampValueCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "TDigestInfoCmd",
command: func() error {
cmd := newTDigestInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "MapStringIntCmd",
command: func() error {
cmd := newMapStringIntCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "TopKInfoCmd",
command: func() error {
cmd := newTopKInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "CMSInfoCmd",
command: func() error {
cmd := newCMSInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "CFInfoCmd",
command: func() error {
cmd := newCFInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "ScanDumpCmd",
command: func() error {
cmd := newScanDumpCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "BFInfoCmd",
command: func() error {
cmd := newBFInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "MapStringInterfaceSliceCmd",
command: func() error {
cmd := newMapStringInterfaceSliceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "FunctionListCmd",
command: func() error {
cmd := newFunctionListCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "CommandsInfoCmd",
command: func() error {
cmd := newCommandsInfoCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "GeoPosCmd",
command: func() error {
cmd := newGeoPosCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "ClusterShardsCmd",
command: func() error {
cmd := newClusterShardsCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "ClusterSlotsCmd",
command: func() error {
cmd := newClusterSlotsCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "TimeCmd",
command: func() error {
cmd := newTimeCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XInfoConsumersCmd",
command: func() error {
cmd := newXInfoConsumersCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XInfoStreamFullCmd",
command: func() error {
cmd := newXInfoStreamFullCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XInfoStreamCmd",
command: func() error {
cmd := newXInfoStreamCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XInfoGroupsCmd",
command: func() error {
cmd := newXInfoGroupsCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XAutoClaimCmd",
command: func() error {
cmd := newXAutoClaimCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XPendingExtCmd",
command: func() error {
cmd := newXPendingExtCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "XPendingCmd",
command: func() error {
cmd := newXPendingCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "StringStructMapCmd",
command: func() error {
cmd := newStringStructMapCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "ZSliceSingleCmd",
command: func() error {
cmd := newZSliceSingleCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
{
name: "ZSliceCmd",
command: func() error {
cmd := newZSliceCmd(mockRes)
return cmd.Err()
},
expected: "initial error",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := tt.command()
if err == nil || err.Error() != tt.expected {
t.Errorf("Expected error %v, got %v", tt.expected, err)
}
})
}
}
Loading