Merge cockroachdb#29397

29397: sql: don't remove batch limit in local lookup join r=jordanlewis a=jordanlewis Previously, the local lookup join node was created with an underlying scan with an explicitly disabled batch limit. This is the wrong thing to do, since that scan will be used as a full table scan - it needs a batch limit to prevent OOM errors. Closes cockroachdb#29389. Release note: None Co-authored-by: Jordan Lewis <[email protected]>
nvanbenschoten · Aug 31, 2018 · 9f1a5b5 · 9f1a5b5
2 parents e24857c + 9dd868c
commit 9f1a5b5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/pkg/sql/opt_exec_factory.go b/pkg/sql/opt_exec_factory.go
@@ -553,7 +553,6 @@ func (ef *execFactory) ConstructLookupJoin(
 
 	tableScan.index = indexDesc
 	tableScan.run.isSecondaryIndex = (indexDesc != &tabDesc.PrimaryIndex)
-	tableScan.disableBatchLimit()
 
 	n := &lookupJoinNode{
 		input:    input.(planNode),