sql: implement ConstructOpaque in the new factory

Release note: None

pkg/sql/distsql_spec_exec_factory.go

@@ -109,7 +109,7 @@ func (e *distSQLSpecExecFactory) ConstructValues(
  return nil, err
  }
  physPlan.ResultColumns = cols
- return planMaybePhysical{physPlan: &physicalPlanTop{PhysicalPlan: physPlan}}, nil
+ return makePlanMaybePhysical(physPlan, nil /* planNodesToClose */), nil
  }
  recommendation := shouldDistribute
  for _, exprs := range rows {
@@ -146,10 +146,7 @@ func (e *distSQLSpecExecFactory) ConstructValues(
  return nil, err
  }
  physPlan.ResultColumns = cols
- return planMaybePhysical{physPlan: &physicalPlanTop{
- PhysicalPlan: physPlan,
- planNodesToClose: planNodesToClose,
- }}, nil
+ return makePlanMaybePhysical(physPlan, planNodesToClose), nil
 }
 
 // ConstructScan implements exec.Factory interface by combining the logic that
@@ -167,10 +164,7 @@ func (e *distSQLSpecExecFactory) ConstructScan(
  return nil, err
  }
  physPlan.ResultColumns = d.columns
- return planMaybePhysical{physPlan: &physicalPlanTop{
- PhysicalPlan: physPlan,
- planNodesToClose: []planNode{d},
- }}, nil
+ return makePlanMaybePhysical(physPlan, []planNode{d}), nil
  },
  )
  }
@@ -291,7 +285,7 @@ func (e *distSQLSpecExecFactory) ConstructScan(
  },
  )
 
- return planMaybePhysical{physPlan: &physicalPlanTop{PhysicalPlan: &p}}, err
+ return makePlanMaybePhysical(&p, nil /* planNodesToClose */), err
 }
 
 // checkExprsAndMaybeMergeLastStage is a helper method that returns a
@@ -769,12 +763,7 @@ func (e *distSQLSpecExecFactory) ConstructExplain(
  // TODO(yuzefovich): we might also need to look at the distribution of
  // subqueries and postqueries.
  physPlan.Distribution = p.main.physPlan.Distribution
- return planMaybePhysical{
- physPlan: &physicalPlanTop{
- PhysicalPlan: physPlan,
- planNodesToClose: []planNode{explainNode},
- },
- }, nil
+ return makePlanMaybePhysical(physPlan, []planNode{explainNode}), nil
 }
 
 func (e *distSQLSpecExecFactory) ConstructShowTrace(
@@ -889,7 +878,16 @@ func (e *distSQLSpecExecFactory) ConstructErrorIfRows(
 }
 
 func (e *distSQLSpecExecFactory) ConstructOpaque(metadata opt.OpaqueMetadata) (exec.Node, error) {
- return nil, unimplemented.NewWithIssue(47473, "experimental opt-driven distsql planning: opaque")
+ plan, err := constructOpaque(metadata)
+ if err != nil {
+ return nil, err
+ }
+ physPlan, err := e.dsp.wrapPlan(e.getPlanCtx(cannotDistribute), plan)
+ if err != nil {
+ return nil, err
+ }
+ physPlan.ResultColumns = planColumns(plan)
+ return makePlanMaybePhysical(physPlan, []planNode{plan}), nil
 }
 
 func (e *distSQLSpecExecFactory) ConstructAlterTableSplit(
@@ -1013,8 +1011,5 @@ func (e *distSQLSpecExecFactory) constructHashOrMergeJoin(
  rightPlanDistribution: rightPhysPlan.Distribution,
  }, ReqOrdering(reqOrdering))
  p.ResultColumns = resultColumns
- return planMaybePhysical{physPlan: &physicalPlanTop{
- PhysicalPlan: p,
- planNodesToClose: append(leftPlan.physPlan.planNodesToClose, rightPlan.physPlan.planNodesToClose...),
- }}, nil
+ return makePlanMaybePhysical(p, append(leftPlan.physPlan.planNodesToClose, rightPlan.physPlan.planNodesToClose...)), nil
 }

pkg/sql/exec_factory_util.go

@@ -15,6 +15,7 @@ import (
  "fmt"
 
  "github.com/cockroachdb/cockroach/pkg/sql/execinfra"
+ "github.com/cockroachdb/cockroach/pkg/sql/opt"
  "github.com/cockroachdb/cockroach/pkg/sql/opt/cat"
  "github.com/cockroachdb/cockroach/pkg/sql/opt/exec"
  "github.com/cockroachdb/cockroach/pkg/sql/rowexec"
@@ -317,3 +318,11 @@ func collectSystemColumnsFromCfg(
  }
  return systemColumns, systemColumnOrdinals
 }
+
+func constructOpaque(metadata opt.OpaqueMetadata) (planNode, error) {
+ o, ok := metadata.(*opaqueMetadata)
+ if !ok {
+ return nil, errors.AssertionFailedf("unexpected OpaqueMetadata object type %T", metadata)
+ }
+ return o.plan, nil
+}

pkg/sql/opt_exec_factory.go

@@ -1755,11 +1755,7 @@ func (ef *execFactory) ConstructErrorIfRows(
 
 // ConstructOpaque is part of the exec.Factory interface.
 func (ef *execFactory) ConstructOpaque(metadata opt.OpaqueMetadata) (exec.Node, error) {
- o, ok := metadata.(*opaqueMetadata)
- if !ok {
- return nil, errors.AssertionFailedf("unexpected OpaqueMetadata object type %T", metadata)
- }
- return o.plan, nil
+ return constructOpaque(metadata)
 }
 
 // ConstructAlterTableSplit is part of the exec.Factory interface.

pkg/sql/plan.go

@@ -323,6 +323,15 @@ type planMaybePhysical struct {
  physPlan *physicalPlanTop
 }
 
+func makePlanMaybePhysical(physPlan *PhysicalPlan, planNodesToClose []planNode) planMaybePhysical {
+ return planMaybePhysical{
+ physPlan: &physicalPlanTop{
+ PhysicalPlan: physPlan,
+ planNodesToClose: planNodesToClose,
+ },
+ }
+}
+
 func (p *planMaybePhysical) isPhysicalPlan() bool {
  return p.physPlan != nil
 }