Merge pull request #61 from monkey92t/new_cmd

feat: add ZMPop,BZMPop command

Author: monkey92t

commands_test.go

@@ -1653,6 +1653,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("BZMPop", func() {
+			operationZSliceWithKeyCmd(clientMock, func() *ExpectedZSliceWithKey {
+				return clientMock.ExpectBZMPop(time.Minute, "max", 3, "key1", "key2")
+			}, func() *redis.ZSliceWithKeyCmd {
+				return client.BZMPop(ctx, time.Minute, "max", 3, "key1", "key2")
+			})
+		})
+
 		It("ZAdd", func() {
 			operationIntCmd(clientMock, func() *ExpectedInt {
 				return clientMock.ExpectZAdd("zset", redis.Z{
@@ -1829,6 +1837,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("ZMPop", func() {
+			operationZSliceWithKeyCmd(clientMock, func() *ExpectedZSliceWithKey {
+				return clientMock.ExpectZMPop("min", 3, "key1", "key2")
+			}, func() *redis.ZSliceWithKeyCmd {
+				return client.ZMPop(ctx, "min", 3, "key1", "key2")
+			})
+		})
+
 		It("ZMScore", func() {
 			operationFloatSliceCmd(clientMock, func() *ExpectedFloatSlice {
 				return clientMock.ExpectZMScore("key", "m1", "m2", "m3")

expect.go

@@ -204,6 +204,7 @@ type baseMock interface {
 
 	ExpectBZPopMax(timeout time.Duration, keys ...string) *ExpectedZWithKey
 	ExpectBZPopMin(timeout time.Duration, keys ...string) *ExpectedZWithKey
+	ExpectBZMPop(timeout time.Duration, order string, count int64, keys ...string) *ExpectedZSliceWithKey
 
 	ExpectZAdd(key string, members ...redis.Z) *ExpectedInt
 	ExpectZAddNX(key string, members ...redis.Z) *ExpectedInt
@@ -218,6 +219,7 @@ type baseMock interface {
 	ExpectZInterWithScores(store *redis.ZStore) *ExpectedZSlice
 	ExpectZInterCard(limit int64, keys ...string) *ExpectedInt
 	ExpectZInterStore(destination string, store *redis.ZStore) *ExpectedInt
+	ExpectZMPop(order string, count int64, keys ...string) *ExpectedZSliceWithKey
 	ExpectZMScore(key string, members ...string) *ExpectedFloatSlice
 	ExpectZPopMax(key string, count ...int64) *ExpectedZSlice
 	ExpectZPopMin(key string, count ...int64) *ExpectedZSlice
@@ -1132,6 +1134,27 @@ func (cmd *ExpectedKeyValues) inflow(c redis.Cmder) {
 
 // ------------------------------------------------------------
 
+type ExpectedZSliceWithKey struct {
+	expectedBase
+
+	key string
+	val []redis.Z
+}
+
+func (cmd *ExpectedZSliceWithKey) SetVal(key string, val []redis.Z) {
+	cmd.setVal = true
+	cmd.key = key
+	cmd.val = make([]redis.Z, len(val))
+	copy(cmd.val, val)
+}
+
+func (cmd *ExpectedZSliceWithKey) inflow(c redis.Cmder) {
+	inflow(c, "key", cmd.key)
+	inflow(c, "val", cmd.val)
+}
+
+// ------------------------------------------------------------
+
 type ExpectedSlowLog struct {
 	expectedBase
 

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.25.0
-	github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067
+	github.com/redis/go-redis/v9 v9.0.3-0.20230223112541-6045d2e4561c
 )
 
 require (

go.sum

@@ -40,8 +40,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067 h1:e+fsCwY18jOIumrC71yG6ZcLUB7AwyS/GX+bspxzaOs=
-github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067/go.mod h1:6kjiKPy72LcR7xJX4bMLuf+2Rd/tpBFk4YKJTZ1jTNA=
+github.com/redis/go-redis/v9 v9.0.3-0.20230223112541-6045d2e4561c h1:HU8TAwucfDaYERowWS2hTe3GyMx46wOdg5iNnhZzZuY=
+github.com/redis/go-redis/v9 v9.0.3-0.20230223112541-6045d2e4561c/go.mod h1:6kjiKPy72LcR7xJX4bMLuf+2Rd/tpBFk4YKJTZ1jTNA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=

mock.go

@@ -1639,6 +1639,13 @@ func (m *mock) ExpectBZPopMin(timeout time.Duration, keys ...string) *ExpectedZW
 	return e
 }
 
+func (m *mock) ExpectBZMPop(timeout time.Duration, order string, count int64, keys ...string) *ExpectedZSliceWithKey {
+	e := &ExpectedZSliceWithKey{}
+	e.cmd = m.factory.BZMPop(m.ctx, timeout, order, count, keys...)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectZAdd(key string, members ...redis.Z) *ExpectedInt {
 	e := &ExpectedInt{}
 	e.cmd = m.factory.ZAdd(m.ctx, key, members...)
@@ -1730,6 +1737,13 @@ func (m *mock) ExpectZInterStore(destination string, store *redis.ZStore) *Expec
 	return e
 }
 
+func (m *mock) ExpectZMPop(order string, count int64, keys ...string) *ExpectedZSliceWithKey {
+	e := &ExpectedZSliceWithKey{}
+	e.cmd = m.factory.ZMPop(m.ctx, order, count, keys...)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectZMScore(key string, members ...string) *ExpectedFloatSlice {
 	e := &ExpectedFloatSlice{}
 	e.cmd = m.factory.ZMScore(m.ctx, key, members...)

mock_test.go

@@ -1366,3 +1366,39 @@ func operationKeyValuesCmd(base baseMock, expected func() *ExpectedKeyValues, ac
 	Expect(key).To(Equal("key1"))
 	Expect(val).To(Equal([]string{"v1", "v2"}))
 }
+
+func operationZSliceWithKeyCmd(base baseMock, expected func() *ExpectedZSliceWithKey, actual func() *redis.ZSliceWithKeyCmd) {
+	var (
+		setErr = errors.New("z slice with key cmd error")
+		key    string
+		val    []redis.Z
+		err    error
+	)
+
+	base.ClearExpect()
+	expected().SetErr(setErr)
+	key, val, err = actual().Result()
+	Expect(err).To(Equal(setErr))
+	Expect(key).To(Equal(""))
+	Expect(val).To(Equal([]redis.Z(nil)))
+
+	base.ClearExpect()
+	expected()
+	key, val, err = actual().Result()
+	Expect(err).To(HaveOccurred())
+	Expect(key).To(Equal(""))
+	Expect(val).To(Equal([]redis.Z(nil)))
+
+	base.ClearExpect()
+	expected().SetVal("key1", []redis.Z{
+		{Score: 100, Member: "one"},
+		{Score: 200, Member: "two"},
+	})
+	key, val, err = actual().Result()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(key).To(Equal("key1"))
+	Expect(val).To(Equal([]redis.Z{
+		{Score: 100, Member: "one"},
+		{Score: 200, Member: "two"},
+	}))
+}