pull upstream

Author: zachmu

sql/plan/project.go

@@ -26,12 +26,12 @@ import (
 // Project is a projection of certain expression from the children node.
 type Project struct {
 	UnaryNode
-	// Projections are the expressions to be projected on the row returned by the child node 
-	Projections         []sql.Expression
+	// Projections are the expressions to be projected on the row returned by the child node
+	Projections []sql.Expression
 	// CanDefer is true when the projection evaluation can be deferred to row spooling, which allows us to avoid a
-	// separate iterator for the project node. 
-	CanDefer            bool
-	// IncludesNestedIters is true when the projection includes nested iterators because of expressions that return 
+	// separate iterator for the project node.
+	CanDefer bool
+	// IncludesNestedIters is true when the projection includes nested iterators because of expressions that return
 	// a RowIter.
 	IncludesNestedIters bool
 	deps                sql.ColSet

sql/rowexec/rel_iters.go

@@ -135,9 +135,9 @@ type ProjectIter struct {
 }
 
 type nestedIterState struct {
-	projections      []sql.Expression
-	sourceRow        sql.Row
-	iterEvaluators   []*RowIterEvaluator
+	projections    []sql.Expression
+	sourceRow      sql.Row
+	iterEvaluators []*RowIterEvaluator
 }
 
 func (i *ProjectIter) Next(ctx *sql.Context) (sql.Row, error) {
@@ -183,7 +183,7 @@ func (i *ProjectIter) ProjectRowWithNestedIters(
 			return nil, err
 		}
 
-		nestedIterationFinished := true 
+		nestedIterationFinished := true
 		for _, evaluator := range i.nestedState.iterEvaluators {
 			if !evaluator.finished && evaluator.iter != nil {
 				nestedIterationFinished = false
@@ -195,20 +195,20 @@ func (i *ProjectIter) ProjectRowWithNestedIters(
 			i.nestedState = nil
 			return i.ProjectRowWithNestedIters(ctx)
 		}
-		
+
 		return row, nil
 	}
 
 	row, err := i.childIter.Next(ctx)
 	if err != nil {
 		return nil, err
 	}
-	
+
 	i.nestedState = &nestedIterState{
 		sourceRow: row,
 	}
-	
-	// We need a new set of projections, with any iterator-returning expressions replaced by new expressions that will 
+
+	// We need a new set of projections, with any iterator-returning expressions replaced by new expressions that will
 	// return the result of the iteration on each call to Eval. We also need to keep a list of all such iterators, so
 	// that we can tell when they have all finished their iterations.
 	var rowIterEvaluators []*RowIterEvaluator
@@ -228,20 +228,20 @@ func (i *ProjectIter) ProjectRowWithNestedIters(
 				rowIterEvaluators = append(rowIterEvaluators, evaluator)
 				return evaluator, transform.NewTree, nil
 			}
-			
+
 			return e, transform.SameTree, nil
 		})
-		
+
 		if err != nil {
 			return nil, err
 		}
 
 		newProjs[i] = p
 	}
-	
+
 	i.nestedState.projections = newProjs
 	i.nestedState.iterEvaluators = rowIterEvaluators
-	
+
 	return i.ProjectRowWithNestedIters(ctx)
 }