Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

session: if txn invalid do not active it and return an error #13935

Merged
merged 9 commits into from
Dec 9, 2019
Merged

session: if txn invalid do not active it and return an error #13935

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
65ce3d2
session: if txn invalid do not active it and return an error
jackysp Dec 5, 2019
ce55f69
add a test
jackysp Dec 5, 2019
8a80509
fix bootstrap
jackysp Dec 5, 2019
2c8d5ac
fix test
jackysp Dec 5, 2019
1924800
fix test
jackysp Dec 5, 2019
331f5a1
address comments
jackysp Dec 6, 2019
77a5da8
fix wrong modify
jackysp Dec 6, 2019
b1355ae
address comments
jackysp Dec 6, 2019
0b7c417
Merge branch 'master' into pess_panic
sre-bot Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion executor/batch_point_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (e *BatchPointGetExec) initialize(ctx context.Context) error {
return err
}

txn, err := e.ctx.Txn(true)
txn, err := e.ctx.Txn(false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to check all these Txn(true) usages, seems many

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've checked all of them. In another way, if Txn(true), it prefers to return an error when txn is invalid, but all the tests passed.

if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion executor/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ func (b *executorBuilder) getStartTS() (uint64, error) {
if err != nil {
return 0, err
}
if startTS == 0 && txn.Valid() {
if startTS == 0 {
startTS = txn.StartTS()
}
b.startTS = startTS
Expand Down
2 changes: 1 addition & 1 deletion executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2652,7 +2652,7 @@ func (s *testSuite) TestSelectForUpdate(c *C) {
tk.MustExec("drop table if exists t, t1")

txn, err := tk.Se.Txn(true)
c.Assert(err, IsNil)
c.Assert(kv.ErrInvalidTxn.Equal(err), IsTrue)
c.Assert(txn.Valid(), IsFalse)
tk.MustExec("create table t (c1 int, c2 int, c3 int)")
tk.MustExec("insert t values (11, 2, 3)")
Expand Down
2 changes: 1 addition & 1 deletion executor/point_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (e *PointGetExecutor) lockKeyIfNeeded(ctx context.Context, key []byte) erro
}

func (e *PointGetExecutor) get(ctx context.Context, key kv.Key) (val []byte, err error) {
txn, err := e.ctx.Txn(true)
txn, err := e.ctx.Txn(false)
if err != nil {
return nil, err
}
Expand Down
17 changes: 7 additions & 10 deletions executor/simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,17 +625,14 @@ func (e *SimpleExec) executeRollback(s *ast.RollbackStmt) error {
if err != nil {
return err
}
if txn.Valid() {
duration := time.Since(sessVars.TxnCtx.CreateTime).Seconds()
if sessVars.InRestrictedSQL {
transactionDurationInternalRollback.Observe(duration)
} else {
transactionDurationGeneralRollback.Observe(duration)
}
sessVars.TxnCtx.ClearDelta()
return txn.Rollback()
duration := time.Since(sessVars.TxnCtx.CreateTime).Seconds()
if sessVars.InRestrictedSQL {
transactionDurationInternalRollback.Observe(duration)
} else {
transactionDurationGeneralRollback.Observe(duration)
}
return nil
sessVars.TxnCtx.ClearDelta()
return txn.Rollback()
jackysp marked this conversation as resolved.
Show resolved Hide resolved
}

func (e *SimpleExec) executeCreateUser(ctx context.Context, s *ast.CreateUserStmt) error {
Expand Down
3 changes: 3 additions & 0 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,9 @@ func (s *session) DropPreparedStmt(stmtID uint32) error {
}

func (s *session) Txn(active bool) (kv.Transaction, error) {
if !s.txn.validOrPending() && active {
return &s.txn, kv.ErrInvalidTxn
}
if s.txn.pending() && active {
// Transaction is lazy initialized.
// PrepareTxnCtx is called to get a tso future, makes s.txn a pending txn,
Expand Down
8 changes: 5 additions & 3 deletions session/session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func (s *testSessionSuite) TestRowLock(c *C) {

tk.MustExec("drop table if exists t")
txn, err := tk.Se.Txn(true)
c.Assert(err, IsNil)
c.Assert(kv.ErrInvalidTxn.Equal(err), IsTrue)
c.Assert(txn.Valid(), IsFalse)
tk.MustExec("create table t (c1 int, c2 int, c3 int)")
tk.MustExec("insert t values (11, 2, 3)")
Expand Down Expand Up @@ -389,7 +389,9 @@ func (s *testSessionSuite) TestTxnLazyInitialize(c *C) {
tk.MustExec("create table t (id int)")

tk.MustExec("set @@autocommit = 0")
txn, err := tk.Se.Txn(false)
txn, err := tk.Se.Txn(true)
c.Assert(kv.ErrInvalidTxn.Equal(err), IsTrue)
txn, err = tk.Se.Txn(false)
c.Assert(err, IsNil)
c.Assert(txn.Valid(), IsFalse)
tk.MustQuery("select @@tidb_current_ts").Check(testkit.Rows("0"))
Expand Down Expand Up @@ -719,7 +721,7 @@ func (s *testSessionSuite) TestRetryPreparedStmt(c *C) {

tk.MustExec("drop table if exists t")
txn, err := tk.Se.Txn(true)
c.Assert(err, IsNil)
c.Assert(kv.ErrInvalidTxn.Equal(err), IsTrue)
c.Assert(txn.Valid(), IsFalse)
tk.MustExec("create table t (c1 int, c2 int, c3 int)")
tk.MustExec("insert t values (11, 2, 3)")
Expand Down