Skip to content

[fix](agg)fix group by null literal bug #14649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Nov 28, 2022
Merged

[fix](agg)fix group by null literal bug #14649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,7 @@ private void analyzeAggregation(Analyzer analyzer) throws AnalysisException {
List<TupleId> groupingByTupleIds = new ArrayList<>();
if (groupByClause != null) {
groupByClause.genGroupingExprs();
ArrayList<Expr> groupingExprs = groupByClause.getGroupingExprs();
if (groupingInfo != null) {
GroupByClause.GroupingType groupingType = groupByClause.getGroupingType();
if ((groupingType == GroupByClause.GroupingType.GROUPING_SETS && CollectionUtils
Expand All @@ -1086,16 +1087,26 @@ private void analyzeAggregation(Analyzer analyzer) throws AnalysisException {
|| groupingType == GroupByClause.GroupingType.ROLLUP) {

}
groupingInfo.buildRepeat(groupByClause.getGroupingExprs(), groupByClause.getGroupingSetList());
groupingInfo.buildRepeat(groupingExprs, groupByClause.getGroupingSetList());
}
substituteOrdinalsAliases(groupByClause.getGroupingExprs(), "GROUP BY", analyzer, false);
substituteOrdinalsAliases(groupingExprs, "GROUP BY", analyzer, false);

if (!groupByClause.isGroupByExtension() && !groupingExprs.isEmpty()) {
ArrayList<Expr> tempExprs = new ArrayList<>(groupingExprs);
groupingExprs.removeIf(Expr::isConstant);
if (groupingExprs.isEmpty() && aggExprs.isEmpty()) {
// should keep at least one expr to make the result correct
groupingExprs.add(tempExprs.get(0));
}
}

if (groupingInfo != null) {
groupingInfo.genOutputTupleDescAndSMap(analyzer, groupByClause.getGroupingExprs(), aggExprs);
groupingInfo.genOutputTupleDescAndSMap(analyzer, groupingExprs, aggExprs);
// must do it before copying for createAggInfo()
groupingByTupleIds.add(groupingInfo.getOutputTupleDesc().getId());
}
groupByClause.analyze(analyzer);
createAggInfo(groupByClause.getGroupingExprs(), aggExprs, analyzer);
createAggInfo(groupingExprs, aggExprs, analyzer);
} else {
createAggInfo(new ArrayList<>(), aggExprs, analyzer);
}
Expand Down