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

sql: distsql spec creation in execbuilder plumbing #49348

Merged
merged 3 commits into from
Jun 2, 2020
Merged

sql: distsql spec creation in execbuilder plumbing #49348

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
652821e
sql: add stub exec.Factory for opt-driven distsql planning
yuzefovich May 20, 2020
2b69f7e
sql: add plumbing for phys plan creation directly in execbuilder
yuzefovich May 20, 2020
5fdc7cc
sql: operate on pointers to PhysicalPlan
yuzefovich Jun 1, 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 pkg/sql/conn_executor_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ func (ex *connExecutor) dispatchToExecutionEngine(

var cols sqlbase.ResultColumns
if stmt.AST.StatementType() == tree.Rows {
cols = planColumns(planner.curPlan.main)
cols = planner.curPlan.main.planColumns()
}
if err := ex.initStatementResult(ctx, res, stmt, cols); err != nil {
res.SetError(err)
Expand Down
8 changes: 4 additions & 4 deletions pkg/sql/create_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,14 @@ func makeColStatKey(cols []sqlbase.ColumnID) string {
return colSet.String()
}

// makePlanForExplainDistSQL is part of the distSQLExplainable interface.
func (n *createStatsNode) makePlanForExplainDistSQL(
// newPlanForExplainDistSQL is part of the distSQLExplainable interface.
func (n *createStatsNode) newPlanForExplainDistSQL(
planCtx *PlanningCtx, distSQLPlanner *DistSQLPlanner,
) (PhysicalPlan, error) {
) (*PhysicalPlan, error) {
// Create a job record but don't actually start the job.
record, err := n.makeJobRecord(planCtx.ctx)
if err != nil {
return PhysicalPlan{}, err
return nil, err
}
job := n.p.ExecCfg().JobRegistry.NewJob(*record)

Expand Down
Loading