From 5ea40c9d0e9d50bb833359f6ad2fe905f7df4667 Mon Sep 17 00:00:00 2001
From: slzhou <slzhou@taosdata.com>
Date: Fri, 15 Apr 2022 12:19:22 +0800
Subject: [PATCH] save for poweroff

---
 source/libs/function/inc/tudf.h    | 9 ++++++---
 source/libs/function/inc/tudfInt.h | 1 +
 source/libs/function/test/udf1.c   | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/source/libs/function/inc/tudf.h b/source/libs/function/inc/tudf.h
index 64a7dd126f..fa009833c6 100644
--- a/source/libs/function/inc/tudf.h
+++ b/source/libs/function/inc/tudf.h
@@ -99,13 +99,16 @@ typedef struct SUdfInterBuf {
 
 // input: block, initFirst
 // output: interbuf
-int32_t callUdfAggProcess(SUdfDataBlock block, SUdfInterBuf *interBuf, bool initFirst);
+int32_t callUdfAggProcess(SUdfDataBlock *block, SUdfInterBuf *interBuf, bool initFirst);
 // input: interBuf
 // output: resultData
-int32_t callUdfAggFinalize(SUdfInterBuf interBuf, SUdfColumnData* resultData);
+int32_t callUdfAggFinalize(SUdfInterBuf *interBuf, SUdfColumnData *resultData);
+// input: interbuf1, interbuf2
+// output: resultBuf
+int32_t callUdfAggMerge(SUdfInterBuf *interBuf1, SUdfInterBuf *interBuf2, SUdfInterBuf *resultBuf);
 // input: block
 // output: resultData
-int32_t callUdfScalaProcess(SUdfDataBlock block, SUdfColumnData* resultData);
+int32_t callUdfScalaProcess(SUdfDataBlock *block, SUdfColumnData *resultData);
 
 /**
  * tearn down udf
diff --git a/source/libs/function/inc/tudfInt.h b/source/libs/function/inc/tudfInt.h
index d765a8d2dc..20fc98a08a 100644
--- a/source/libs/function/inc/tudfInt.h
+++ b/source/libs/function/inc/tudfInt.h
@@ -31,6 +31,7 @@ enum {
 
 enum {
   TSDB_UDF_CALL_AGG_PROC = 0,
+  TSDB_UDF_CALL_AGG_MERGE,
   TSDb_UDF_CALL_AGG_FIN,
   TSDB_UDF_CALL_SCALA_PROC,
 };
diff --git a/source/libs/function/test/udf1.c b/source/libs/function/test/udf1.c
index abe6e59984..31e7a36e9c 100644
--- a/source/libs/function/test/udf1.c
+++ b/source/libs/function/test/udf1.c
@@ -8,6 +8,7 @@
 #define malloc malloc
 #undef free
 #define free free
+
 int32_t udf1_setup() {
   return 0;
 }