Merge pull request cockroachdb#13374 from knz/backfill-limit

sql: make the backfill code use a limitNode for chunking.

pkg/sql/backfill.go

@@ -697,7 +697,9 @@ func (sc *SchemaChanger) backfillIndexesChunk(
 			return err
 		}
 
-		if err := planner.startPlanWithLimit(rows, chunkSize); err != nil {
+		rows = &limitNode{p: planner, plan: rows, countExpr: parser.NewDInt(parser.DInt(chunkSize))}
+
+		if err := planner.startPlan(rows); err != nil {
 			return err
 		}
 

pkg/sql/plan.go

@@ -17,8 +17,6 @@
 package sql
 
 import (
-	"math"
-
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/tracing"
@@ -211,18 +209,14 @@ func (p *planner) makePlan(stmt parser.Statement, autoCommit bool) (planNode, er
 
 // startPlan starts the plan and all its sub-query nodes.
 func (p *planner) startPlan(plan planNode) error {
-	return p.startPlanWithLimit(plan, math.MaxInt64)
-}
-
-func (p *planner) startPlanWithLimit(plan planNode, numRowsNeeded int64) error {
 	if err := p.startSubqueryPlans(plan); err != nil {
 		return err
 	}
 	if err := plan.Start(); err != nil {
 		return err
 	}
 	// Trigger limit propagation through the plan and sub-queries.
-	applyLimit(plan, numRowsNeeded, false /* !soft */)
+	setUnlimited(plan)
 	return nil
 }