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 91fe09e3a28010a4de84bdb241b03cc063e04594 Author: morrySnow <[email protected]> AuthorDate: Mon Oct 16 15:03:33 2023 +0800 [opt] use correct column label when execute query in FE (#25372) SET @a = '4'; SELECT @a; previous: +-----+ | '4' | +-----+ | 4 | +-----+ current: +----+ | @a | +----+ | 4 | +----+ --- .../main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java | 2 +- fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java | 3 ++- .../doris/nereids/trees/expressions/functions/scalar/CurrentUser.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java index fb2231644ac..71647def182 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java @@ -461,7 +461,7 @@ public class BuiltinScalarFunctions implements FunctionHelper { scalar(CurrentDate.class, "curdate", "current_date"), scalar(CurrentTime.class, "curtime", "current_time"), scalar(CurrentUser.class, "current_user"), - scalar(Database.class, "database"), + scalar(Database.class, "database", "schema"), scalar(Date.class, "date"), scalar(DateDiff.class, "datediff"), scalar(DateFormat.class, "date_format"), diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java index 99b5ee2dee1..7aba5058680 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java @@ -468,10 +468,11 @@ public class NereidsPlanner extends Planner { List<String> data = Lists.newArrayList(); for (int i = 0; i < physicalOneRowRelation.getProjects().size(); i++) { NamedExpression item = physicalOneRowRelation.getProjects().get(i); + NamedExpression output = physicalPlan.getOutput().get(i); Expression expr = item.child(0); if (expr instanceof Literal) { LiteralExpr legacyExpr = ((Literal) expr).toLegacyLiteral(); - columns.add(new Column(item.getName(), item.getDataType().toCatalogDataType())); + columns.add(new Column(output.getName(), output.getDataType().toCatalogDataType())); super.handleLiteralInFe(legacyExpr, data); } else { return Optional.empty(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java index ec784689783..f36e4548ebc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java @@ -22,7 +22,7 @@ import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable; import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature; import org.apache.doris.nereids.trees.expressions.shape.LeafExpression; import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; -import org.apache.doris.nereids.types.BigIntType; +import org.apache.doris.nereids.types.StringType; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ public class CurrentUser extends ScalarFunction implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable { public static final List<FunctionSignature> SIGNATURES = ImmutableList.of( - FunctionSignature.ret(BigIntType.INSTANCE).args() + FunctionSignature.ret(StringType.INSTANCE).args() ); public CurrentUser() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
