mirror of https://github.com/go-redis/redis.git
commit
f83600d1a5
31
commands.go
31
commands.go
|
@ -277,6 +277,8 @@ type Cmdable interface {
|
||||||
ZScore(ctx context.Context, key, member string) *FloatCmd
|
ZScore(ctx context.Context, key, member string) *FloatCmd
|
||||||
ZUnionStore(ctx context.Context, dest string, store *ZStore) *IntCmd
|
ZUnionStore(ctx context.Context, dest string, store *ZStore) *IntCmd
|
||||||
ZRandMember(ctx context.Context, key string, count int, withScores bool) *StringSliceCmd
|
ZRandMember(ctx context.Context, key string, count int, withScores bool) *StringSliceCmd
|
||||||
|
ZDiff(ctx context.Context, keys ...string) *StringSliceCmd
|
||||||
|
ZDiffWithScores(ctx context.Context, keys ...string) *ZSliceCmd
|
||||||
|
|
||||||
PFAdd(ctx context.Context, key string, els ...interface{}) *IntCmd
|
PFAdd(ctx context.Context, key string, els ...interface{}) *IntCmd
|
||||||
PFCount(ctx context.Context, keys ...string) *IntCmd
|
PFCount(ctx context.Context, keys ...string) *IntCmd
|
||||||
|
@ -2368,6 +2370,35 @@ func (c cmdable) ZRandMember(ctx context.Context, key string, count int, withSco
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// redis-server version >= 6.2.0.
|
||||||
|
func (c cmdable) ZDiff(ctx context.Context, keys ...string) *StringSliceCmd {
|
||||||
|
args := make([]interface{}, 2+len(keys))
|
||||||
|
args[0] = "zdiff"
|
||||||
|
args[1] = len(keys)
|
||||||
|
for i, key := range keys {
|
||||||
|
args[i+2] = key
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := NewStringSliceCmd(ctx, args...)
|
||||||
|
_ = c(ctx, cmd)
|
||||||
|
return cmd
|
||||||
|
}
|
||||||
|
|
||||||
|
// redis-server version >= 6.2.0.
|
||||||
|
func (c cmdable) ZDiffWithScores(ctx context.Context, keys ...string) *ZSliceCmd {
|
||||||
|
args := make([]interface{}, 3+len(keys))
|
||||||
|
args[0] = "zdiff"
|
||||||
|
args[1] = len(keys)
|
||||||
|
for i, key := range keys {
|
||||||
|
args[i+2] = key
|
||||||
|
}
|
||||||
|
args[len(keys)+2] = "withscores"
|
||||||
|
|
||||||
|
cmd := NewZSliceCmd(ctx, args...)
|
||||||
|
_ = c(ctx, cmd)
|
||||||
|
return cmd
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
func (c cmdable) PFAdd(ctx context.Context, key string, els ...interface{}) *IntCmd {
|
func (c cmdable) PFAdd(ctx context.Context, key string, els ...interface{}) *IntCmd {
|
||||||
|
|
|
@ -3960,6 +3960,45 @@ var _ = Describe("Commands", func() {
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(slice).To(Or(Equal([]string{"one", "1"}), Equal([]string{"two", "2"})))
|
Expect(slice).To(Or(Equal([]string{"one", "1"}), Equal([]string{"two", "2"})))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
It("should ZDiff", func() {
|
||||||
|
err := client.ZAdd(ctx, "zset1", &redis.Z{Score: 1, Member: "one"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset1", &redis.Z{Score: 2, Member: "two"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset1", &redis.Z{Score: 3, Member: "three"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset2", &redis.Z{Score: 1, Member: "one"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
v, err := client.ZDiff(ctx, "zset1", "zset2").Result()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
Expect(v).To(Equal([]string{"two", "three"}))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("should ZDiffWithScores", func() {
|
||||||
|
err := client.ZAdd(ctx, "zset1", &redis.Z{Score: 1, Member: "one"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset1", &redis.Z{Score: 2, Member: "two"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset1", &redis.Z{Score: 3, Member: "three"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
err = client.ZAdd(ctx, "zset2", &redis.Z{Score: 1, Member: "one"}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
v, err := client.ZDiffWithScores(ctx, "zset1", "zset2").Result()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
Expect(v).To(Equal([]redis.Z{
|
||||||
|
{
|
||||||
|
Member: "two",
|
||||||
|
Score: 2,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Member: "three",
|
||||||
|
Score: 3,
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
Describe("streams", func() {
|
Describe("streams", func() {
|
||||||
|
|
Loading…
Reference in New Issue