[doris] 20/29: fix pick pr conflict

[kxiao]

This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit aeedb0d1db5eeee1d6505df5dd49330bab84adf9
Author: Kang <kxiao.ti...@gmail.com>
AuthorDate: Sun Jul 9 10:41:17 2023 +0800

    fix pick pr conflict
---
 .../doris/nereids/trees/plans/logical/LogicalAggregate.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalAggregate.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalAggregate.java
index f244d8090e..b40e2e2c5b 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalAggregate.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalAggregate.java
@@ -218,19 +218,12 @@ public class LogicalAggregate<CHILD_TYPE extends Plan>
                 children.get(0));
     }
 
-    @Override
-    public LogicalAggregate<Plan> 
withLogicalProperties(Optional<LogicalProperties> logicalProperties) {
-        return new LogicalAggregate<>(groupByExpressions, outputExpressions,
-                normalized, ordinalIsResolved, sourceRepeat,
-                Optional.empty(), logicalProperties, children.get(0));
-    }
-
     @Override
     public Plan withGroupExprLogicalPropChildren(Optional<GroupExpression> 
groupExpression,
             Optional<LogicalProperties> logicalProperties, List<Plan> 
children) {
         Preconditions.checkArgument(children.size() == 1);
-        return new LogicalAggregate<>(groupByExpressions, outputExpressions, 
normalized, ordinalIsResolved, generated,
-                hasPushed, sourceRepeat, groupExpression, 
Optional.of(getLogicalProperties()), children.get(0));
+        return new LogicalAggregate<>(groupByExpressions, outputExpressions, 
normalized, ordinalIsResolved,
+                sourceRepeat, groupExpression, 
Optional.of(getLogicalProperties()), children.get(0));
     }
 
     public LogicalAggregate<Plan> withGroupByAndOutput(List<Expression> 
groupByExprList,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org