database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](planner) fix bug of push down conjuncts through agg (#22202)

Browse Source 
should use both contains and comeFrom method to check if the conjunct can be pushed down throgh agg node
This commit is contained in:
starocean999
2023-07-27 13:20:50 +08:00
committed by GitHub
parent 8b51bfa384
commit a630f127ce
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
View File

@ -261,6 +261,7 @@ public class DateLiteral extends LiteralExpr {
} else {
throw new AnalysisException("Error date literal type : " + type);
}
analysisDone();
}
public DateLiteral(long year, long month, long day) {
@ -271,6 +272,7 @@ public class DateLiteral extends LiteralExpr {
this.month = month;
this.day = day;
this.type = ScalarType.getDefaultDateType(Type.DATE);
analysisDone();
}
public DateLiteral(long year, long month, long day, Type type) {
@ -280,6 +282,7 @@ public class DateLiteral extends LiteralExpr {
Preconditions.checkArgument(type.getPrimitiveType().equals(Type.DATE.getPrimitiveType())
|| type.getPrimitiveType().equals(Type.DATEV2.getPrimitiveType()));
this.type = type;
analysisDone();
}
public DateLiteral(long year, long month, long day, long hour, long minute, long second) {
@ -290,6 +293,7 @@ public class DateLiteral extends LiteralExpr {
this.month = month;
this.day = day;
this.type = ScalarType.getDefaultDateType(Type.DATETIME);
analysisDone();
}
public DateLiteral(long year, long month, long day, long hour, long minute, long second, long microsecond,
@ -303,6 +307,7 @@ public class DateLiteral extends LiteralExpr {
this.microsecond = microsecond;
Preconditions.checkArgument(type.isDatetimeV2());
this.type = type;
analysisDone();
}
public DateLiteral(long year, long month, long day, long hour, long minute, long second, Type type) {
@ -315,6 +320,7 @@ public class DateLiteral extends LiteralExpr {
Preconditions.checkArgument(type.getPrimitiveType().equals(Type.DATETIME.getPrimitiveType())
|| type.getPrimitiveType().equals(Type.DATETIMEV2.getPrimitiveType()));
this.type = type;
analysisDone();
}
public DateLiteral(LocalDateTime dateTime, Type type) {
@ -328,6 +334,7 @@ public class DateLiteral extends LiteralExpr {
this.second = dateTime.getSecond();
this.microsecond = dateTime.get(ChronoField.MICRO_OF_SECOND);
}
analysisDone();
}
public DateLiteral(DateLiteral other) {

2
fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
View File

@ -2794,7 +2794,7 @@ public class SingleNodePlanner {
GroupByClause groupByClause = stmt.getGroupByClause();
List<Expr> exprs = groupByClause.getGroupingExprs();
final Expr srcExpr = sourceExpr;
if (!exprs.stream().anyMatch(expr -> expr.comeFrom(srcExpr))) {
if (!exprs.contains(srcExpr) && !exprs.stream().anyMatch(expr -> expr.comeFrom(srcExpr))) {
// the sourceExpr doesn't come from any of the group by exprs
isAllSlotReferToGroupBys = false;
break;