From 7e5efb0e307054984277cb2b0802d3cec7af4a3e Mon Sep 17 00:00:00 2001
From: Ken Hibino <ken.hibino7@gmail.com>
Date: Sun, 20 Feb 2022 05:40:09 -0800
Subject: [PATCH] Drop GT option from RDB.ExtendLease

GT option in ZAdd is supported for redis v6.2.0 or above.
This Change fixes redis version compatibility (currently v4.0+)
---
 internal/rdb/rdb.go      |  7 ++++---
 internal/rdb/rdb_test.go | 16 ----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/internal/rdb/rdb.go b/internal/rdb/rdb.go
index e6cdd63..864274d 100644
--- a/internal/rdb/rdb.go
+++ b/internal/rdb/rdb.go
@@ -936,12 +936,13 @@ func (r *RDB) ListLeaseExpired(cutoff time.Time, qnames ...string) ([]*base.Task
 // It returns a new expiration time if the operation was successful.
 func (r *RDB) ExtendLease(qname string, ids ...string) (expirationTime time.Time, err error) {
 	expireAt := r.clock.Now().Add(LeaseDuration)
-	var zs []redis.Z
+	var zs []*redis.Z
 	for _, id := range ids {
-		zs = append(zs, redis.Z{Member: id, Score: float64(expireAt.Unix())})
+		zs = append(zs, &redis.Z{Member: id, Score: float64(expireAt.Unix())})
 	}
 	// Use XX option to only update elements that already exist; Don't add new elements
-	err = r.client.ZAddArgs(context.Background(), base.LeaseKey(qname), redis.ZAddArgs{XX: true, GT: true, Members: zs}).Err()
+	// TODO: Consider adding GT option to ensure we only "extend" the lease. Ceveat is that GT is supported from redis v6.2.0 or above.
+	err = r.client.ZAddXX(context.Background(), base.LeaseKey(qname), zs...).Err()
 	if err != nil {
 		return time.Time{}, err
 	}
diff --git a/internal/rdb/rdb_test.go b/internal/rdb/rdb_test.go
index 0a62ea0..b7ad806 100644
--- a/internal/rdb/rdb_test.go
+++ b/internal/rdb/rdb_test.go
@@ -2353,22 +2353,6 @@ func TestExtendLease(t *testing.T) {
 				},
 			},
 		},
-		{
-			desc: "Should not add shorten the lease expiration time",
-			lease: map[string][]base.Z{
-				"default": {
-					{Message: t1, Score: now.Add(LeaseDuration).Add(10 * time.Second).Unix()},
-				},
-			},
-			qname:              "default",
-			ids:                []string{t1.ID},
-			wantExpirationTime: now.Add(LeaseDuration),
-			wantLease: map[string][]base.Z{
-				"default": {
-					{Message: t1, Score: now.Add(LeaseDuration).Add(10 * time.Second).Unix()},
-				},
-			},
-		},
 	}
 
 	for _, tc := range tests {