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

*: Txn() function signature refactor and remove ActivePendingTxn() (#8327) #8567

Merged
merged 2 commits into from
Dec 5, 2018
Merged

*: Txn() function signature refactor and remove ActivePendingTxn() (#8327) #8567

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
8d982a0
*: Txn() function signature refactor and remove ActivePendingTxn() (#…
tiancaiamao Dec 4, 2018
a4345a0
Merge branch 'release-2.1' into cherry-2.1-fix-txn
zz-jason Dec 5, 2018
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
6 changes: 3 additions & 3 deletions ddl/column_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
row := types.MakeDatums(1, 2)
h, err := originTable.AddRecord(ctx, row, false)
c.Assert(err, IsNil)
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

var mu sync.Mutex
Expand Down Expand Up @@ -127,7 +127,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
}
mu.Unlock()
}
err = hookCtx.Txn().Commit(context.Background())
err = hookCtx.Txn(true).Commit(context.Background())
if err != nil {
checkErr = errors.Trace(err)
}
Expand Down Expand Up @@ -179,7 +179,7 @@ func (s *testColumnChangeSuite) testAddColumnNoDefault(c *C, ctx sessionctx.Cont
checkErr = errors.Trace(err)
}
}
err = hookCtx.Txn().Commit(context.TODO())
err = hookCtx.Txn(true).Commit(context.TODO())
if err != nil {
checkErr = errors.Trace(err)
}
Expand Down
12 changes: 6 additions & 6 deletions ddl/column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@ func (s *testColumnSuite) checkColumnKVExist(ctx sessionctx.Context, t table.Tab
if err != nil {
return errors.Trace(err)
}
defer ctx.Txn().Commit(context.Background())
defer ctx.Txn(true).Commit(context.Background())
key := t.RecordKey(handle)
data, err := ctx.Txn().Get(key)
data, err := ctx.Txn(true).Get(key)
if !isExist {
if terror.ErrorEqual(err, kv.ErrNotExist) {
return nil
Expand Down Expand Up @@ -760,7 +760,7 @@ func (s *testColumnSuite) TestAddColumn(c *C) {
handle, err := t.AddRecord(ctx, oldRow, false)
c.Assert(err, IsNil)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

newColName := "c4"
Expand Down Expand Up @@ -823,7 +823,7 @@ func (s *testColumnSuite) TestAddColumn(c *C) {
job = testDropTable(c, ctx, d, s.dbInfo, tblInfo)
testCheckJobDone(c, d, job, false)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

d.Stop()
Expand All @@ -847,7 +847,7 @@ func (s *testColumnSuite) TestDropColumn(c *C) {
_, err = t.AddRecord(ctx, append(row, types.NewDatum(defaultColValue)), false)
c.Assert(err, IsNil)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

checkOK := false
Expand Down Expand Up @@ -896,7 +896,7 @@ func (s *testColumnSuite) TestDropColumn(c *C) {
job = testDropTable(c, ctx, d, s.dbInfo, tblInfo)
testCheckJobDone(c, d, job, false)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

d.Stop()
Expand Down
16 changes: 8 additions & 8 deletions ddl/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,12 +747,12 @@ LOOP:
// Make sure there is index with name c3_index.
c.Assert(nidx, NotNil)
c.Assert(nidx.Meta().ID, Greater, int64(0))
ctx.Txn().Rollback()
ctx.Txn(true).Rollback()

c.Assert(ctx.NewTxn(), IsNil)
defer ctx.Txn().Rollback()
defer ctx.Txn(true).Rollback()

it, err := nidx.SeekFirst(ctx.Txn())
it, err := nidx.SeekFirst(ctx.Txn(true))
c.Assert(err, IsNil)
defer it.Close()

Expand Down Expand Up @@ -848,9 +848,9 @@ func checkDelRangeDone(c *C, ctx sessionctx.Context, idx table.Index) {
handles := make(map[int64]struct{})

c.Assert(ctx.NewTxn(), IsNil)
defer ctx.Txn().Rollback()
defer ctx.Txn(true).Rollback()

it, err := idx.SeekFirst(ctx.Txn())
it, err := idx.SeekFirst(ctx.Txn(true))
c.Assert(err, IsNil)
defer it.Close()

Expand Down Expand Up @@ -1090,7 +1090,7 @@ LOOP:
i := 0
j := 0
ctx.NewTxn()
defer ctx.Txn().Rollback()
defer ctx.Txn(true).Rollback()
err = t.IterRecords(ctx, t.FirstKey(), t.Cols(),
func(h int64, data []types.Datum, cols []*table.Column) (bool, error) {
i++
Expand Down Expand Up @@ -3502,7 +3502,7 @@ func backgroundExecOnJobUpdatedExported(c *C, s *testDBSuite, hook *ddl.TestDDLC
return
}
jobIDs := []int64{job.ID}
errs, err := admin.CancelJobs(hookCtx.Txn(), jobIDs)
errs, err := admin.CancelJobs(hookCtx.Txn(true), jobIDs)
if err != nil {
checkErr = errors.Trace(err)
return
Expand All @@ -3512,7 +3512,7 @@ func backgroundExecOnJobUpdatedExported(c *C, s *testDBSuite, hook *ddl.TestDDLC
checkErr = errors.Trace(errs[0])
return
}
err = hookCtx.Txn().Commit(context.Background())
err = hookCtx.Txn(true).Commit(context.Background())
if err != nil {
checkErr = errors.Trace(err)
}
Expand Down
4 changes: 2 additions & 2 deletions ddl/ddl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func testNewDDL(ctx context.Context, etcdCli *clientv3.Client, store kv.Storage,
func getSchemaVer(c *C, ctx sessionctx.Context) int64 {
err := ctx.NewTxn()
c.Assert(err, IsNil)
m := meta.NewMeta(ctx.Txn())
m := meta.NewMeta(ctx.Txn(true))
ver, err := m.GetSchemaVersion()
c.Assert(err, IsNil)
return ver
Expand Down Expand Up @@ -156,7 +156,7 @@ func checkHistoryJob(c *C, job *model.Job) {
}

func checkHistoryJobArgs(c *C, ctx sessionctx.Context, id int64, args *historyJobArgs) {
t := meta.NewMeta(ctx.Txn())
t := meta.NewMeta(ctx.Txn(true))
historyJob, err := t.GetHistoryDDLJob(id)
c.Assert(err, IsNil)
c.Assert(historyJob.BinlogInfo.FinishedTS, Greater, uint64(0))
Expand Down
2 changes: 1 addition & 1 deletion ddl/ddl_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
row := types.MakeDatums(1, 2)
_, err = originTable.AddRecord(ctx, row, false)
c.Assert(err, IsNil)
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

tc := &TestDDLCallback{}
Expand Down
2 changes: 1 addition & 1 deletion ddl/fail_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (s *testColumnChangeSuite) TestFailBeforeDecodeArgs(c *C) {
row := types.MakeDatums(1, 2)
_, err = originTable.AddRecord(ctx, row, false)
c.Assert(err, IsNil)
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

tc := &TestDDLCallback{}
Expand Down
6 changes: 3 additions & 3 deletions ddl/foreign_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (s *testForeighKeySuite) TestForeignKey(c *C) {

testCreateTable(c, ctx, d, s.dbInfo, tblInfo)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

// fix data race
Expand Down Expand Up @@ -162,7 +162,7 @@ func (s *testForeighKeySuite) TestForeignKey(c *C) {

job := s.testCreateForeignKey(c, tblInfo, "c1_fk", []string{"c1"}, "t2", []string{"c1"}, ast.ReferOptionCascade, ast.ReferOptionSetNull)
testCheckJobDone(c, d, job, true)
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)
mu.Lock()
hErr := hookErr
Expand Down Expand Up @@ -220,6 +220,6 @@ func (s *testForeighKeySuite) TestForeignKey(c *C) {
job = testDropTable(c, ctx, d, s.dbInfo, tblInfo)
testCheckJobDone(c, d, job, false)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)
}
12 changes: 6 additions & 6 deletions ddl/index_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (s *testIndexChangeSuite) TestIndexChange(c *C) {
_, err = originTable.AddRecord(ctx, types.MakeDatums(3, 3), false)
c.Assert(err, IsNil)

err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

tc := &TestDDLCallback{}
Expand Down Expand Up @@ -125,7 +125,7 @@ func (s *testIndexChangeSuite) TestIndexChange(c *C) {
d.SetHook(tc)
testCreateIndex(c, ctx, d, s.dbInfo, originTable.Meta(), false, "c2", "c2")
c.Check(errors.ErrorStack(checkErr), Equals, "")
c.Assert(ctx.Txn().Commit(context.Background()), IsNil)
c.Assert(ctx.Txn(true).Commit(context.Background()), IsNil)
d.Stop()
prevState = model.StateNone
var noneTable table.Table
Expand Down Expand Up @@ -172,7 +172,7 @@ func (s *testIndexChangeSuite) TestIndexChange(c *C) {

func checkIndexExists(ctx sessionctx.Context, tbl table.Table, indexValue interface{}, handle int64, exists bool) error {
idx := tbl.Indices()[0]
doesExist, _, err := idx.Exist(ctx.GetSessionVars().StmtCtx, ctx.Txn(), types.MakeDatums(indexValue), handle)
doesExist, _, err := idx.Exist(ctx.GetSessionVars().StmtCtx, ctx.Txn(true), types.MakeDatums(indexValue), handle)
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -322,7 +322,7 @@ func (s *testIndexChangeSuite) checkAddPublic(d *ddl, ctx sessionctx.Context, wr
return errors.Trace(err)
}
}
return ctx.Txn().Commit(context.Background())
return ctx.Txn(true).Commit(context.Background())
}

func (s *testIndexChangeSuite) checkDropWriteOnly(d *ddl, ctx sessionctx.Context, publicTbl, writeTbl table.Table) error {
Expand Down Expand Up @@ -362,7 +362,7 @@ func (s *testIndexChangeSuite) checkDropWriteOnly(d *ddl, ctx sessionctx.Context
if err != nil {
return errors.Trace(err)
}
return ctx.Txn().Commit(context.Background())
return ctx.Txn(true).Commit(context.Background())
}

func (s *testIndexChangeSuite) checkDropDeleteOnly(d *ddl, ctx sessionctx.Context, writeTbl, delTbl table.Table) error {
Expand Down Expand Up @@ -407,5 +407,5 @@ func (s *testIndexChangeSuite) checkDropDeleteOnly(d *ddl, ctx sessionctx.Contex
if err != nil {
return errors.Trace(err)
}
return ctx.Txn().Commit(context.Background())
return ctx.Txn(true).Commit(context.Background())
}
18 changes: 9 additions & 9 deletions ddl/reorg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ func (s *testDDLSuite) TestReorg(c *C) {

err := ctx.NewTxn()
c.Assert(err, IsNil)
ctx.Txn().Set([]byte("a"), []byte("b"))
err = ctx.Txn().Rollback()
ctx.Txn(true).Set([]byte("a"), []byte("b"))
err = ctx.Txn(true).Rollback()
c.Assert(err, IsNil)

err = ctx.NewTxn()
c.Assert(err, IsNil)
ctx.Txn().Set([]byte("a"), []byte("b"))
err = ctx.Txn().Commit(context.Background())
ctx.Txn(true).Set([]byte("a"), []byte("b"))
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

rowCount := int64(10)
Expand All @@ -73,7 +73,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
}
err = ctx.NewTxn()
c.Assert(err, IsNil)
m := meta.NewMeta(ctx.Txn())
m := meta.NewMeta(ctx.Txn(true))
rInfo := &reorgInfo{
Job: job,
}
Expand All @@ -89,12 +89,12 @@ func (s *testDDLSuite) TestReorg(c *C) {
c.Assert(d.generalWorker().reorgCtx.rowCount, Equals, int64(0))

// Test whether reorgInfo's Handle is update.
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)
err = ctx.NewTxn()
c.Assert(err, IsNil)

m = meta.NewMeta(ctx.Txn())
m = meta.NewMeta(ctx.Txn(true))
info, err1 := getReorgInfo(d.ddlCtx, m, job, nil)
c.Assert(err1, IsNil)
c.Assert(info.StartHandle, Equals, handle)
Expand All @@ -110,7 +110,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
return nil
})
c.Assert(err, NotNil)
err = ctx.Txn().Commit(context.Background())
err = ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

d.start(context.Background(), nil)
Expand Down Expand Up @@ -172,7 +172,7 @@ func (s *testDDLSuite) TestReorgOwner(c *C) {
c.Assert(err, IsNil)
}

err := ctx.Txn().Commit(context.Background())
err := ctx.Txn(true).Commit(context.Background())
c.Assert(err, IsNil)

tc := &TestDDLCallback{}
Expand Down
4 changes: 2 additions & 2 deletions executor/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func (a *ExecStmt) Exec(ctx context.Context) (sqlexec.RecordSet, error) {

var txnStartTS uint64
if sctx.Txn(false).Valid() {
txnStartTS = sctx.Txn().StartTS()
txnStartTS = sctx.Txn(true).StartTS()
crazycs520 marked this conversation as resolved.
Show resolved Hide resolved
}
return &recordSet{
executor: e,
Expand Down Expand Up @@ -273,7 +273,7 @@ func (a *ExecStmt) handleNoDelayExecutor(ctx context.Context, sctx sessionctx.Co
txnTS := uint64(0)
// Don't active pending txn here.
if sctx.Txn(false).Valid() {
txnTS = sctx.Txn().StartTS()
txnTS = sctx.Txn(true).StartTS()
}
a.LogSlowQuery(txnTS, err == nil)
}()
Expand Down
2 changes: 1 addition & 1 deletion executor/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (e *CheckIndexRangeExec) Open(ctx context.Context) error {

func (e *CheckIndexRangeExec) buildDAGPB() (*tipb.DAGRequest, error) {
dagReq := &tipb.DAGRequest{}
dagReq.StartTs = e.ctx.Txn().StartTS()
dagReq.StartTs = e.ctx.Txn(true).StartTS()
Copy link
Contributor

Choose a reason for hiding this comment

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

should check if sctx.Txn(true).Valid() first?

dagReq.TimeZoneName, dagReq.TimeZoneOffset = timeutil.Zone(e.ctx.GetSessionVars().Location())
sc := e.ctx.GetSessionVars().StmtCtx
dagReq.Flags = statementContextToFlags(sc)
Expand Down
4 changes: 2 additions & 2 deletions executor/batch_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type batchChecker struct {

// batchGetOldValues gets the values of storage in batch.
func (b *batchChecker) batchGetOldValues(ctx sessionctx.Context, batchKeys []kv.Key) error {
values, err := kv.BatchGetValues(ctx.Txn(), batchKeys)
values, err := kv.BatchGetValues(ctx.Txn(true), batchKeys)
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -205,7 +205,7 @@ func (b *batchChecker) batchGetInsertKeys(ctx sessionctx.Context, t table.Table,
batchKeys = append(batchKeys, k.newKV.key)
}
}
b.dupKVs, err = kv.BatchGetValues(ctx.Txn(), batchKeys)
b.dupKVs, err = kv.BatchGetValues(ctx.Txn(true), batchKeys)
return errors.Trace(err)
}

Expand Down
Loading