Fix appHash panic by Rbt.ScanAllShortKeys scan key random

smartbch · Jan 24, 2024 · 8218966 · 8218966
1 parent 8f34632
commit 8218966
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ebp/engine.go b/ebp/engine.go
@@ -655,13 +655,11 @@ func (exec *txEngine) checkTxDepsAndUptStandbyQ(txRange *TxRange, txBundle, igno
 		Runners[idx].Ctx.Rbt.ScanAllShortKeys(func(key [rabbit.KeySize]byte, dirty bool) (stop bool) {
 			k := binary.LittleEndian.Uint64(key[:])
 			rwList.add(k, dirty)
-			if _, ok := touchedSet[k]; ok {
+			if _, ok := touchedSet[k]; ok && canCommit {
 				canCommit = false // cannot commit if conflicts with touched KV set
 				Runners[idx].Status = types.FAILED_TO_COMMIT
-				return true
-			} else {
-				return false
 			}
+			return false
 		})
 		if canCommit { // record the dirty KVs written by a committable TX into toucchedSet
 			rwList.updateTouchedSet(touchedSet)