Skip to content

Commit 6892fc9

Browse files
authored
[fix](Nereids) only search internal funcftion when dbName is empty (#26296)
if call function with database name. we should only search UDF
1 parent 9019a71 commit 6892fc9

3 files changed

Lines changed: 39 additions & 23 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionRegistry.java‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.common.collect.Lists;
3434
import com.google.common.collect.Maps;
3535
import org.apache.commons.collections.CollectionUtils;
36+
import org.apache.commons.lang3.StringUtils;
3637

3738
import java.util.List;
3839
import java.util.Map;
@@ -86,24 +87,31 @@ public Optional<List<FunctionBuilder>> tryGetBuiltinBuilders(String name) {
8687

8788
// currently we only find function by name and arity and args' types.
8889
public FunctionBuilder findFunctionBuilder(String dbName, String name, List<?> arguments) {
90+
List<FunctionBuilder> functionBuilders = null;
8991
int arity = arguments.size();
90-
List<FunctionBuilder> functionBuilders = name2InternalBuiltinBuilders.get(name.toLowerCase());
91-
if (CollectionUtils.isEmpty(functionBuilders) && AggStateFunctionBuilder.isAggStateCombinator(name)) {
92-
String nestedName = AggStateFunctionBuilder.getNestedName(name);
93-
String combinatorSuffix = AggStateFunctionBuilder.getCombinatorSuffix(name);
94-
95-
functionBuilders = name2InternalBuiltinBuilders.get(nestedName.toLowerCase());
96-
97-
if (functionBuilders != null) {
98-
functionBuilders = functionBuilders.stream().map(builder -> {
99-
return new AggStateFunctionBuilder(combinatorSuffix, builder);
100-
}).filter(functionBuilder -> functionBuilder.canApply(arguments)).collect(Collectors.toList());
92+
String qualifiedName = StringUtils.isEmpty(dbName) ? name : dbName + "." + name;
93+
94+
if (StringUtils.isEmpty(dbName)) {
95+
// search internal function only if dbName is empty
96+
functionBuilders = name2InternalBuiltinBuilders.get(name.toLowerCase());
97+
if (CollectionUtils.isEmpty(functionBuilders) && AggStateFunctionBuilder.isAggStateCombinator(name)) {
98+
String nestedName = AggStateFunctionBuilder.getNestedName(name);
99+
String combinatorSuffix = AggStateFunctionBuilder.getCombinatorSuffix(name);
100+
functionBuilders = name2InternalBuiltinBuilders.get(nestedName.toLowerCase());
101+
if (functionBuilders != null) {
102+
functionBuilders = functionBuilders.stream()
103+
.map(builder -> new AggStateFunctionBuilder(combinatorSuffix, builder))
104+
.filter(functionBuilder -> functionBuilder.canApply(arguments))
105+
.collect(Collectors.toList());
106+
}
101107
}
102108
}
103-
if (functionBuilders == null || functionBuilders.isEmpty()) {
109+
110+
// search udf
111+
if (CollectionUtils.isEmpty(functionBuilders)) {
104112
functionBuilders = findUdfBuilder(dbName, name);
105113
if (functionBuilders == null || functionBuilders.isEmpty()) {
106-
throw new AnalysisException("Can not found function '" + name + "'");
114+
throw new AnalysisException("Can not found function '" + qualifiedName + "'");
107115
}
108116
}
109117

@@ -113,15 +121,15 @@ public FunctionBuilder findFunctionBuilder(String dbName, String name, List<?> a
113121
.collect(Collectors.toList());
114122
if (candidateBuilders.isEmpty()) {
115123
String candidateHints = getCandidateHint(name, functionBuilders);
116-
throw new AnalysisException("Can not found function '" + name
124+
throw new AnalysisException("Can not found function '" + qualifiedName
117125
+ "' which has " + arity + " arity. Candidate functions are: " + candidateHints);
118126
}
119-
120127
if (candidateBuilders.size() > 1) {
121128
String candidateHints = getCandidateHint(name, candidateBuilders);
122129
// NereidsPlanner not supported override function by the same arity, should we support it?
123-
throw new AnalysisException("Function '" + name + "' is ambiguous: " + candidateHints);
130+
throw new AnalysisException("Function '" + qualifiedName + "' is ambiguous: " + candidateHints);
124131
}
132+
125133
return candidateBuilders.get(0);
126134
}
127135

‎fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/FunctionBinder.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import org.apache.doris.nereids.util.TypeCoercionUtils;
6060

6161
import com.google.common.collect.ImmutableList;
62+
import org.apache.commons.lang3.StringUtils;
6263

6364
import java.util.ArrayList;
6465
import java.util.List;
@@ -142,22 +143,24 @@ public Expression visitUnboundFunction(UnboundFunction unboundFunction, Expressi
142143

143144
// bind function
144145
FunctionRegistry functionRegistry = Env.getCurrentEnv().getFunctionRegistry();
145-
String functionName = unboundFunction.getName();
146146
List<Object> arguments = unboundFunction.isDistinct()
147147
? ImmutableList.builder()
148148
.add(unboundFunction.isDistinct())
149149
.addAll(unboundFunction.getArguments())
150150
.build()
151151
: (List) unboundFunction.getArguments();
152152

153-
// we will change arithmetic function like add(), subtract(), bitnot() to the corresponding objects rather than
154-
// BoundFunction.
155-
ArithmeticFunctionBinder functionBinder = new ArithmeticFunctionBinder();
156-
if (functionBinder.isBinaryArithmetic(unboundFunction.getName())) {
157-
return functionBinder.bindBinaryArithmetic(unboundFunction.getName(), unboundFunction.children())
158-
.accept(this, context);
153+
if (StringUtils.isEmpty(unboundFunction.getDbName())) {
154+
// we will change arithmetic function like add(), subtract(), bitnot()
155+
// to the corresponding objects rather than BoundFunction.
156+
ArithmeticFunctionBinder functionBinder = new ArithmeticFunctionBinder();
157+
if (functionBinder.isBinaryArithmetic(unboundFunction.getName())) {
158+
return functionBinder.bindBinaryArithmetic(unboundFunction.getName(), unboundFunction.children())
159+
.accept(this, context);
160+
}
159161
}
160162

163+
String functionName = unboundFunction.getName();
161164
FunctionBuilder builder = functionRegistry.findFunctionBuilder(
162165
unboundFunction.getDbName(), functionName, arguments);
163166
if (builder instanceof AliasUdfBuilder) {

‎regression-test/suites/nereids_syntax_p0/function.groovy‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,5 +189,10 @@ suite("nereids_function") {
189189
qt_regexp_extract_all """
190190
SELECT regexp_extract_all('AbCdE', '([[:lower:]]+)C([[:lower:]]+)')
191191
"""
192+
193+
test {
194+
sql "select `hello`.now(3)"
195+
exception "Can not found function"
196+
}
192197
}
193198

0 commit comments

Comments
 (0)