store/tikv: remove use of Enable1PC transaction option in store/tikv

Signed-off-by: disksing <i@disksing.com>
pingcap · Apr 28, 2021 · 9ac4918 · 9ac4918
1 parent 75be70c
commit 9ac4918
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/store/driver/txn/txn_driver.go b/store/driver/txn/txn_driver.go
@@ -136,6 +136,8 @@ func (txn *tikvTxn) SetOption(opt int, val interface{}) {
 		txn.KVTxn.GetSnapshot().SetIsolationLevel(level)
 	case tikvstore.Pessimistic:
 		txn.SetPessimistic(val.(bool))
+	case tikvstore.Enable1PC:
+		txn.SetEnable1PC(val.(bool))
 	default:
 		txn.KVTxn.SetOption(opt, val)
 	}

diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
@@ -854,8 +854,7 @@ func (c *twoPhaseCommitter) checkOnePC() bool {
 		return false
 	}
 
-	enable1PCOption := c.txn.us.GetOption(kv.Enable1PC)
-	return c.sessionID > 0 && !c.shouldWriteBinlog() && enable1PCOption != nil && enable1PCOption.(bool)
+	return c.sessionID > 0 && !c.shouldWriteBinlog() && c.txn.enable1PC
 }
 
 func (c *twoPhaseCommitter) needLinearizability() bool {

diff --git a/store/tikv/tests/1pc_test.go b/store/tikv/tests/1pc_test.go
@@ -27,7 +27,7 @@ import (
 func (s *testAsyncCommitCommon) begin1PC(c *C) tikv.TxnProbe {
 	txn, err := s.store.Begin()
 	c.Assert(err, IsNil)
-	txn.SetOption(kv.Enable1PC, true)
+	txn.SetEnable1PC(true)
 	return tikv.TxnProbe{KVTxn: txn}
 }
 

diff --git a/store/tikv/tests/snapshot_fail_test.go b/store/tikv/tests/snapshot_fail_test.go
@@ -211,7 +211,7 @@ func (s *testSnapshotFailSuite) TestRetryPointGetResolveTS(c *C) {
 	err = txn.Set([]byte("k2"), []byte("v2"))
 	c.Assert(err, IsNil)
 	txn.SetOption(kv.EnableAsyncCommit, false)
-	txn.SetOption(kv.Enable1PC, false)
+	txn.SetEnable1PC(false)
 	txn.SetOption(kv.GuaranteeLinearizability, false)
 
 	// Prewrite the lock without committing it

diff --git a/store/tikv/txn.go b/store/tikv/txn.go
@@ -77,6 +77,7 @@ type KVTxn struct {
 	binlog             BinlogExecutor
 	schemaLeaseChecker SchemaLeaseChecker
 	isPessimistic      bool
+	enable1PC          bool
 	kvFilter           KVFilter
 }
 
@@ -211,6 +212,11 @@ func (txn *KVTxn) SetPessimistic(b bool) {
 	txn.isPessimistic = b
 }
 
+// SetEnable1PC indicates if the transaction will try to use 1 phase commit.
+func (txn *KVTxn) SetEnable1PC(b bool) {
+	txn.enable1PC = b
+}
+
 // SetKVFilter sets the filter to ignore key-values in memory buffer.
 func (txn *KVTxn) SetKVFilter(filter KVFilter) {
 	txn.kvFilter = filter