Skip to content

branch-3.0: [fix](udf) alias udf skip check enable_java_udf #48843 #48903

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
dataroaring merged 1 commit into from
Mar 20, 2025
Merged

branch-3.0: [fix](udf) alias udf skip check enable_java_udf #48843 #48903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.doris.catalog;

import org.apache.doris.common.Config;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.nereids.annotation.Developing;
Expand All @@ -27,6 +28,9 @@
import org.apache.doris.nereids.trees.expressions.functions.BuiltinFunctionBuilder;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.functions.FunctionBuilder;
import org.apache.doris.nereids.trees.expressions.functions.udf.JavaUdafBuilder;
import org.apache.doris.nereids.trees.expressions.functions.udf.JavaUdfBuilder;
import org.apache.doris.nereids.trees.expressions.functions.udf.JavaUdtfBuilder;
import org.apache.doris.nereids.trees.expressions.functions.udf.UdfBuilder;
import org.apache.doris.nereids.types.DataType;
import org.apache.doris.qe.ConnectContext;
Expand Down Expand Up @@ -161,6 +165,15 @@ public FunctionBuilder findFunctionBuilder(String dbName, String name, List<?> a
throw new AnalysisException("Can not found function '" + qualifiedName
+ "' which has " + arity + " arity. Candidate functions are: " + candidateHints);
}
if (!Config.enable_java_udf) {
candidateBuilders = candidateBuilders.stream()
.filter(fb -> !(fb instanceof JavaUdfBuilder || fb instanceof JavaUdafBuilder
|| fb instanceof JavaUdtfBuilder))
.collect(Collectors.toList());
if (candidateBuilders.isEmpty()) {
throw new AnalysisException("java_udf has been disabled.");
}
}
if (candidateBuilders.size() > 1) {
boolean needChooseOne = true;
List<FunctionSignature> signatures = Lists.newArrayListWithCapacity(candidateBuilders.size());
Expand Down Expand Up @@ -213,7 +226,6 @@ public List<FunctionBuilder> findUdfBuilder(String dbName, String name) {
List<FunctionBuilder> candidate = name2UdfBuilders.getOrDefault(scope, ImmutableMap.of())
.get(name.toLowerCase());
if (candidate != null && !candidate.isEmpty()) {
FunctionUtil.checkEnableJavaUdfForNereids();
return candidate;
}
}
Expand Down
5 changes: 0 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,4 @@ public static void checkEnableJavaUdf() throws AnalysisException {
}
}

public static void checkEnableJavaUdfForNereids() {
if (!Config.enable_java_udf) {
throw new org.apache.doris.nereids.exceptions.AnalysisException("java_udf has been disabled.");
}
}
}
4 changes: 4 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.doris.nereids.trees.expressions;

import org.apache.doris.catalog.Env;
import org.apache.doris.common.Config;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateFormat;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateTrunc;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DayOfMonth;
Expand Down Expand Up @@ -59,10 +60,13 @@ protected void runBeforeAll() throws Exception {
@Override
protected void runBeforeEach() throws Exception {
connectContext.setDatabase("test");
Config.enable_java_udf = true;
}

@Test
public void testSimpleAliasFunction() throws Exception {
// alias udf should not check java_udf
Config.enable_java_udf = false;
createFunction("create global alias function f(int) with parameter(n) as hours_add(now(3), n)");
createFunction("create alias function f(int) with parameter(n) as hours_sub(now(3), n)");

Expand Down
Loading