Merge pull request #61895 from RaduBerinde/backport20.2-61863

release-20.2: sql: don't save memo unnecessarily
cockroachdb · Mar 13, 2021 · d4a049e · d4a049e
2 parents 2da5924 + 6a3c663
commit d4a049e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/sql/plan.go b/pkg/sql/plan.go
@@ -279,7 +279,7 @@ type planTop struct {
 	planComponents
 
 	// mem/catalog retains the memo and catalog that were used to create the
-	// plan.
+	// plan. Only set if savePlanForStats or savePlanString is true.
 	mem     *memo.Memo
 	catalog *optCatalog
 

diff --git a/pkg/sql/plan_opt.go b/pkg/sql/plan_opt.go
@@ -598,8 +598,6 @@ func (opc *optPlanningCtx) runExecBuilder(
 
 	planTop.planComponents = *result
 	planTop.explainPlan = explainPlan
-	planTop.mem = mem
-	planTop.catalog = &opc.catalog
 	planTop.codec = codec
 	planTop.stmt = stmt
 	planTop.flags = opc.flags
@@ -612,5 +610,9 @@ func (opc *optPlanningCtx) runExecBuilder(
 	if containsFullIndexScan {
 		planTop.flags.Set(planFlagContainsFullIndexScan)
 	}
+	if planTop.savePlanString || planTop.savePlanForStats {
+		planTop.mem = mem
+		planTop.catalog = &opc.catalog
+	}
 	return nil
 }