planner: don't force set the Column in physical proj elimination (#45824

) close #45804
pingcap · Aug 16, 2023 · 0fb21c5 · 0fb21c5
1 parent b69fa21
commit 0fb21c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/planner/core/casetest/physicalplantest/testdata/plan_suite_out.json b/planner/core/casetest/physicalplantest/testdata/plan_suite_out.json
@@ -3905,8 +3905,8 @@
       {
         "SQL": "with recursive cte(a) as (select 1 union select a from cte) select * from cte; -- recursive cte cannot be inlined",
         "Plan": [
-          "CTEFullScan 1.00 root CTE:cte data:CTE_0",
-          "CTE_0 1.00 root  Recursive CTE",
+          "CTEFullScan 2.00 root CTE:cte data:CTE_0",
+          "CTE_0 2.00 root  Recursive CTE",
           "├─Projection(Seed Part) 1.00 root  1->Column#2",
           "│ └─TableDual 1.00 root  rows:1",
           "└─CTETable(Recursive Part) 1.00 root  Scan on CTE_0"

diff --git a/planner/core/rule_eliminate_projection.go b/planner/core/rule_eliminate_projection.go
@@ -152,16 +152,7 @@ func eliminatePhysicalProjection(p PhysicalPlan) PhysicalPlan {
 		}
 	})
 
-	oldSchema := p.Schema()
 	newRoot := doPhysicalProjectionElimination(p)
-	newCols := newRoot.Schema().Columns
-	for i, oldCol := range oldSchema.Columns {
-		oldCol.Index = newCols[i].Index
-		oldCol.ID = newCols[i].ID
-		oldCol.UniqueID = newCols[i].UniqueID
-		oldCol.VirtualExpr = newCols[i].VirtualExpr
-		newRoot.Schema().Columns[i] = oldCol
-	}
 	return newRoot
 }
 

diff --git a/planner/core/stats.go b/planner/core/stats.go
@@ -1135,7 +1135,7 @@ func (p *LogicalCTE) DeriveStats(_ []*property.StatsInfo, selfSchema *expression
 				return nil, err
 			}
 		}
-		recurStat := p.cte.recursivePartPhysicalPlan.StatsInfo()
+		recurStat := p.cte.recursivePartLogicalPlan.StatsInfo()
 		for i, col := range selfSchema.Columns {
 			p.StatsInfo().ColNDVs[col.UniqueID] += recurStat.ColNDVs[p.cte.recursivePartLogicalPlan.Schema().Columns[i].UniqueID]
 		}