From ed597e6e54da13cf3605b03be80ec521de441161 Mon Sep 17 00:00:00 2001
From: slzhou <slzhou@taosdata.com>
Date: Fri, 15 Apr 2022 11:19:00 +0800
Subject: [PATCH] pass compilation before udf call refinement

---
 source/libs/function/CMakeLists.txt | 14 +++++++++++---
 source/libs/function/inc/tudf.h     |  2 +-
 source/libs/function/src/tudf.c     |  2 +-
 source/libs/function/test/runUdf.c  | 12 +++---------
 source/libs/function/test/udf1.c    |  4 ++++
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index 50900120a9..2ed8db589a 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -5,7 +5,9 @@ target_include_directories(
     function
     PUBLIC
         "${TD_SOURCE_DIR}/include/libs/function"
-        "${TD_SOURCE_DIR}/inlcude/util"
+        "${TD_SOURCE_DIR}/include/util"
+        "${TD_SOURCE_DIR}/include/common"
+        "${TD_SOURCE_DIR}/include/client"
         "${TD_SOURCE_DIR}/contrib/libuv/include"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
@@ -22,7 +24,9 @@ target_include_directories(
         PUBLIC
             "${TD_SOURCE_DIR}/include/libs/function"
             "${TD_SOURCE_DIR}/contrib/libuv/include"
-            "${TD_SOURCE_DIR}/inlcude/util"
+            "${TD_SOURCE_DIR}/include/util"
+            "${TD_SOURCE_DIR}/include/common"
+            "${TD_SOURCE_DIR}/include/client"
             "${TD_SOURCE_DIR}/include/os"
         PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
@@ -38,6 +42,8 @@ target_include_directories(
         PUBLIC
             "${TD_SOURCE_DIR}/include/libs/function"
             "${TD_SOURCE_DIR}/include/util"
+            "${TD_SOURCE_DIR}/include/common"
+            "${TD_SOURCE_DIR}/include/client"
             "${TD_SOURCE_DIR}/include/os"
         PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
@@ -49,7 +55,9 @@ target_include_directories(
         PUBLIC
             "${TD_SOURCE_DIR}/include/libs/function"
             "${TD_SOURCE_DIR}/contrib/libuv/include"
-            "${TD_SOURCE_DIR}/inlcude/util"
+            "${TD_SOURCE_DIR}/include/util"
+            "${TD_SOURCE_DIR}/include/common"
+            "${TD_SOURCE_DIR}/include/client"
         PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
diff --git a/source/libs/function/inc/tudf.h b/source/libs/function/inc/tudf.h
index 86a55d296c..64a7dd126f 100644
--- a/source/libs/function/inc/tudf.h
+++ b/source/libs/function/inc/tudf.h
@@ -53,7 +53,7 @@ typedef void *UdfHandle;
  * @param handle, out
  * @return error code
  */
-int32_t setupUdf(char udfName[], SEpSet epSet, UdfHandle *handle);
+int32_t setupUdf(char udfName[], SEpSet *epSet, UdfHandle *handle);
 
 typedef struct SUdfColumnMeta {
   int16_t type;
diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c
index 0acb7210ae..96c3756233 100644
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
@@ -1199,7 +1199,7 @@ int32_t udfcRunUvTask(SClientUdfTask *task, int8_t uvTaskType) {
   return task->errCode;
 }
 
-int32_t setupUdf(char udfName[TSDB_FUNC_NAME_LEN], UdfHandle *handle) {
+int32_t setupUdf(char udfName[], SEpSet *epSet, UdfHandle *handle) {
   debugPrint("%s", "client setup udf");
   SClientUdfTask *task = taosMemoryMalloc(sizeof(SClientUdfTask));
   task->errCode = 0;
diff --git a/source/libs/function/test/runUdf.c b/source/libs/function/test/runUdf.c
index bd742d23d0..7afa459c89 100644
--- a/source/libs/function/test/runUdf.c
+++ b/source/libs/function/test/runUdf.c
@@ -18,10 +18,10 @@ int main(int argc, char *argv[]) {
     }
     fprintf(stdout, "current working directory:%s\n", path);
     strcat(path, "/libudf1.so");
-    SUdfInfo udfInfo = {.udfName="udf1", .path=path};
 
     UdfHandle handle;
-    setupUdf(&udfInfo, &handle);
+    SEpSet epSet;
+    setupUdf("udf1", &epSet, &handle);
 
     //char state[5000000] = "state";
     //char input[5000000] = "input";
@@ -31,13 +31,7 @@ int main(int argc, char *argv[]) {
     if (argc > 2) callCount = atoi(argv[2]);
     char *state = taosMemoryMalloc(dataSize);
     char *input = taosMemoryMalloc(dataSize);
-    SUdfDataBlock blockInput = {.data = input, .size = dataSize};
-    SUdfDataBlock blockOutput;
-    char* newState;
-    int32_t newStateSize;
-    for (int l = 0; l < callCount; ++l) {
-        callUdf(handle, 0, state, dataSize, blockInput, &newState, &newStateSize, &blockOutput);
-    }
+    //todo: call udf
     taosMemoryFree(state);
     taosMemoryFree(input);
     teardownUdf(handle);
diff --git a/source/libs/function/test/udf1.c b/source/libs/function/test/udf1.c
index 31819fa8e5..abe6e59984 100644
--- a/source/libs/function/test/udf1.c
+++ b/source/libs/function/test/udf1.c
@@ -4,6 +4,10 @@
 
 #include "tudf.h"
 
+#undef malloc
+#define malloc malloc
+#undef free
+#define free free
 int32_t udf1_setup() {
   return 0;
 }