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

[Improvement](meta) update show create function result (#15414)

Browse Source 
currently, show create function is designed for native function, it has some non suitable points.

this pr bring several improvements, and make result of show create function can be used to create function.

1. add type property.
2. add ALWAYS_NULLABLE perperty for java_udf
3. use file property rather than object_file for java_udf, follow usage of create java_udf
4. remove md5 property, coz file may vary when create function again.
5. remove INIT_FN,UPDATE_FN,MERGE_FN,SERIALIZE_FN etc properties for java_udf, cos java_udf does not need these properties.
This commit is contained in:
Yulei-Yang
2022-12-29 11:40:14 +08:00
committed by GitHub
parent ffef81a6ab
commit 304781d837
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateFunction.java
View File

@ -559,23 +559,32 @@ public class AggregateFunction extends Function {
sb.append(" INTERMEDIATE " + getIntermediateType());
}
sb.append(" PROPERTIES (")
.append("\n \"INIT_FN\"=\"" + getInitFnSymbol() + "\"")
.append(",\n \"UPDATE_FN\"=\"" + getUpdateFnSymbol() + "\"")
.append(",\n \"MERGE_FN\"=\"" + getMergeFnSymbol() + "\"");
if (getSerializeFnSymbol() != null) {
sb.append(",\n \"SERIALIZE_FN\"=\"" + getSerializeFnSymbol() + "\"");
}
if (getFinalizeFnSymbol() != null) {
sb.append(",\n \"FINALIZE_FN\"=\"" + getFinalizeFnSymbol() + "\"");
sb.append(" PROPERTIES (");
if (getBinaryType() != TFunctionBinaryType.JAVA_UDF) {
sb.append("\n \"INIT_FN\"=\"" + getInitFnSymbol() + "\",")
.append("\n \"UPDATE_FN\"=\"" + getUpdateFnSymbol() + "\",")
.append("\n \"MERGE_FN\"=\"" + getMergeFnSymbol() + "\",");
if (getSerializeFnSymbol() != null) {
sb.append("\n \"SERIALIZE_FN\"=\"" + getSerializeFnSymbol() + "\",");
}
if (getFinalizeFnSymbol() != null) {
sb.append("\n \"FINALIZE_FN\"=\"" + getFinalizeFnSymbol() + "\",");
}
}
if (getSymbolName() != null) {
sb.append(",\n \"SYMBOL\"=\"" + getSymbolName() + "\"");
sb.append("\n \"SYMBOL\"=\"" + getSymbolName() + "\",");
}
sb.append(",\n \"OBJECT_FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\"");
sb.append(",\n \"MD5\"=").append("\"" + getChecksum() + "\"");
if (getBinaryType() == TFunctionBinaryType.JAVA_UDF) {
sb.append("\n \"FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\",");
boolean isReturnNull = this.getNullableMode() == NullableMode.ALWAYS_NULLABLE;
sb.append("\n \"ALWAYS_NULLABLE\"=").append("\"" + isReturnNull + "\",");
} else {
sb.append("\n \"OBJECT_FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\",");
}
sb.append("\n \"TYPE\"=").append("\"" + this.getBinaryType() + "\"");
sb.append("\n);");
return sb.toString();
}

14
fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarFunction.java
View File

@ -389,9 +389,17 @@ public class ScalarFunction extends Function {
if (getCloseFnSymbol() != null) {
sb.append(",\n \"CLOSE_FN\"=").append("\"" + getCloseFnSymbol() + "\"");
}
sb.append(",\n \"OBJECT_FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\"");
sb.append(",\n \"MD5\"=").append("\"" + getChecksum() + "\"");
if (getBinaryType() == TFunctionBinaryType.JAVA_UDF) {
sb.append(",\n \"FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\"");
boolean isReturnNull = this.getNullableMode() == NullableMode.ALWAYS_NULLABLE;
sb.append(",\n \"ALWAYS_NULLABLE\"=").append("\"" + isReturnNull + "\"");
} else {
sb.append(",\n \"OBJECT_FILE\"=")
.append("\"" + (getLocation() == null ? "" : getLocation().toString()) + "\"");
}
sb.append(",\n \"TYPE\"=").append("\"" + this.getBinaryType() + "\"");
sb.append("\n);");
return sb.toString();
}