Correct whether Lock initially times out and whether the initial valu…

…e of expiration is true
snower · May 18, 2024 · 168a228 · 168a228
1 parent 3cf2c9c
commit 168a228
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/client/slock_test.go b/client/slock_test.go
@@ -11,14 +11,8 @@ var testGlock sync.Mutex
 
 func testString2Key(key string) [16]byte {
 	bkey := [16]byte{}
-	klen := 16
-	if len(key) < 16 {
-		klen = len(key)
-	}
-
-	for i := 0; i < klen; i++ {
-		bkey[i] = key[i]
-	}
+	textCommandConverter := protocol.NewTextCommandConverter()
+	textCommandConverter.ConvertArgId2LockId(key, &bkey)
 	return bkey
 }
 

diff --git a/server/lock.go b/server/lock.go
@@ -738,7 +738,7 @@ type Lock struct {
 
 func NewLock(manager *LockManager, protocol ServerProtocol, command *protocol.LockCommand) *Lock {
 	return &Lock{manager, command, protocol.GetProxy(), nil, 0, 0, 0,
-		0, 1, 1, 0, 0, 0xff, false, false, 0, false}
+		0, 1, 1, 0, 0, 0xff, true, true, 0, false}
 }
 
 func (self *Lock) GetDB() *LockDB {