fix

apache · Sep 14, 2023 · 6d62c2c · 6d62c2c
1 parent 131b694
commit 6d62c2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/udf/JavaUdaf.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/udf/JavaUdaf.java
@@ -47,6 +47,7 @@
  */
 public class JavaUdaf extends AggregateFunction implements ExplicitlyCastableSignature, Udf {
     private final String dbName;
+    private final long functionId;
     private final TFunctionBinaryType binaryType;
     private final FunctionSignature signature;
     private final DataType intermediateType;
@@ -65,14 +66,16 @@ public class JavaUdaf extends AggregateFunction implements ExplicitlyCastableSig
     /**
      * Constructor of UDAF
      */
-    public JavaUdaf(String name, String dbName, TFunctionBinaryType binaryType, FunctionSignature signature,
+    public JavaUdaf(String name, long functionId, String dbName, TFunctionBinaryType binaryType,
+            FunctionSignature signature,
             DataType intermediateType, NullableMode nullableMode,
             String objectFile, String symbol,
             String initFn, String updateFn, String mergeFn,
             String serializeFn, String finalizeFn, String getValueFn, String removeFn,
             boolean isDistinct, String checkSum, Expression... args) {
         super(name, isDistinct, args);
         this.dbName = dbName;
+        this.functionId = functionId;
         this.binaryType = binaryType;
         this.signature = signature;
         this.intermediateType = intermediateType == null ? signature.returnType : intermediateType;
@@ -115,7 +118,7 @@ public NullableMode getNullableMode() {
     @Override
     public JavaUdaf withDistinctAndChildren(boolean isDistinct, List<Expression> children) {
         Preconditions.checkArgument(children.size() == this.children.size());
-        return new JavaUdaf(getName(), dbName, binaryType, signature, intermediateType, nullableMode,
+        return new JavaUdaf(getName(), functionId, dbName, binaryType, signature, intermediateType, nullableMode,
                 objectFile, symbol, initFn, updateFn, mergeFn, serializeFn, finalizeFn, getValueFn, removeFn,
                 isDistinct, checkSum, children.toArray(new Expression[0]));
     }
@@ -145,7 +148,7 @@ public static void translateToNereidsFunction(String dbName, org.apache.doris.ca
             intermediateType = DataType.fromCatalogType(aggregate.getIntermediateType());
         }
 
-        JavaUdaf udaf = new JavaUdaf(fnName, dbName, aggregate.getBinaryType(), sig,
+        JavaUdaf udaf = new JavaUdaf(fnName, aggregate.getId(), dbName, aggregate.getBinaryType(), sig,
                 intermediateType,
                 aggregate.getNullableMode(),
                 aggregate.getLocation().getLocation(),
@@ -192,6 +195,7 @@ public Function getCatalogFunction() {
             expr.setBinaryType(binaryType);
             expr.setNullableMode(nullableMode);
             expr.setChecksum(checkSum);
+            expr.setId(functionId);
             return expr;
         } catch (Exception e) {
             throw new AnalysisException(e.getMessage(), e.getCause());

diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/udf/JavaUdf.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/udf/JavaUdf.java
@@ -60,7 +60,8 @@ public class JavaUdf extends ScalarFunction implements ExplicitlyCastableSignatu
     /**
      * Constructor of UDF
      */
-    public JavaUdf(String name, long functionId,String dbName, TFunctionBinaryType binaryType, FunctionSignature signature,
+    public JavaUdf(String name, long functionId, String dbName, TFunctionBinaryType binaryType,
+            FunctionSignature signature,
             NullableMode nullableMode, String objectFile, String symbol, String prepareFn, String closeFn,
             String checkSum, Expression... args) {
         super(name, args);