Skip to content

[fix](agg)having clause should use column name first then alias #14536

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
yiguolei merged 2 commits into from
Nov 25, 2022
Merged

[fix](agg)having clause should use column name first then alias #14536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47c11a8
[fix](agg)having clause should use column name first then alias
starocean999 Nov 24, 2022
ae97bbf
fix fe ut
starocean999 Nov 25, 2022
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
9 changes: 3 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,23 +419,20 @@ protected void substituteOrdinalsAliases(List<Expr> exprs, String errorPrefix,
// alias substitution is not performed in the same way.
Expr substituteExpr = trySubstituteOrdinal(expr, errorPrefix, analyzer);
if (substituteExpr == null) {
substituteExpr = expr.trySubstitute(aliasSMap, analyzer, false);
if (aliasFirst) {
substituteExpr = expr.trySubstitute(aliasSMap, analyzer, false);
i.set(substituteExpr);
} else {
try {
// use col name from tableRefs first
expr.analyze(analyzer);
substituteExpr = expr.clone();
substituteExpr.analyze(analyzer);
} catch (AnalysisException ex) {
// then consider alias name
substituteExpr = expr.trySubstitute(aliasSMap, analyzer, false);
i.set(substituteExpr);
}
}
} else {
i.set(substituteExpr);
}
i.set(substituteExpr);
}
}

Expand Down
9 changes: 8 additions & 1 deletion 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 @@ -969,7 +969,14 @@ private void analyzeAggregation(Analyzer analyzer) throws AnalysisException {
* (select min(k1) from table b where a.key=b.k2);
* TODO: the a.key should be replaced by a.k1 instead of unknown column 'key' in 'a'
*/
havingClauseAfterAnaylzed = havingClause.substitute(aliasSMap, analyzer, false);
try {
// use col name from tableRefs first
havingClauseAfterAnaylzed = havingClause.clone();
havingClauseAfterAnaylzed.analyze(analyzer);
} catch (AnalysisException ex) {
// then consider alias name
havingClauseAfterAnaylzed = havingClause.substitute(aliasSMap, analyzer, false);
}
havingClauseAfterAnaylzed = rewriteQueryExprByMvColumnExpr(havingClauseAfterAnaylzed, analyzer);
havingClauseAfterAnaylzed.checkReturnsBool("HAVING clause", true);
if (groupingInfo != null) {
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/test/java/org/apache/doris/analysis/QueryStmtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void testCollectExprs() throws Exception {
stmt = (QueryStmt) UtFrameUtils.parseAndAnalyzeStmt(sql, ctx);
exprsMap.clear();
stmt.collectExprs(exprsMap);
Assert.assertEquals(15, exprsMap.size());
Assert.assertEquals(17, exprsMap.size());
constMap.clear();
constMap = getConstantExprMap(exprsMap, analyzer);
Assert.assertEquals(4, constMap.size());
Expand Down