Skip to content

Commit b2382fb

Browse files
tiancaiamaojackysp
tiancaiamao
authored and
jackysp
committed
*: Txn() function signature refactor and remove ActivePendingTxn() (#8327) (#8567)
1 parent b4b9f21 commit b2382fb

38 files changed

+155
-187
lines changed

‎ddl/column_change_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
7575
row := types.MakeDatums(1, 2)
7676
h, err := originTable.AddRecord(ctx, row, false)
7777
c.Assert(err, IsNil)
78-
err = ctx.Txn().Commit(context.Background())
78+
err = ctx.Txn(true).Commit(context.Background())
7979
c.Assert(err, IsNil)
8080

8181
var mu sync.Mutex
@@ -127,7 +127,7 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
127127
}
128128
mu.Unlock()
129129
}
130-
err = hookCtx.Txn().Commit(context.Background())
130+
err = hookCtx.Txn(true).Commit(context.Background())
131131
if err != nil {
132132
checkErr = errors.Trace(err)
133133
}
@@ -179,7 +179,7 @@ func (s *testColumnChangeSuite) testAddColumnNoDefault(c *C, ctx sessionctx.Cont
179179
checkErr = errors.Trace(err)
180180
}
181181
}
182-
err = hookCtx.Txn().Commit(context.TODO())
182+
err = hookCtx.Txn(true).Commit(context.TODO())
183183
if err != nil {
184184
checkErr = errors.Trace(err)
185185
}

