update config

pingcap · Apr 29, 2019 · 41d79c7 · 41d79c7
1 parent 89c134e
commit 41d79c7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -289,6 +289,7 @@ type Plugin struct {
 // PessimisticTxn is the config for pessimistic transaction.
 type PessimisticTxn struct {
 	Enable        bool   `toml:"enable" json:"enable"`
+	Default       bool   `toml:"default" json:"default"`
 	MaxRetryCount uint   `toml:"max-retry-count" json:"max-retry-count"`
 	TTL           uint64 `toml:"ttl" json:"ttl"`
 }
@@ -378,6 +379,7 @@ var defaultConf = Config{
 	},
 	PessimisticTxn: PessimisticTxn{
 		Enable:        false,
+		Default:       false,
 		MaxRetryCount: 256,
 		TTL:           60 * 1000,
 	},

diff --git a/config/config.toml.example b/config/config.toml.example
@@ -285,9 +285,12 @@ binlog-socket = ""
 strategy = "range"
 
 [pessimistic-txn]
-# enable pessimistic transaction by default.
+# enable pessimistic transaction.
 enable = false
 
+# start pessimistic transaction by default.
+default = false
+
 # max retry count for a statement in a pessimistic transaction.
 max-retry-count = 256
 

diff --git a/executor/simple.go b/executor/simple.go
@@ -307,7 +307,8 @@ func (e *SimpleExec) executeBegin(ctx context.Context, s *ast.BeginStmt) error {
 	if err != nil {
 		return err
 	}
-	if s.Pessimistic || config.GetGlobalConfig().PessimisticTxn.Enable || e.ctx.GetSessionVars().PessimisticLock {
+	pTxnConf := config.GetGlobalConfig().PessimisticTxn
+	if pTxnConf.Enable && (s.Pessimistic || pTxnConf.Default || e.ctx.GetSessionVars().PessimisticLock) {
 		txn.SetOption(kv.Pessimistic, true)
 	}
 	return nil

diff --git a/session/session_test.go b/session/session_test.go
@@ -2550,6 +2550,9 @@ func (s *testSessionSuite) TestTxnGoString(c *C) {
 }
 
 func (s *testSessionSuite) TestPessimisticTxn(c *C) {
+	if !config.GetGlobalConfig().PessimisticTxn.Enable {
+		c.Skip("pessimistic transaction is not enabled")
+	}
 	tk := testkit.NewTestKitWithInit(c, s.store)
 	// Make the name has different indent for easier read.
 	tk1 := testkit.NewTestKitWithInit(c, s.store)