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

*: Use TxnManager.GetTxnInfoSchema() to get the txn infoschema #30934

Merged
merged 3 commits into from
Dec 22, 2021
Merged

*: Use TxnManager.GetTxnInfoSchema() to get the txn infoschema #30934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7147bfa
*: Get infoschema from `TxnManager` for some places
lcwangchao Dec 22, 2021
0e3223f
Merge branch 'master' into txninfoschemareplace
lcwangchao Dec 22, 2021
22ef4cb
Merge branch 'master' into txninfoschemareplace
lcwangchao Dec 22, 2021
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/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ func (a *ExecStmt) RebuildPlan(ctx context.Context) (int64, error) {
sessiontxn.AssertTxnManagerInfoSchema(a.Ctx, ret.InfoSchema)
})

a.InfoSchema = ret.InfoSchema
a.InfoSchema = sessiontxn.GetTxnManager(a.Ctx).GetTxnInfoSchema()
a.SnapshotTS = ret.LastSnapshotTS
a.IsStaleness = ret.IsStaleness
a.ReplicaReadScope = ret.ReadReplicaScope
Expand Down
5 changes: 3 additions & 2 deletions executor/compiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ func (c *Compiler) Compile(ctx context.Context, stmtNode ast.StmtNode) (*ExecStm
sessiontxn.AssertTxnManagerInfoSchema(c.Ctx, ret.InfoSchema)
})

finalPlan, names, err := planner.Optimize(ctx, c.Ctx, stmtNode, ret.InfoSchema)
is := sessiontxn.GetTxnManager(c.Ctx).GetTxnInfoSchema()
finalPlan, names, err := planner.Optimize(ctx, c.Ctx, stmtNode, is)
if err != nil {
return nil, err
}
Expand All @@ -96,7 +97,7 @@ func (c *Compiler) Compile(ctx context.Context, stmtNode ast.StmtNode) (*ExecStm
SnapshotTS: ret.LastSnapshotTS,
IsStaleness: ret.IsStaleness,
ReplicaReadScope: ret.ReadReplicaScope,
InfoSchema: ret.InfoSchema,
InfoSchema: is,
Plan: finalPlan,
LowerPriority: lowerPriority,
Text: stmtNode.Text(),
Expand Down
8 changes: 5 additions & 3 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,7 +2130,9 @@ func (s *session) ExecutePreparedStmt(ctx context.Context, stmtID uint32, args [
txnCtxProvider := &sessiontxn.SimpleTxnContextProvider{
InfoSchema: is,
}
if err = sessiontxn.GetTxnManager(s).SetContextProvider(txnCtxProvider); err != nil {

txnManager := sessiontxn.GetTxnManager(s)
if err = txnManager.SetContextProvider(txnCtxProvider); err != nil {
return nil, err
}

Expand All @@ -2143,9 +2145,9 @@ func (s *session) ExecutePreparedStmt(ctx context.Context, stmtID uint32, args [
defer s.txn.onStmtEnd()

if ok {
return s.cachedPlanExec(ctx, is, snapshotTS, stmtID, preparedStmt, args)
return s.cachedPlanExec(ctx, txnManager.GetTxnInfoSchema(), snapshotTS, stmtID, preparedStmt, args)
}
return s.preparedStmtExec(ctx, is, snapshotTS, stmtID, preparedStmt, args)
return s.preparedStmtExec(ctx, txnManager.GetTxnInfoSchema(), snapshotTS, stmtID, preparedStmt, args)
}

func (s *session) DropPreparedStmt(stmtID uint32) error {
Expand Down