add physical property in post processor

englefly · Oct 29, 2024 · de46c3a · de46c3a
1 parent e238a87
commit de46c3a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.../main/java/org/apache/doris/nereids/processor/post/ProjectAggregateExpressionsForCse.java b/.../main/java/org/apache/doris/nereids/processor/post/ProjectAggregateExpressionsForCse.java
@@ -20,6 +20,7 @@
 import org.apache.doris.nereids.CascadesContext;
 import org.apache.doris.nereids.properties.DataTrait;
 import org.apache.doris.nereids.properties.LogicalProperties;
+import org.apache.doris.nereids.properties.PhysicalProperties;
 import org.apache.doris.nereids.trees.expressions.Alias;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.NamedExpression;
@@ -29,6 +30,7 @@
 import org.apache.doris.nereids.trees.expressions.functions.agg.AggregateFunction;
 import org.apache.doris.nereids.trees.plans.Plan;
 import org.apache.doris.nereids.trees.plans.algebra.Aggregate;
+import org.apache.doris.nereids.trees.plans.physical.AbstractPhysicalPlan;
 import org.apache.doris.nereids.trees.plans.physical.PhysicalDistribute;
 import org.apache.doris.nereids.trees.plans.physical.PhysicalHashAggregate;
 import org.apache.doris.nereids.trees.plans.physical.PhysicalProject;
@@ -42,6 +44,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -118,8 +121,14 @@ public Plan visitPhysicalHashAggregate(PhysicalHashAggregate<? extends Plan> agg
                     () -> projectOutput,
                     () -> DataTrait.EMPTY_TRAIT
             );
-            PhysicalProject<? extends Plan> project = new PhysicalProject<>(projections,
+            AbstractPhysicalPlan child = ((AbstractPhysicalPlan) aggregate.child());
+            PhysicalProperties projectPhysicalProperties = new PhysicalProperties(
+                    child.getPhysicalProperties().getDistributionSpec(),
+                    child.getPhysicalProperties().getOrderSpec());
+            PhysicalProject<? extends Plan> project = new PhysicalProject<>(projections, Optional.empty(),
                     projectLogicalProperties,
+                    projectPhysicalProperties,
+                    child.getStats(),
                     aggregate.child());
             aggregate = (PhysicalHashAggregate<? extends Plan>) aggregate
                     .withAggOutput(aggOutputReplaced)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java
@@ -63,6 +63,11 @@ public PhysicalProject(List<NamedExpression> projects, LogicalProperties logical
         this(projects, Optional.empty(), logicalProperties, child);
     }
 
+    public PhysicalProject(List<NamedExpression> projects, LogicalProperties logicalProperties,
+            PhysicalProperties physicalProperties, CHILD_TYPE child) {
+        this(projects, Optional.empty(), logicalProperties, child);
+    }
+
     public PhysicalProject(List<NamedExpression> projects, Optional<GroupExpression> groupExpression,
             LogicalProperties logicalProperties, CHILD_TYPE child) {
         super(PlanType.PHYSICAL_PROJECT, groupExpression, logicalProperties, child);