feat: add lcs cmd and BitPosSpan API

Signed-off-by: monkey92t <golang@88.com>

Author: monkey92t

commands_test.go

@@ -759,6 +759,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("BitPosSpan", func() {
+			operationIntCmd(clientMock, func() *ExpectedInt {
+				return clientMock.ExpectBitPosSpan("key", 1, 1, 3, "bit")
+			}, func() *redis.IntCmd {
+				return client.BitPosSpan(ctx, "key", 1, 1, 3, "bit")
+			})
+		})
+
 		It("BitField", func() {
 			operationIntSliceCmd(clientMock, func() *ExpectedIntSlice {
 				return clientMock.ExpectBitField("key", "INCRBY", "i5", 100, 1, "GET", "u4", 0)
@@ -983,6 +991,26 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("LIndex", func() {
+			operationLCSCmd(clientMock, func() *ExpectedLCS {
+				return clientMock.ExpectLCS(&redis.LCSQuery{
+					Key1:         "key1",
+					Key2:         "key2",
+					Idx:          true,
+					MinMatchLen:  3,
+					WithMatchLen: true,
+				})
+			}, func() *redis.LCSCmd {
+				return client.LCS(ctx, &redis.LCSQuery{
+					Key1:         "key1",
+					Key2:         "key2",
+					Idx:          true,
+					MinMatchLen:  3,
+					WithMatchLen: true,
+				})
+			})
+		})
+
 		It("LIndex", func() {
 			operationStringCmd(clientMock, func() *ExpectedString {
 				return clientMock.ExpectLIndex("key", 1)

expect.go

@@ -99,6 +99,7 @@ type baseMock interface {
 	ExpectBitOpXor(destKey string, keys ...string) *ExpectedInt
 	ExpectBitOpNot(destKey string, key string) *ExpectedInt
 	ExpectBitPos(key string, bit int64, pos ...int64) *ExpectedInt
+	ExpectBitPosSpan(key string, bit int8, start, end int64, span string) *ExpectedInt
 	ExpectBitField(key string, args ...interface{}) *ExpectedIntSlice
 
 	ExpectScan(cursor uint64, match string, count int64) *ExpectedScan
@@ -127,6 +128,7 @@ type baseMock interface {
 	ExpectBLMPop(timeout time.Duration, direction string, count int64, keys ...string) *ExpectedKeyValues
 	ExpectBRPop(timeout time.Duration, keys ...string) *ExpectedStringSlice
 	ExpectBRPopLPush(source, destination string, timeout time.Duration) *ExpectedString
+	ExpectLCS(q *redis.LCSQuery) *ExpectedLCS
 	ExpectLIndex(key string, index int64) *ExpectedString
 	ExpectLInsert(key, op string, pivot, value interface{}) *ExpectedInt
 	ExpectLInsertBefore(key string, pivot, value interface{}) *ExpectedInt
@@ -1203,6 +1205,24 @@ func (cmd *ExpectedFunctionList) inflow(c redis.Cmder) {
 
 // ------------------------------------------------------------
 
+type ExpectedLCS struct {
+	expectedBase
+
+	val *redis.LCSMatch
+}
+
+func (cmd *ExpectedLCS) SetVal(val *redis.LCSMatch) {
+	cmd.setVal = true
+	v := *val
+	cmd.val = &v
+}
+
+func (cmd *ExpectedLCS) inflow(c redis.Cmder) {
+	inflow(c, "val", cmd.val)
+}
+
+// ------------------------------------------------------------
+
 type ExpectedError 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.20230320053549-153a9efb96ab
+	github.com/redis/go-redis/v9 v9.0.3-0.20230324073811-6790337e5ddf
 )
 
 require (

go.sum

@@ -38,8 +38,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.0.3-0.20230320053549-153a9efb96ab h1:9vEuFJboLo5/XLjeDN+8emgtKhVCr96KQGXx2y091O8=
-github.com/redis/go-redis/v9 v9.0.3-0.20230320053549-153a9efb96ab/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
+github.com/redis/go-redis/v9 v9.0.3-0.20230324073811-6790337e5ddf h1:QHQ3H0F7NrEOmIl6rMJjZemysCDIAbE8Tg7+yOmrGM8=
+github.com/redis/go-redis/v9 v9.0.3-0.20230324073811-6790337e5ddf/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 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/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

mock.go

@@ -942,6 +942,13 @@ func (m *mock) ExpectBitPos(key string, bit int64, pos ...int64) *ExpectedInt {
 	return e
 }
 
+func (m *mock) ExpectBitPosSpan(key string, bit int8, start, end int64, span string) *ExpectedInt {
+	e := &ExpectedInt{}
+	e.cmd = m.factory.BitPosSpan(m.ctx, key, bit, start, end, span)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectBitField(key string, args ...interface{}) *ExpectedIntSlice {
 	e := &ExpectedIntSlice{}
 	e.cmd = m.factory.BitField(m.ctx, key, args...)
@@ -1117,6 +1124,13 @@ func (m *mock) ExpectBRPopLPush(source, destination string, timeout time.Duratio
 	return e
 }
 
+func (m *mock) ExpectLCS(q *redis.LCSQuery) *ExpectedLCS {
+	e := &ExpectedLCS{}
+	e.cmd = m.factory.LCS(m.ctx, q)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectLIndex(key string, index int64) *ExpectedString {
 	e := &ExpectedString{}
 	e.cmd = m.factory.LIndex(m.ctx, key, index)

mock_test.go

@@ -1460,3 +1460,55 @@ func operationFunctionListCmd(base baseMock, expected func() *ExpectedFunctionLi
 	Expect(err).NotTo(HaveOccurred())
 	Expect(val).To(Equal(libs))
 }
+
+func operationLCSCmd(base baseMock, expected func() *ExpectedLCS, actual func() *redis.LCSCmd) {
+	var (
+		setErr = errors.New("lcs cmd error")
+		val    *redis.LCSMatch
+		err    error
+	)
+
+	base.ClearExpect()
+	expected().SetErr(setErr)
+	val, err = actual().Result()
+	Expect(err).To(Equal(setErr))
+	Expect(val).To(BeNil())
+
+	base.ClearExpect()
+	expected()
+	val, err = actual().Result()
+	Expect(err).To(HaveOccurred())
+	Expect(val).To(BeNil())
+
+	lcs := &redis.LCSMatch{
+		MatchString: "match string",
+	}
+
+	base.ClearExpect()
+	expected().SetVal(lcs)
+	val, err = actual().Result()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(val).To(Equal(lcs))
+
+	lcs = &redis.LCSMatch{
+		MatchString: "",
+		Matches: []redis.LCSMatchedPosition{
+			{
+				Key1:     redis.LCSPosition{Start: 3, End: 5},
+				Key2:     redis.LCSPosition{Start: 1, End: 3},
+				MatchLen: 2,
+			},
+			{
+				Key1:     redis.LCSPosition{Start: 5, End: 8},
+				Key2:     redis.LCSPosition{Start: 2, End: 5},
+				MatchLen: 3,
+			},
+		},
+		Len: 3,
+	}
+	base.ClearExpect()
+	expected().SetVal(lcs)
+	val, err = actual().Result()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(val).To(Equal(lcs))
+}