‎ddl/column_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ func (s *testColumnSuite) checkColumnKVExist(ctx sessionctx.Context, t table.Tab
271271
if err != nil {
272272
return errors.Trace(err)
273273
}
274-
defer ctx.Txn().Commit(context.Background())
274+
defer ctx.Txn(true).Commit(context.Background())
275275
key := t.RecordKey(handle)
276-
data, err := ctx.Txn().Get(key)
276+
data, err := ctx.Txn(true).Get(key)
277277
if !isExist {
278278
if terror.ErrorEqual(err, kv.ErrNotExist) {
279279
return nil
@@ -760,7 +760,7 @@ func (s *testColumnSuite) TestAddColumn(c *C) {
760760
handle, err := t.AddRecord(ctx, oldRow, false)
761761
c.Assert(err, IsNil)
762762

763-
err = ctx.Txn().Commit(context.Background())
763+
err = ctx.Txn(true).Commit(context.Background())
764764
c.Assert(err, IsNil)
765765

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

826-
err = ctx.Txn().Commit(context.Background())
826+
err = ctx.Txn(true).Commit(context.Background())
827827
c.Assert(err, IsNil)
828828

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

850-
err = ctx.Txn().Commit(context.Background())
850+
err = ctx.Txn(true).Commit(context.Background())
851851
c.Assert(err, IsNil)
852852

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

899-
err = ctx.Txn().Commit(context.Background())
899+
err = ctx.Txn(true).Commit(context.Background())
900900
c.Assert(err, IsNil)
901901

902902
d.Stop()

‎ddl/db_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -747,12 +747,12 @@ LOOP:
747747
// Make sure there is index with name c3_index.
748748
c.Assert(nidx, NotNil)
749749
c.Assert(nidx.Meta().ID, Greater, int64(0))
750-
ctx.Txn().Rollback()
750+
ctx.Txn(true).Rollback()
751751

752752
c.Assert(ctx.NewTxn(), IsNil)
753-
defer ctx.Txn().Rollback()
753+
defer ctx.Txn(true).Rollback()
754754

755-
it, err := nidx.SeekFirst(ctx.Txn())
755+
it, err := nidx.SeekFirst(ctx.Txn(true))
756756
c.Assert(err, IsNil)
757757
defer it.Close()
758758

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

850850
c.Assert(ctx.NewTxn(), IsNil)
851-
defer ctx.Txn().Rollback()
851+
defer ctx.Txn(true).Rollback()
852852

853-
it, err := idx.SeekFirst(ctx.Txn())
853+
it, err := idx.SeekFirst(ctx.Txn(true))
854854
c.Assert(err, IsNil)
855855
defer it.Close()
856856

@@ -1090,7 +1090,7 @@ LOOP:
10901090
i := 0
10911091
j := 0
10921092
ctx.NewTxn()
1093-
defer ctx.Txn().Rollback()
1093+
defer ctx.Txn(true).Rollback()
10941094
err = t.IterRecords(ctx, t.FirstKey(), t.Cols(),
10951095
func(h int64, data []types.Datum, cols []*table.Column) (bool, error) {
10961096
i++
@@ -3502,7 +3502,7 @@ func backgroundExecOnJobUpdatedExported(c *C, s *testDBSuite, hook *ddl.TestDDLC
35023502
return
35033503
}
35043504
jobIDs := []int64{job.ID}
3505-
errs, err := admin.CancelJobs(hookCtx.Txn(), jobIDs)
3505+
errs, err := admin.CancelJobs(hookCtx.Txn(true), jobIDs)
35063506
if err != nil {
35073507
checkErr = errors.Trace(err)
35083508
return
@@ -3512,7 +3512,7 @@ func backgroundExecOnJobUpdatedExported(c *C, s *testDBSuite, hook *ddl.TestDDLC
35123512
checkErr = errors.Trace(errs[0])
35133513
return
35143514
}
3515-
err = hookCtx.Txn().Commit(context.Background())
3515+
err = hookCtx.Txn(true).Commit(context.Background())
35163516
if err != nil {
35173517
checkErr = errors.Trace(err)
35183518
}

‎ddl/ddl_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func testNewDDL(ctx context.Context, etcdCli *clientv3.Client, store kv.Storage,
128128
func getSchemaVer(c *C, ctx sessionctx.Context) int64 {
129129
err := ctx.NewTxn()
130130
c.Assert(err, IsNil)
131-
m := meta.NewMeta(ctx.Txn())
131+
m := meta.NewMeta(ctx.Txn(true))
132132
ver, err := m.GetSchemaVersion()
133133
c.Assert(err, IsNil)
134134
return ver
@@ -156,7 +156,7 @@ func checkHistoryJob(c *C, job *model.Job) {
156156
}
157157

158158
func checkHistoryJobArgs(c *C, ctx sessionctx.Context, id int64, args *historyJobArgs) {
159-
t := meta.NewMeta(ctx.Txn())
159+
t := meta.NewMeta(ctx.Txn(true))
160160
historyJob, err := t.GetHistoryDDLJob(id)
161161
c.Assert(err, IsNil)
162162
c.Assert(historyJob.BinlogInfo.FinishedTS, Greater, uint64(0))

‎ddl/ddl_worker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
399399
row := types.MakeDatums(1, 2)
400400
_, err = originTable.AddRecord(ctx, row, false)
401401
c.Assert(err, IsNil)
402-
err = ctx.Txn().Commit(context.Background())
402+
err = ctx.Txn(true).Commit(context.Background())
403403
c.Assert(err, IsNil)
404404

405405
tc := &TestDDLCallback{}

‎ddl/fail_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (s *testColumnChangeSuite) TestFailBeforeDecodeArgs(c *C) {
3636
row := types.MakeDatums(1, 2)
3737
_, err = originTable.AddRecord(ctx, row, false)
3838
c.Assert(err, IsNil)
39-
err = ctx.Txn().Commit(context.Background())
39+
err = ctx.Txn(true).Commit(context.Background())
4040
c.Assert(err, IsNil)
4141

4242
tc := &TestDDLCallback{}

‎ddl/foreign_key_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (s *testForeighKeySuite) TestForeignKey(c *C) {
128128

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

131-
err = ctx.Txn().Commit(context.Background())
131+
err = ctx.Txn(true).Commit(context.Background())
132132
c.Assert(err, IsNil)
133133

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

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

223-
err = ctx.Txn().Commit(context.Background())
223+
err = ctx.Txn(true).Commit(context.Background())
224224
c.Assert(err, IsNil)
225225
}

‎ddl/index_change_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (s *testIndexChangeSuite) TestIndexChange(c *C) {
7474
_, err = originTable.AddRecord(ctx, types.MakeDatums(3, 3), false)
7575
c.Assert(err, IsNil)
7676

77-
err = ctx.Txn().Commit(context.Background())
77+
err = ctx.Txn(true).Commit(context.Background())
7878
c.Assert(err, IsNil)
7979

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

173173
func checkIndexExists(ctx sessionctx.Context, tbl table.Table, indexValue interface{}, handle int64, exists bool) error {
174174
idx := tbl.Indices()[0]
175-
doesExist, _, err := idx.Exist(ctx.GetSessionVars().StmtCtx, ctx.Txn(), types.MakeDatums(indexValue), handle)
175+
doesExist, _, err := idx.Exist(ctx.GetSessionVars().StmtCtx, ctx.Txn(true), types.MakeDatums(indexValue), handle)
176176
if err != nil {
177177
return errors.Trace(err)
178178
}
@@ -322,7 +322,7 @@ func (s *testIndexChangeSuite) checkAddPublic(d *ddl, ctx sessionctx.Context, wr
322322
return errors.Trace(err)
323323
}
324324
}
325-
return ctx.Txn().Commit(context.Background())
325+
return ctx.Txn(true).Commit(context.Background())
326326
}
327327

328328
func (s *testIndexChangeSuite) checkDropWriteOnly(d *ddl, ctx sessionctx.Context, publicTbl, writeTbl table.Table) error {
@@ -362,7 +362,7 @@ func (s *testIndexChangeSuite) checkDropWriteOnly(d *ddl, ctx sessionctx.Context
362362
if err != nil {
363363
return errors.Trace(err)
364364
}
365-
return ctx.Txn().Commit(context.Background())
365+
return ctx.Txn(true).Commit(context.Background())
366366
}
367367

368368
func (s *testIndexChangeSuite) checkDropDeleteOnly(d *ddl, ctx sessionctx.Context, writeTbl, delTbl table.Table) error {
@@ -407,5 +407,5 @@ func (s *testIndexChangeSuite) checkDropDeleteOnly(d *ddl, ctx sessionctx.Contex
407407
if err != nil {
408408
return errors.Trace(err)
409409
}
410-
return ctx.Txn().Commit(context.Background())
410+
return ctx.Txn(true).Commit(context.Background())
411411
}

‎ddl/reorg_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ func (s *testDDLSuite) TestReorg(c *C) {
4949

5050
err := ctx.NewTxn()
5151
c.Assert(err, IsNil)
52-
ctx.Txn().Set([]byte("a"), []byte("b"))
53-
err = ctx.Txn().Rollback()
52+
ctx.Txn(true).Set([]byte("a"), []byte("b"))
53+
err = ctx.Txn(true).Rollback()
5454
c.Assert(err, IsNil)
5555

5656
err = ctx.NewTxn()
5757
c.Assert(err, IsNil)
58-
ctx.Txn().Set([]byte("a"), []byte("b"))
59-
err = ctx.Txn().Commit(context.Background())
58+
ctx.Txn(true).Set([]byte("a"), []byte("b"))
59+
err = ctx.Txn(true).Commit(context.Background())
6060
c.Assert(err, IsNil)
6161

6262
rowCount := int64(10)
@@ -73,7 +73,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
7373
}
7474
err = ctx.NewTxn()
7575
c.Assert(err, IsNil)
76-
m := meta.NewMeta(ctx.Txn())
76+
m := meta.NewMeta(ctx.Txn(true))
7777
rInfo := &reorgInfo{
7878
Job: job,
7979
}
@@ -89,12 +89,12 @@ func (s *testDDLSuite) TestReorg(c *C) {
8989
c.Assert(d.generalWorker().reorgCtx.rowCount, Equals, int64(0))
9090

9191
// Test whether reorgInfo's Handle is update.
92-
err = ctx.Txn().Commit(context.Background())
92+
err = ctx.Txn(true).Commit(context.Background())
9393
c.Assert(err, IsNil)
9494
err = ctx.NewTxn()
9595
c.Assert(err, IsNil)
9696

97-
m = meta.NewMeta(ctx.Txn())
97+
m = meta.NewMeta(ctx.Txn(true))
9898
info, err1 := getReorgInfo(d.ddlCtx, m, job, nil)
9999
c.Assert(err1, IsNil)
100100
c.Assert(info.StartHandle, Equals, handle)
@@ -110,7 +110,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
110110
return nil
111111
})
112112
c.Assert(err, NotNil)
113-
err = ctx.Txn().Commit(context.Background())
113+
err = ctx.Txn(true).Commit(context.Background())
114114
c.Assert(err, IsNil)
115115

116116
d.start(context.Background(), nil)
@@ -172,7 +172,7 @@ func (s *testDDLSuite) TestReorgOwner(c *C) {
172172
c.Assert(err, IsNil)
173173
}
174174

175-
err := ctx.Txn().Commit(context.Background())
175+
err := ctx.Txn(true).Commit(context.Background())
176176
c.Assert(err, IsNil)
177177

178178
tc := &TestDDLCallback{}

‎executor/adapter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (a *ExecStmt) Exec(ctx context.Context) (sqlexec.RecordSet, error) {
243243

244244
var txnStartTS uint64
245245
if sctx.Txn(false).Valid() {
246-
txnStartTS = sctx.Txn().StartTS()
246+
txnStartTS = sctx.Txn(true).StartTS()
247247
}
248248
return &recordSet{
249249
executor: e,
@@ -273,7 +273,7 @@ func (a *ExecStmt) handleNoDelayExecutor(ctx context.Context, sctx sessionctx.Co
273273
txnTS := uint64(0)
274274
// Don't active pending txn here.
275275
if sctx.Txn(false).Valid() {
276-
txnTS = sctx.Txn().StartTS()
276+
txnTS = sctx.Txn(true).StartTS()
277277
}
278278
a.LogSlowQuery(txnTS, err == nil)
279279
}()

‎executor/admin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (e *CheckIndexRangeExec) Open(ctx context.Context) error {
125125

126126
func (e *CheckIndexRangeExec) buildDAGPB() (*tipb.DAGRequest, error) {
127127
dagReq := &tipb.DAGRequest{}
128-
dagReq.StartTs = e.ctx.Txn().StartTS()
128+
dagReq.StartTs = e.ctx.Txn(true).StartTS()
129129
dagReq.TimeZoneName, dagReq.TimeZoneOffset = timeutil.Zone(e.ctx.GetSessionVars().Location())
130130
sc := e.ctx.GetSessionVars().StmtCtx
131131
dagReq.Flags = statementContextToFlags(sc)

‎executor/batch_checker.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type batchChecker struct {
5252

5353
// batchGetOldValues gets the values of storage in batch.
5454
func (b *batchChecker) batchGetOldValues(ctx sessionctx.Context, batchKeys []kv.Key) error {
55-
values, err := kv.BatchGetValues(ctx.Txn(), batchKeys)
55+
values, err := kv.BatchGetValues(ctx.Txn(true), batchKeys)
5656
if err != nil {
5757
return errors.Trace(err)
5858
}
@@ -205,7 +205,7 @@ func (b *batchChecker) batchGetInsertKeys(ctx sessionctx.Context, t table.Table,
205205
batchKeys = append(batchKeys, k.newKV.key)
206206
}
207207
}
208-
b.dupKVs, err = kv.BatchGetValues(ctx.Txn(), batchKeys)
208+
b.dupKVs, err = kv.BatchGetValues(ctx.Txn(true), batchKeys)
209209
return errors.Trace(err)
210210
}
211211

0 commit comments

Comments
 (0)