Skip to content

Commit 852a60d

Browse files
committed
Fix go vet
1 parent e9e73a9 commit 852a60d

File tree

4 files changed

+536
-233
lines changed

4 files changed

+536
-233
lines changed

bench_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,11 @@ func BenchmarkZAdd(b *testing.B) {
208208

209209
b.RunParallel(func(pb *testing.PB) {
210210
for pb.Next() {
211-
if err := client.ZAdd("key", redis.Z{float64(1), "hello"}).Err(); err != nil {
211+
err := client.ZAdd("key", redis.Z{
212+
Score: float64(1),
213+
Member: "hello",
214+
}).Err()
215+
if err != nil {
212216
b.Fatal(err)
213217
}
214218
}

cluster_test.go

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,37 @@ func startCluster(scenario *clusterScenario) error {
123123
return err
124124
}
125125
wanted := []redis.ClusterSlot{
126-
{0, 4999, []redis.ClusterNode{{"", "127.0.0.1:8220"}, {"", "127.0.0.1:8223"}}},
127-
{5000, 9999, []redis.ClusterNode{{"", "127.0.0.1:8221"}, {"", "127.0.0.1:8224"}}},
128-
{10000, 16383, []redis.ClusterNode{{"", "127.0.0.1:8222"}, {"", "127.0.0.1:8225"}}},
126+
{
127+
Start: 0,
128+
End: 4999,
129+
Nodes: []redis.ClusterNode{{
130+
Id: "",
131+
Addr: "127.0.0.1:8220",
132+
}, {
133+
Id: "",
134+
Addr: "127.0.0.1:8223",
135+
}},
136+
}, {
137+
Start: 5000,
138+
End: 9999,
139+
Nodes: []redis.ClusterNode{{
140+
Id: "",
141+
Addr: "127.0.0.1:8221",
142+
}, {
143+
Id: "",
144+
Addr: "127.0.0.1:8224",
145+
}},
146+
}, {
147+
Start: 10000,
148+
End: 16383,
149+
Nodes: []redis.ClusterNode{{
150+
Id: "",
151+
Addr: "127.0.0.1:8222",
152+
}, {
153+
Id: "",
154+
Addr: "127.0.0.1:8225",
155+
}},
156+
},
129157
}
130158
return assertSlotsEqual(res, wanted)
131159
}, 30*time.Second)
@@ -492,9 +520,37 @@ var _ = Describe("ClusterClient", func() {
492520
Expect(res).To(HaveLen(3))
493521

494522
wanted := []redis.ClusterSlot{
495-
{0, 4999, []redis.ClusterNode{{"", "127.0.0.1:8220"}, {"", "127.0.0.1:8223"}}},
496-
{5000, 9999, []redis.ClusterNode{{"", "127.0.0.1:8221"}, {"", "127.0.0.1:8224"}}},
497-
{10000, 16383, []redis.ClusterNode{{"", "127.0.0.1:8222"}, {"", "127.0.0.1:8225"}}},
523+
{
524+
Start: 0,
525+
End: 4999,
526+
Nodes: []redis.ClusterNode{{
527+
Id: "",
528+
Addr: "127.0.0.1:8220",
529+
}, {
530+
Id: "",
531+
Addr: "127.0.0.1:8223",
532+
}},
533+
}, {
534+
Start: 5000,
535+
End: 9999,
536+
Nodes: []redis.ClusterNode{{
537+
Id: "",
538+
Addr: "127.0.0.1:8221",
539+
}, {
540+
Id: "",
541+
Addr: "127.0.0.1:8224",
542+
}},
543+
}, {
544+
Start: 10000,
545+
End: 16383,
546+
Nodes: []redis.ClusterNode{{
547+
Id: "",
548+
Addr: "127.0.0.1:8222",
549+
}, {
550+
Id: "",
551+
Addr: "127.0.0.1:8225",
552+
}},
553+
},
498554
}
499555
Expect(assertSlotsEqual(res, wanted)).NotTo(HaveOccurred())
500556
})

0 commit comments

Comments
 (0)