Optimize the set command with the NX option, add the default waiting …

…timeout and correct the aof check logic
snower · May 18, 2024 · 9bf96e5 · 9bf96e5
1 parent 973feec
commit 9bf96e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/protocol/textcommand.go b/protocol/textcommand.go
@@ -456,6 +456,9 @@ func (self *TextCommandConverter) ConvertTextSetCommand(textProtocol ITextProtoc
 			return nil, nil, err
 		}
 	}
+	if lockCommand.Flag&LOCK_FLAG_UPDATE_WHEN_LOCKED == 0 && lockCommand.Timeout == 0 && lockCommand.TimeoutFlag == 0 {
+		lockCommand.Timeout = 15
+	}
 	if lockCommand.Expried == 0 && lockCommand.ExpriedFlag == 0 {
 		lockCommand.Expried = 0x7fff
 		lockCommand.ExpriedFlag = EXPRIED_FLAG_UNLIMITED_EXPRIED_TIME | EXPRIED_FLAG_ZEOR_AOF_TIME | EXPRIED_FLAG_UPDATE_NO_RESET_EXPRIED_CHECKED_COUNT

diff --git a/server/db.go b/server/db.go
@@ -1386,11 +1386,12 @@ func (self *LockDB) AddExpried(lock *Lock) {
 			self.slock.Log().Errorf("Database long expried wait index error %d %d", lock.longWaitIndex, lock.expriedTime)
 			lock.longWaitIndex = 0
 		}
-		if !lock.isAof && lock.aofTime != 0xff {
-			if self.currentTime-lock.startTime >= int64(lock.aofTime) {
-				for i := uint8(0); i < lock.locked; i++ {
-					_ = lock.manager.PushLockAof(lock, 0)
-				}
+	}
+
+	if !lock.isAof && lock.aofTime != 0xff {
+		if self.currentTime-lock.startTime >= int64(lock.aofTime) {
+			for i := uint8(0); i < lock.locked; i++ {
+				_ = lock.manager.PushLockAof(lock, 0)
 			}
 		}
 	}