From 80609dda1249b187454fa67fb1e3f48f1b6ddac1 Mon Sep 17 00:00:00 2001 From: monkey Date: Sat, 24 Jul 2021 23:04:42 +0800 Subject: [PATCH 1/2] Upgrade redis-server version Signed-off-by: monkey --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5501164f9..b16709c8c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ bench: testdeps testdata/redis: mkdir -p $@ - wget -qO- https://download.redis.io/releases/redis-6.2.1.tar.gz | tar xvz --strip-components=1 -C $@ + wget -qO- https://download.redis.io/releases/redis-6.2.5.tar.gz | tar xvz --strip-components=1 -C $@ testdata/redis/src/redis-server: testdata/redis cd $< && make all From c49c29c281c28312f13935d9dc35504d89b8c8b5 Mon Sep 17 00:00:00 2001 From: monkey Date: Sat, 24 Jul 2021 23:34:37 +0800 Subject: [PATCH 2/2] XAutoClaim changed the return value Signed-off-by: monkey --- commands_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/commands_test.go b/commands_test.go index 12f75ccf6..736add761 100644 --- a/commands_test.go +++ b/commands_test.go @@ -4635,7 +4635,7 @@ var _ = Describe("Commands", func() { } msgs, start, err := client.XAutoClaim(ctx, xca).Result() Expect(err).NotTo(HaveOccurred()) - Expect(start).To(Equal("2-0")) + Expect(start).To(Equal("3-0")) Expect(msgs).To(Equal([]redis.XMessage{{ ID: "1-0", Values: map[string]interface{}{"uno": "un"}, @@ -4647,19 +4647,16 @@ var _ = Describe("Commands", func() { xca.Start = start msgs, start, err = client.XAutoClaim(ctx, xca).Result() Expect(err).NotTo(HaveOccurred()) - Expect(start).To(Equal("3-0")) + Expect(start).To(Equal("0-0")) Expect(msgs).To(Equal([]redis.XMessage{{ - ID: "2-0", - Values: map[string]interface{}{"dos": "deux"}, - }, { ID: "3-0", Values: map[string]interface{}{"tres": "troix"}, }})) ids, start, err := client.XAutoClaimJustID(ctx, xca).Result() Expect(err).NotTo(HaveOccurred()) - Expect(start).To(Equal("3-0")) - Expect(ids).To(Equal([]string{"2-0", "3-0"})) + Expect(start).To(Equal("0-0")) + Expect(ids).To(Equal([]string{"3-0"})) }) It("should XClaim", func() {