This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 31316cd41e5281d64d51a2dad39a4f4416440ce4 Author: mch_ucchi <[email protected]> AuthorDate: Mon Jul 24 11:40:00 2023 +0800 [Fix](planner) fix rewritten alias function's original function is not analyzed again (#21497) fn is null because the alias function's original function is analyzed again, we fix it by add an analysis phase. --- .../src/main/java/org/apache/doris/analysis/FunctionCallExpr.java | 5 +++-- .../main/java/org/apache/doris/rewrite/RewriteAliasFunctionRule.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java index 83c16c4f9c..abb54e7871 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java @@ -1935,7 +1935,7 @@ public class FunctionCallExpr extends Expr { * @return * @throws AnalysisException */ - public Expr rewriteExpr() throws AnalysisException { + public Expr rewriteExpr(Analyzer analyzer) throws AnalysisException { if (isRewrote) { return this; } @@ -1965,13 +1965,14 @@ public class FunctionCallExpr extends Expr { retExpr.fnParams = new FunctionParams(oriExpr.fnParams.isDistinct(), oriParamsExprs); - // retExpr changed to original function, so the fn should be null. + // retExpr changed to original function, should be analyzed again. retExpr.fn = null; // reset children retExpr.children.clear(); retExpr.children.addAll(oriExpr.getChildren()); retExpr.isRewrote = true; + retExpr.analyze(analyzer); return retExpr; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteAliasFunctionRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteAliasFunctionRule.java index faa9fa2cac..1e9dfc026b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteAliasFunctionRule.java +++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteAliasFunctionRule.java @@ -38,7 +38,7 @@ public class RewriteAliasFunctionRule implements ExprRewriteRule { if (fn instanceof AliasFunction) { Expr originFn = ((AliasFunction) fn).getOriginFunction(); if (originFn instanceof FunctionCallExpr) { - return ((FunctionCallExpr) expr).rewriteExpr(); + return ((FunctionCallExpr) expr).rewriteExpr(analyzer); } else if (originFn instanceof CastExpr) { return ((CastExpr) originFn).rewriteExpr(((AliasFunction) fn).getParameters(), ((FunctionCallExpr) expr).getParams().exprs()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
