From 9dd9d64849dcfd3e5cdba5bb0779cb9c0c4a2005 Mon Sep 17 00:00:00 2001 From: maggie-zhu Date: Tue, 21 Jan 2025 10:39:26 +0800 Subject: [PATCH] fix some error Signed-off-by: maggie-zhu --- .../parser/BaseComplexFunctionCallTransformer.java | 13 +++++++++++++ .../pinot/Pinot2SRFunctionCallTransformer.java | 4 +++- .../connector/parser/trino/AstBuilder.java | 6 ++++-- .../trino/Trino2SRFunctionCallTransformer.java | 4 +++- .../java/com/starrocks/sql/parser/SqlParser.java | 1 - 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/parser/BaseComplexFunctionCallTransformer.java b/fe/fe-core/src/main/java/com/starrocks/connector/parser/BaseComplexFunctionCallTransformer.java index d1d72d1fd60d4e..714cfd0011998a 100644 --- a/fe/fe-core/src/main/java/com/starrocks/connector/parser/BaseComplexFunctionCallTransformer.java +++ b/fe/fe-core/src/main/java/com/starrocks/connector/parser/BaseComplexFunctionCallTransformer.java @@ -1,3 +1,16 @@ +// Copyright 2021-present StarRocks, Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package com.starrocks.connector.parser; import com.starrocks.analysis.Expr; diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/parser/pinot/Pinot2SRFunctionCallTransformer.java b/fe/fe-core/src/main/java/com/starrocks/connector/parser/pinot/Pinot2SRFunctionCallTransformer.java index f0ef7f62239472..33d69ee3f907fb 100644 --- a/fe/fe-core/src/main/java/com/starrocks/connector/parser/pinot/Pinot2SRFunctionCallTransformer.java +++ b/fe/fe-core/src/main/java/com/starrocks/connector/parser/pinot/Pinot2SRFunctionCallTransformer.java @@ -28,7 +28,9 @@ public class Pinot2SRFunctionCallTransformer extends BaseFunctionCallTransformer { - public Pinot2SRFunctionCallTransformer() { super(); } + public Pinot2SRFunctionCallTransformer() { + super(); + } @Override public Expr convert(String fnName, List children) { diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/AstBuilder.java b/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/AstBuilder.java index f95fc0b5bdf0e0..2d43b49ca7242e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/AstBuilder.java +++ b/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/AstBuilder.java @@ -732,7 +732,8 @@ protected ParseNode visitFunctionCall(FunctionCall node, ParseTreeContext contex List arguments = visit(node.getArguments(), context, Expr.class); Expr callExpr; - Expr convertedFunctionCall = Trino2SRFunctionCallTransformer.convert(node.getName().toString(), arguments); + Trino2SRFunctionCallTransformer trino2SRFunctionCallTransformer = new Trino2SRFunctionCallTransformer(); + Expr convertedFunctionCall = trino2SRFunctionCallTransformer.convert(node.getName().toString(), arguments); if (convertedFunctionCall != null) { callExpr = convertedFunctionCall; } else if (DISTINCT_FUNCTION.contains(node.getName().toString())) { @@ -1022,7 +1023,8 @@ protected ParseNode visitCoalesceExpression(CoalesceExpression node, ParseTreeCo @Override protected ParseNode visitExtract(Extract node, ParseTreeContext context) { String fieldString = node.getField().toString().toLowerCase(); - Expr expr = Trino2SRFunctionCallTransformer.convert(fieldString, + Trino2SRFunctionCallTransformer trino2SRFunctionCallTransformer = new Trino2SRFunctionCallTransformer(); + Expr expr = trino2SRFunctionCallTransformer.convert(fieldString, Lists.newArrayList((Expr) visit(node.getExpression(), context))); return Objects.requireNonNullElseGet(expr, () -> new FunctionCallExpr(fieldString, new FunctionParams(Lists.newArrayList((Expr) visit(node.getExpression(), context))))); diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/Trino2SRFunctionCallTransformer.java b/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/Trino2SRFunctionCallTransformer.java index 8834cb3180f224..1fc350a485c04c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/Trino2SRFunctionCallTransformer.java +++ b/fe/fe-core/src/main/java/com/starrocks/connector/parser/trino/Trino2SRFunctionCallTransformer.java @@ -36,7 +36,9 @@ public class Trino2SRFunctionCallTransformer extends BaseFunctionCallTransformer { - public Trino2SRFunctionCallTransformer() { super(); } + public Trino2SRFunctionCallTransformer() { + super(); + } @Override public Expr convert(String fnName, List children) { diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/SqlParser.java b/fe/fe-core/src/main/java/com/starrocks/sql/parser/SqlParser.java index a0d88fb494b5d2..fa7e351f3e501d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/parser/SqlParser.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/parser/SqlParser.java @@ -24,7 +24,6 @@ import com.starrocks.qe.OriginStatement; import com.starrocks.qe.SessionVariable; import com.starrocks.server.GlobalStateMgr; -import com.starrocks.sql.analyzer.AstToSQLBuilder; import com.starrocks.sql.ast.ImportColumnsStmt; import com.starrocks.sql.ast.PrepareStmt; import com.starrocks.sql.ast.StatementBase;