fix

Signed-off-by: ekexium <[email protected]>

tikv/kv.go

@@ -951,12 +951,6 @@ func WithPipelinedMemDB() TxnOption {
 	}
 }
 
-func WithPrewriteEncounterLockPolicy(policy transaction.PrewriteEncounterLockPolicy) TxnOption {
-	return func(st *transaction.TxnOptions) {
-		st.PrewriteEncounterLockPolicy = policy
-	}
-}
-
 // TODO: remove once tidb and br are ready
 
 // KVTxn contains methods to interact with a TiKV transaction.

txnkv/transaction/prewrite.go

@@ -459,7 +459,7 @@ func (action actionPrewrite) handleSingleBatch(
 			// TiKV will return a PessimisticLockNotFound error directly if it encounters a different lock. Otherwise,
 			// TiKV returns lock.TTL = 0, and we still need to resolve the lock.
 			if (lock.TxnID > c.startTS && !c.isPessimistic) ||
-				c.txn.prewriteEncounterLockPolicy == TryResolvePolicy {
+				c.txn.prewriteEncounterLockPolicy == NoResolvePolicy {
 				return tikverr.NewErrWriteConflictWithArgs(
 					c.startTS,
 					lock.TxnID,

txnkv/transaction/txn.go

@@ -115,11 +115,11 @@ type TxnOptions struct {
 	TxnScope       string
 	StartTS        *uint64
 	PipelinedMemDB bool
-	PrewriteEncounterLockPolicy PrewriteEncounterLockPolicy
 }
 
 // PrewriteEncounterLockPolicy specifies the policy when prewrite encounters locks.
 type PrewriteEncounterLockPolicy int
+
 const (
 	// TryResolvePolicy is the default one: try to resolve those locks with smaller startTS.
 	TryResolvePolicy PrewriteEncounterLockPolicy = iota
@@ -496,6 +496,11 @@ func (txn *KVTxn) SetAssertionLevel(assertionLevel kvrpcpb.AssertionLevel) {
 	txn.assertionLevel = assertionLevel
 }
 
+// SetPrewriteEncounterLockPolicy specifies the behavior when prewrite encounters locks.
+func (txn *KVTxn) SetPrewriteEncounterLockPolicy(policy PrewriteEncounterLockPolicy) {
+	txn.prewriteEncounterLockPolicy = policy
+}
+
 // IsPessimistic returns true if it is pessimistic.
 func (txn *KVTxn) IsPessimistic() bool {
 	return txn.isPessimistic