database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](udf) add the switch enable_java_udf to control the creation and use of java_udf. (#26213)

Browse Source
This commit is contained in:
luozenglin
2023-11-02 19:33:17 +08:00
committed by GitHub
parent c46fa339d0
commit 89cf828f03
5 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFunctionStmt.java
View File

@ -23,6 +23,7 @@ import org.apache.doris.catalog.ArrayType;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.Function;
import org.apache.doris.catalog.Function.NullableMode;
import org.apache.doris.catalog.FunctionUtil;
import org.apache.doris.catalog.MapType;
import org.apache.doris.catalog.ScalarFunction;
import org.apache.doris.catalog.ScalarType;
@ -262,6 +263,8 @@ public class CreateFunctionStmt extends DdlStmt {
}
}
if (binaryType == TFunctionBinaryType.JAVA_UDF) {
FunctionUtil.checkEnableJavaUdf();
String returnNullModeStr = properties.get(IS_RETURN_NULL);
if (returnNullModeStr == null) {
return;

4
fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
View File

@ -28,6 +28,7 @@ import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.Function;
import org.apache.doris.catalog.FunctionSet;
import org.apache.doris.catalog.FunctionUtil;
import org.apache.doris.catalog.MapType;
import org.apache.doris.catalog.ScalarFunction;
import org.apache.doris.catalog.ScalarType;
@ -1608,6 +1609,9 @@ public class FunctionCallExpr extends Expr {
if (analyzer.isReAnalyze() && fn instanceof AliasFunction) {
throw new AnalysisException("a UDF in the original function of a alias function");
}
if (fn != null) {
FunctionUtil.checkEnableJavaUdf();
}
}
}
}

1
fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionRegistry.java
View File

@ -146,6 +146,7 @@ public class FunctionRegistry {
List<FunctionBuilder> candidate = name2UdfBuilders.getOrDefault(scope, ImmutableMap.of())
.get(name.toLowerCase());
if (candidate != null && !candidate.isEmpty()) {
FunctionUtil.checkEnableJavaUdfForNereids();
return candidate;
}
}

13
fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionUtil.java
View File

@ -21,6 +21,7 @@ import org.apache.doris.analysis.Analyzer;
import org.apache.doris.analysis.SetType;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.UserException;
@ -257,4 +258,16 @@ public class FunctionUtil {
}
return false;
}
public static void checkEnableJavaUdf() throws AnalysisException {
if (!Config.enable_java_udf) {
throw new AnalysisException("java_udf has been disabled.");
}
}
public static void checkEnableJavaUdfForNereids() {
if (!Config.enable_java_udf) {
throw new org.apache.doris.nereids.exceptions.AnalysisException("java_udf has been disabled.");
}
}
}