From 9bb86a08a656bc602da9e55921cd2ee2d38dc96e Mon Sep 17 00:00:00 2001
From: seeflood <349895584@qq.com>
Date: Thu, 12 May 2022 19:13:21 +0800
Subject: [PATCH] Expire -> ExpiryInSeconds (#1721)

Signed-off-by: seeflood <349895584@qq.com>
---
 lock/redis/standalone.go      |  2 +-
 lock/redis/standalone_test.go | 18 +++++++++---------
 lock/requests.go              |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lock/redis/standalone.go b/lock/redis/standalone.go
index 239b7bdf6..cff7fe5e8 100644
--- a/lock/redis/standalone.go
+++ b/lock/redis/standalone.go
@@ -131,7 +131,7 @@ func (r *StandaloneRedisLock) parseConnectedSlaves(res string) int {
 // Try to acquire a redis lock.
 func (r *StandaloneRedisLock) TryLock(req *lock.TryLockRequest) (*lock.TryLockResponse, error) {
 	// 1.Setting redis expiration time
-	nx := r.client.SetNX(r.ctx, req.ResourceID, req.LockOwner, time.Second*time.Duration(req.Expire))
+	nx := r.client.SetNX(r.ctx, req.ResourceID, req.LockOwner, time.Second*time.Duration(req.ExpiryInSeconds))
 	if nx == nil {
 		return &lock.TryLockResponse{}, fmt.Errorf("[standaloneRedisLock]: SetNX returned nil.ResourceID: %s", req.ResourceID)
 	}
diff --git a/lock/redis/standalone_test.go b/lock/redis/standalone_test.go
index 52602a7d6..d0dd81ec9 100644
--- a/lock/redis/standalone_test.go
+++ b/lock/redis/standalone_test.go
@@ -99,9 +99,9 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 	// 1. client1 trylock
 	ownerID1 := uuid.New().String()
 	resp, err := comp.TryLock(&lock.TryLockRequest{
-		ResourceID: resourceID,
-		LockOwner:  ownerID1,
-		Expire:     10,
+		ResourceID:      resourceID,
+		LockOwner:       ownerID1,
+		ExpiryInSeconds: 10,
 	})
 	assert.NoError(t, err)
 	assert.True(t, resp.Success)
@@ -111,9 +111,9 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 	go func() {
 		owner2 := uuid.New().String()
 		resp2, err2 := comp.TryLock(&lock.TryLockRequest{
-			ResourceID: resourceID,
-			LockOwner:  owner2,
-			Expire:     10,
+			ResourceID:      resourceID,
+			LockOwner:       owner2,
+			ExpiryInSeconds: 10,
 		})
 		assert.NoError(t, err2)
 		assert.False(t, resp2.Success)
@@ -132,9 +132,9 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 	go func() {
 		owner2 := uuid.New().String()
 		resp2, err2 := comp.TryLock(&lock.TryLockRequest{
-			ResourceID: resourceID,
-			LockOwner:  owner2,
-			Expire:     10,
+			ResourceID:      resourceID,
+			LockOwner:       owner2,
+			ExpiryInSeconds: 10,
 		})
 		assert.NoError(t, err2)
 		assert.True(t, resp2.Success, "client2 failed to get lock?!")
diff --git a/lock/requests.go b/lock/requests.go
index 9efbbbfc4..9a68ab19f 100644
--- a/lock/requests.go
+++ b/lock/requests.go
@@ -15,9 +15,9 @@ package lock
 
 // Lock acquire request.
 type TryLockRequest struct {
-	ResourceID string
-	LockOwner  string
-	Expire     int32
+	ResourceID      string
+	LockOwner       string
+	ExpiryInSeconds int32
 }
 
 // Lock release request.