Expire -> ExpiryInSeconds (#1721)

Signed-off-by: seeflood <349895584@qq.com>

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)
 	}

lock/redis/standalone_test.go

@@ -101,7 +101,7 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 	resp, err := comp.TryLock(&lock.TryLockRequest{
 		ResourceID:      resourceID,
 		LockOwner:       ownerID1,
-		Expire:     10,
+		ExpiryInSeconds: 10,
 	})
 	assert.NoError(t, err)
 	assert.True(t, resp.Success)
@@ -113,7 +113,7 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 		resp2, err2 := comp.TryLock(&lock.TryLockRequest{
 			ResourceID:      resourceID,
 			LockOwner:       owner2,
-			Expire:     10,
+			ExpiryInSeconds: 10,
 		})
 		assert.NoError(t, err2)
 		assert.False(t, resp2.Success)
@@ -134,7 +134,7 @@ func TestStandaloneRedisLock_TryLock(t *testing.T) {
 		resp2, err2 := comp.TryLock(&lock.TryLockRequest{
 			ResourceID:      resourceID,
 			LockOwner:       owner2,
-			Expire:     10,
+			ExpiryInSeconds: 10,
 		})
 		assert.NoError(t, err2)
 		assert.True(t, resp2.Success, "client2 failed to get lock?!")

lock/requests.go

@@ -17,7 +17,7 @@ package lock
 type TryLockRequest struct {
 	ResourceID      string
 	LockOwner       string
-	Expire     int32
+	ExpiryInSeconds int32
 }
 
 // Lock release request.