Skip to content

Commit fdfb657

Browse files
committed
executor: rename builder session context field
1 parent 9d1ac81 commit fdfb657

7 files changed

Lines changed: 278 additions & 278 deletions

File tree

pkg/executor/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ func (a *ExecStmt) buildExecutor() (exec.Executor, error) {
14181418

14191419
failpoint.Inject("assertTxnManagerAfterBuildExecutor", func() {
14201420
sessiontxn.RecordAssert(a.Ctx, "assertTxnManagerAfterBuildExecutor", true)
1421-
sessiontxn.AssertTxnManagerInfoSchema(b.ctx, b.is)
1421+
sessiontxn.AssertTxnManagerInfoSchema(b.sctx, b.is)
14221422
})
14231423

14241424
// ExecuteExec is not a real Executor, we only use it to build another Executor from a prepared statement.

pkg/executor/brie.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func (bq *brieQueue) clearTask(sc *stmtctx.StatementContext) {
234234
}
235235

236236
func (b *executorBuilder) parseTSString(ts string) (uint64, error) {
237-
sc := stmtctx.NewStmtCtxWithTimeZone(b.ctx.GetSessionVars().Location())
237+
sc := stmtctx.NewStmtCtxWithTimeZone(b.sctx.GetSessionVars().Location())
238238
t, err := types.ParseTime(sc.TypeCtx(), ts, mysql.TypeTimestamp, types.MaxFsp)
239239
if err != nil {
240240
return 0, err
@@ -249,27 +249,27 @@ func (b *executorBuilder) parseTSString(ts string) (uint64, error) {
249249
func (b *executorBuilder) buildBRIE(s *ast.BRIEStmt, schema *expression.Schema) exec.Executor {
250250
if s.Kind == ast.BRIEKindShowBackupMeta {
251251
return execOnce(&showMetaExec{
252-
BaseExecutor: exec.NewBaseExecutor(b.ctx, schema, 0),
252+
BaseExecutor: exec.NewBaseExecutor(b.sctx, schema, 0),
253253
showConfig: buildShowMetadataConfigFrom(s),
254254
})
255255
}
256256

257257
if s.Kind == ast.BRIEKindShowQuery {
258258
return execOnce(&showQueryExec{
259-
BaseExecutor: exec.NewBaseExecutor(b.ctx, schema, 0),
259+
BaseExecutor: exec.NewBaseExecutor(b.sctx, schema, 0),
260260
targetID: uint64(s.JobID),
261261
})
262262
}
263263

264264
if s.Kind == ast.BRIEKindCancelJob {
265265
return &cancelJobExec{
266-
BaseExecutor: exec.NewBaseExecutor(b.ctx, schema, 0),
266+
BaseExecutor: exec.NewBaseExecutor(b.sctx, schema, 0),
267267
targetID: uint64(s.JobID),
268268
}
269269
}
270270

271271
e := &BRIEExec{
272-
BaseExecutor: exec.NewBaseExecutor(b.ctx, schema, 0),
272+
BaseExecutor: exec.NewBaseExecutor(b.sctx, schema, 0),
273273
info: &brieTaskInfo{
274274
kind: s.Kind,
275275
},

0 commit comments

Comments
 (0)