sql: remove planDataSource field in applyJoinNode

The `planDataSource` field of `applyJoinNode` had a `columns` sub-field
that was redundant with the `applyJoinNode`'s `columns` field.
`planDataSource` has been replaced with `planNode` to avoid confusion
and misuse.

Release note: None

pkg/sql/apply_join.go

@@ -33,7 +33,7 @@ type applyJoinNode struct {
 	joinType descpb.JoinType
 
 	// The data source with no outer columns.
-	input planDataSource
+	input planNode
 
 	// pred represents the join predicate.
 	pred *joinPredicate
@@ -75,7 +75,7 @@ type applyJoinNode struct {
 
 func newApplyJoinNode(
 	joinType descpb.JoinType,
-	left planDataSource,
+	left planNode,
 	rightCols colinfo.ResultColumns,
 	pred *joinPredicate,
 	planRightSideFn exec.ApplyJoinPlanRightSideFn,
@@ -193,7 +193,7 @@ func (a *applyJoinNode) Next(params runParams) (bool, error) {
 		}
 
 		// We need a new row on the left.
-		ok, err := a.input.plan.Next(params)
+		ok, err := a.input.Next(params)
 		if err != nil {
 			return false, err
 		}
@@ -205,7 +205,7 @@ func (a *applyJoinNode) Next(params runParams) (bool, error) {
 
 		// Extract the values of the outer columns of the other side of the apply
 		// from the latest input row.
-		leftRow := a.input.plan.Values()
+		leftRow := a.input.Values()
 		a.run.leftRow = leftRow
 		a.iterationCount++
 
@@ -372,7 +372,7 @@ func (a *applyJoinNode) Values() tree.Datums {
 }
 
 func (a *applyJoinNode) Close(ctx context.Context) {
-	a.input.plan.Close(ctx)
+	a.input.Close(ctx)
 	a.run.rightRows.Close(ctx)
 	if a.run.rightRowsIterator != nil {
 		a.run.rightRowsIterator.Close()

pkg/sql/opt_exec_factory.go

@@ -447,9 +447,10 @@ func (ef *execFactory) ConstructApplyJoin(
 	onCond tree.TypedExpr,
 	planRightSideFn exec.ApplyJoinPlanRightSideFn,
 ) (exec.Node, error) {
-	leftSrc := asDataSource(left)
-	pred := makePredicate(joinType, leftSrc.columns, rightColumns, onCond)
-	return newApplyJoinNode(joinType, leftSrc, rightColumns, pred, planRightSideFn)
+	l := left.(planNode)
+	leftCols := planColumns(l)
+	pred := makePredicate(joinType, leftCols, rightColumns, onCond)
+	return newApplyJoinNode(joinType, l, rightColumns, pred, planRightSideFn)
 }
 
 // ConstructMergeJoin is part of the exec.Factory interface.

pkg/sql/walk.go

@@ -134,7 +134,7 @@ func (v *planVisitor) visitInternal(plan planNode, name string) {
 	case *zigzagJoinNode:
 
 	case *applyJoinNode:
-		n.input.plan = v.visit(n.input.plan)
+		n.input = v.visit(n.input)
 
 	case *joinNode:
 		n.left.plan = v.visit(n.left.plan)