[doris] branch master updated: [fix](compile)fix compile failed after merge #11117 #10479 and #11162 (#11253)

[panxiaolei]

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

panxiaolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 42d76b54dc [fix](compile)fix compile failed after merge #11117 #10479 
and #11162 (#11253)
42d76b54dc is described below

commit 42d76b54dc2912308d74f2cd5ae430fc48768cb7
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Wed Jul 27 17:25:06 2022 +0800

    [fix](compile)fix compile failed after merge #11117 #10479 and #11162 
(#11253)
    
    fix the compile failed after merge #11117 #10479 and #11162
---
 .../rules/rewrite/logical/PushPredicateThroughAggregation.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushPredicateThroughAggregation.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushPredicateThroughAggregation.java
index bc4155bdec..d2e2912437 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushPredicateThroughAggregation.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushPredicateThroughAggregation.java
@@ -70,14 +70,14 @@ public class PushPredicateThroughAggregation extends 
OneRewriteRuleFactory {
         return logicalFilter(logicalAggregate()).then(filter -> {
             LogicalAggregate<GroupPlan> aggregate = filter.child();
             Set<Slot> groupBySlots = new HashSet<>();
-            for (Expression groupByExpression : 
aggregate.getGroupByExpressionList()) {
+            for (Expression groupByExpression : 
aggregate.getGroupByExpressions()) {
                 if (groupByExpression instanceof Slot) {
                     groupBySlots.add((Slot) groupByExpression);
                 }
             }
             List<Expression> pushDownPredicates = Lists.newArrayList();
             List<Expression> filterPredicates = Lists.newArrayList();
-            
ExpressionUtils.extractConjunct(filter.getPredicates()).forEach(conjunct -> {
+            
ExpressionUtils.extractConjunctive(filter.getPredicates()).forEach(conjunct -> {
                 Set<Slot> conjunctSlots = SlotExtractor.extractSlot(conjunct);
                 if (groupBySlots.containsAll(conjunctSlots)) {
                     pushDownPredicates.add(conjunct);


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