Change ZWithKey

This commit is contained in:
Vladimir Mihailenco 2018-11-03 12:07:25 +02:00
parent 6809e07fd3
commit 58f22c56fd
2 changed files with 22 additions and 15 deletions

View File

@ -1554,8 +1554,7 @@ type Z struct {
// ZWithKey represents sorted set member including the name of the key where it was popped.
type ZWithKey struct {
Score float64
Member interface{}
Z
Key string
}

View File

@ -2138,8 +2138,10 @@ var _ = Describe("Commands", func() {
member, err := client.BZPopMax(0, "zset1", "zset2").Result()
Expect(err).NotTo(HaveOccurred())
Expect(member).To(Equal(redis.ZWithKey{
Z: redis.Z{
Score: 3,
Member: "three",
},
Key: "zset1",
}))
})
@ -2154,8 +2156,10 @@ var _ = Describe("Commands", func() {
bZPopMax := client.BZPopMax(0, "zset")
Expect(bZPopMax.Err()).NotTo(HaveOccurred())
Expect(bZPopMax.Val()).To(Equal(redis.ZWithKey{
Z: redis.Z{
Member: "a",
Score: 1,
},
Key: "zset",
}))
done <- true
@ -2216,8 +2220,10 @@ var _ = Describe("Commands", func() {
member, err := client.BZPopMin(0, "zset1", "zset2").Result()
Expect(err).NotTo(HaveOccurred())
Expect(member).To(Equal(redis.ZWithKey{
Z: redis.Z{
Score: 1,
Member: "one",
},
Key: "zset1",
}))
})
@ -2232,8 +2238,10 @@ var _ = Describe("Commands", func() {
bZPopMin := client.BZPopMin(0, "zset")
Expect(bZPopMin.Err()).NotTo(HaveOccurred())
Expect(bZPopMin.Val()).To(Equal(redis.ZWithKey{
Z: redis.Z{
Member: "a",
Score: 1,
},
Key: "zset",
}))
done <- true