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) #14495

Merged
merged 2 commits into from
Jan 16, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0785f37
session: if txn invalid do not active it and return an error (#13935)
jackysp Dec 9, 2019
779dea1
Merge branch 'release-2.1' into validtxn21
sre-bot Jan 16, 2020
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/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ func (b *executorBuilder) getStartTS() (uint64, error) {
if err != nil {
return 0, errors.Trace(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 @@ -2370,7 +2370,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 @@ -154,7 +154,7 @@ func (e *PointGetExecutor) encodeIndexKey() (_ []byte, err error) {
}

func (e *PointGetExecutor) get(key kv.Key) (val []byte, err error) {
txn, err := e.ctx.Txn(true)
txn, err := e.ctx.Txn(false)
if err != nil {
return nil, errors.Trace(err)
}
Expand Down
2 changes: 1 addition & 1 deletion executor/simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (e *SimpleExec) executeRollback(s *ast.RollbackStmt) error {
sessVars := e.ctx.GetSessionVars()
logutil.Logger(context.Background()).Debug("execute rollback statement", zap.Uint64("conn", sessVars.ConnectionID))
sessVars.SetStatusFlag(mysql.ServerStatusInTrans, false)
txn, err := e.ctx.Txn(true)
txn, err := e.ctx.Txn(false)
if err != nil {
return errors.Trace(err)
}
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 @@ -1047,6 +1047,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 @@ -242,7 +242,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 @@ -330,7 +330,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 @@ -623,7 +625,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