From 6edb1529ff7b40ea076e5c3faa3b6ecf91344027 Mon Sep 17 00:00:00 2001
From: Monkey <golang@88.com>
Date: Wed, 12 Apr 2023 20:17:10 +0800
Subject: [PATCH] test: redis-version to 7.2-rc1 (#2532)

* test: redis-version to 7.2-rc1

Signed-off-by: monkey92t <golang@88.com>
---
 .github/workflows/build.yml |  2 +-
 Makefile                    |  2 +-
 command.go                  | 38 +++++++++++++++++++++++++------------
 commands_test.go            |  8 ++++++--
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddcf9c07..3526b031 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
 
     services:
       redis:
-        image: redis
+        image: redis:7.2-rc
         options: >-
           --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
diff --git a/Makefile b/Makefile
index 0c66da1b..285f65dd 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ bench: testdeps
 
 testdata/redis:
 	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.0.10.tar.gz | tar xvz --strip-components=1 -C $@
+	wget -qO- https://download.redis.io/releases/redis-7.2-rc1.tar.gz | tar xvz --strip-components=1 -C $@
 
 testdata/redis/src/redis-server: testdata/redis
 	cd $< && make all
diff --git a/command.go b/command.go
index 21abe11c..fc1ee8ac 100644
--- a/command.go
+++ b/command.go
@@ -1892,9 +1892,10 @@ type XInfoConsumersCmd struct {
 }
 
 type XInfoConsumer struct {
-	Name    string
-	Pending int64
-	Idle    time.Duration
+	Name     string
+	Pending  int64
+	Idle     time.Duration
+	Inactive time.Duration
 }
 
 var _ Cmder = (*XInfoConsumersCmd)(nil)
@@ -1932,12 +1933,13 @@ func (cmd *XInfoConsumersCmd) readReply(rd *proto.Reader) error {
 	cmd.val = make([]XInfoConsumer, n)
 
 	for i := 0; i < len(cmd.val); i++ {
-		if err = rd.ReadFixedMapLen(3); err != nil {
+		nn, err := rd.ReadMapLen()
+		if err != nil {
 			return err
 		}
 
 		var key string
-		for f := 0; f < 3; f++ {
+		for f := 0; f < nn; f++ {
 			key, err = rd.ReadString()
 			if err != nil {
 				return err
@@ -1952,6 +1954,10 @@ func (cmd *XInfoConsumersCmd) readReply(rd *proto.Reader) error {
 				var idle int64
 				idle, err = rd.ReadInt()
 				cmd.val[i].Idle = time.Duration(idle) * time.Millisecond
+			case "inactive":
+				var inactive int64
+				inactive, err = rd.ReadInt()
+				cmd.val[i].Inactive = time.Duration(inactive) * time.Millisecond
 			default:
 				return fmt.Errorf("redis: unexpected content %s in XINFO CONSUMERS reply", key)
 			}
@@ -2226,10 +2232,11 @@ type XInfoStreamGroupPending struct {
 }
 
 type XInfoStreamConsumer struct {
-	Name     string
-	SeenTime time.Time
-	PelCount int64
-	Pending  []XInfoStreamConsumerPending
+	Name       string
+	SeenTime   time.Time
+	ActiveTime time.Time
+	PelCount   int64
+	Pending    []XInfoStreamConsumerPending
 }
 
 type XInfoStreamConsumerPending struct {
@@ -2452,13 +2459,14 @@ func readXInfoStreamConsumers(rd *proto.Reader) ([]XInfoStreamConsumer, error) {
 	consumers := make([]XInfoStreamConsumer, 0, n)
 
 	for i := 0; i < n; i++ {
-		if err = rd.ReadFixedMapLen(4); err != nil {
+		nn, err := rd.ReadMapLen()
+		if err != nil {
 			return nil, err
 		}
 
 		c := XInfoStreamConsumer{}
 
-		for f := 0; f < 4; f++ {
+		for f := 0; f < nn; f++ {
 			cKey, err := rd.ReadString()
 			if err != nil {
 				return nil, err
@@ -2472,7 +2480,13 @@ func readXInfoStreamConsumers(rd *proto.Reader) ([]XInfoStreamConsumer, error) {
 				if err != nil {
 					return nil, err
 				}
-				c.SeenTime = time.Unix(seen/1000, seen%1000*int64(time.Millisecond))
+				c.SeenTime = time.UnixMilli(seen)
+			case "active-time":
+				active, err := rd.ReadInt()
+				if err != nil {
+					return nil, err
+				}
+				c.ActiveTime = time.UnixMilli(active)
 			case "pel-count":
 				c.PelCount, err = rd.ReadInt()
 			case "pending":
diff --git a/commands_test.go b/commands_test.go
index 72b2bb23..89dcf932 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -5749,7 +5749,9 @@ var _ = Describe("Commands", func() {
 					}
 					for k3, c := range g.Consumers {
 						Expect(now.Sub(c.SeenTime)).To(BeNumerically("<=", maxElapsed))
+						Expect(now.Sub(c.ActiveTime)).To(BeNumerically("<=", maxElapsed))
 						res.Groups[k].Consumers[k3].SeenTime = time.Time{}
+						res.Groups[k].Consumers[k3].ActiveTime = time.Time{}
 
 						for k4, p := range c.Pending {
 							Expect(now.Sub(p.DeliveryTime)).To(BeNumerically("<=", maxElapsed))
@@ -5773,10 +5775,12 @@ var _ = Describe("Commands", func() {
 				Expect(err).NotTo(HaveOccurred())
 				for i := range res {
 					res[i].Idle = 0
+					res[i].Inactive = 0
 				}
+
 				Expect(res).To(Equal([]redis.XInfoConsumer{
-					{Name: "consumer1", Pending: 2, Idle: 0},
-					{Name: "consumer2", Pending: 1, Idle: 0},
+					{Name: "consumer1", Pending: 2, Idle: 0, Inactive: 0},
+					{Name: "consumer2", Pending: 1, Idle: 0, Inactive: 0},
 				}))
 			})
 		})