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

[FIX](agg)fix group by constant child expr bug (#13485)

Browse Source
This commit is contained in:
starocean999
2022-10-24 16:32:36 +08:00
committed by GitHub
parent 40e122e5ef
commit 7faad9f004
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fe/fe-core/src/main/java/org/apache/doris/analysis/GroupByClause.java
View File

@ -93,20 +93,12 @@ public class GroupByClause implements ParseNode {
}
public void reset() {
groupingExprs = new ArrayList<>();
analyzed = false;
exprGenerated = false;
if (groupingType != GroupingType.GROUP_BY) {
groupingExprs = new ArrayList<>();
if (oriGroupingExprs != null) {
Expr.resetList(oriGroupingExprs);
groupingExprs.addAll(oriGroupingExprs);
}
} else {
if (groupingExprs != null) {
for (Expr e : groupingExprs) {
e.reset();
}
}
if (oriGroupingExprs != null) {
Expr.resetList(oriGroupingExprs);
groupingExprs.addAll(oriGroupingExprs);
}
if (groupingSetList != null) {
for (List<Expr> s : groupingSetList) {

12
fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
View File

@ -1389,7 +1389,19 @@ public class SelectStmt extends QueryStmt {
}
List<Expr> oriGroupingExprs = groupByClause.getOriGroupingExprs();
if (oriGroupingExprs != null) {
// we must make sure the expr is analyzed before rewrite
try {
for (Expr expr : oriGroupingExprs) {
expr.analyze(analyzer);
}
} catch (AnalysisException ex) {
//ignore any exception
}
rewriter.rewriteList(oriGroupingExprs, analyzer);
// after rewrite, need reset the analyze status for later re-analyze
for (Expr expr : oriGroupingExprs) {
expr.reset();
}
}
}
if (orderByElements != null) {