diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index 4934ca94e8..4e3c8dddab 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -1,11 +1,14 @@
 aux_source_directory(src FUNCTION_SRC)
 aux_source_directory(src/detail FUNCTION_SRC_DETAIL)
 list(REMOVE_ITEM FUNCTION_SRC src/udfd.c)
-IF(COMPILER_SUPPORT_AVX2)
+
+if(COMPILER_SUPPORT_AVX2)
     MESSAGE(STATUS "AVX2 instructions is ACTIVATED")
     set_source_files_properties(src/detail/tminmaxavx.c PROPERTIES COMPILE_FLAGS -mavx2)
-ENDIF()
+endif()
+
 add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL})
+
 target_include_directories(
     function
     PUBLIC
@@ -17,17 +20,6 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
-    SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
-ELSE()
-    SET(LINK_JEMALLOC "")
-ENDIF()
-
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(function jemalloc)
-ENDIF()
-
 target_link_libraries(
     function
     PRIVATE os
@@ -41,150 +33,6 @@ target_link_libraries(
     PUBLIC uv_a
 )
 
-if(${BUILD_TEST})
-    add_executable(runUdf test/runUdf.c)
-    target_include_directories(
-        runUdf
-        PUBLIC
-        "${TD_SOURCE_DIR}/include/libs/function"
-        "${TD_SOURCE_DIR}/contrib/libuv/include"
-        "${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"
-    )
-
-    target_link_libraries(
-        runUdf
-        PUBLIC uv_a
-        PRIVATE os util common nodes function ${LINK_JEMALLOC}
-    )
-endif()
-
-add_library(udf1 STATIC MODULE test/udf1.c)
-target_include_directories(
-    udf1
-    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"
-)
-
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(udf1 jemalloc)
-ENDIF()
-
-target_link_libraries(
-    udf1 PUBLIC os ${LINK_JEMALLOC})
-
-add_library(udf1_dup STATIC MODULE test/udf1_dup.c)
-target_include_directories(
-    udf1_dup
-    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"
-)
-
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(udf1_dup jemalloc)
-ENDIF()
-
-target_link_libraries(
-    udf1_dup PUBLIC os ${LINK_JEMALLOC})
-
-add_library(udf2 STATIC MODULE test/udf2.c)
-target_include_directories(
-    udf2
-    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"
-)
-
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(udf2 jemalloc)
-ENDIF()
-
-target_link_libraries(
-    udf2 PUBLIC os ${LINK_JEMALLOC}
-)
-
-add_library(udf2_dup STATIC MODULE test/udf2_dup.c)
-target_include_directories(
-    udf2_dup
-    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"
-)
-
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(udf2_dup jemalloc)
-ENDIF()
-
-target_link_libraries(
-    udf2_dup PUBLIC os ${LINK_JEMALLOC}
-)
-
-set(TARGET_NAMES
-    change_udf_normal
-    change_udf_no_init
-    change_udf_no_process
-    change_udf_no_destroy
-    change_udf_init_failed
-    change_udf_process_failed
-    change_udf_destory_failed
-)
-
-set(COMPILE_DEFINITIONS
-    CHANGE_UDF_NORMAL
-    CHANGE_UDF_NO_INIT
-    CHANGE_UDF_NO_PROCESS
-    CHANGE_UDF_NO_DESTROY
-    CHANGE_UDF_INIT_FAILED
-    CHANGE_UDF_PROCESS_FAILED
-    CHANGE_UDF_DESTORY_FAILED
-)
-
-foreach(index RANGE 0 6)
-    list(GET TARGET_NAMES ${index} target_name)
-    list(GET COMPILE_DEFINITIONS ${index} compile_def)
-
-    add_library(${target_name} STATIC MODULE test/change_udf.c)
-    target_include_directories(
-        ${target_name}
-        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"
-    )
-    target_compile_definitions(${target_name} PRIVATE ${compile_def})
-    IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-        ADD_DEPENDENCIES(${target_name} jemalloc)
-    ENDIF()
-    target_link_libraries(
-        ${target_name} PUBLIC os ${LINK_JEMALLOC}
-    )
-endforeach()
-
-# SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
 add_executable(udfd src/udfd.c)
 
 if(${TD_DARWIN})
@@ -203,12 +51,12 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(udfd jemalloc)
-ENDIF()
-
 target_link_libraries(
     udfd
     PUBLIC uv_a
-    PRIVATE os util common nodes function ${LINK_JEMALLOC}
+    PRIVATE os util common nodes function
 )
+
+if(${BUILD_TEST})
+    add_subdirectory(test)
+endif()
diff --git a/source/libs/function/test/CMakeLists.txt b/source/libs/function/test/CMakeLists.txt
new file mode 100644
index 0000000000..d805adff3a
--- /dev/null
+++ b/source/libs/function/test/CMakeLists.txt
@@ -0,0 +1,60 @@
+set(TD_UDF_INC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/contrib/libuv/include"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
+
+set(TD_UDF_LIB uv_a PRIVATE os util common nodes function)
+
+add_executable(runUdf runUdf.c)
+target_include_directories(runUdf PUBLIC ${TD_UDF_INC})
+target_link_libraries(runUdf PUBLIC ${TD_UDF_LIB})
+
+add_library(udf1 STATIC MODULE udf1.c)
+target_include_directories(udf1 PUBLIC ${TD_UDF_INC})
+target_link_libraries(udf1 PUBLIC os)
+
+add_library(udf2 STATIC MODULE udf2.c)
+target_include_directories(udf2 PUBLIC ${TD_UDF_INC})
+target_link_libraries(udf2 PUBLIC os)
+
+add_library(udf1_dup STATIC MODULE udf1_dup.c)
+target_include_directories(udf1_dup PUBLIC ${TD_UDF_INC})
+target_link_libraries(udf1_dup PUBLIC os)
+
+add_library(udf2_dup STATIC MODULE udf2_dup.c)
+target_include_directories(udf2_dup PUBLIC ${TD_UDF_INC})
+target_link_libraries(udf2_dup PUBLIC os)
+
+set(TARGET_NAMES
+    change_udf_normal
+    change_udf_no_init
+    change_udf_no_process
+    change_udf_no_destroy
+    change_udf_init_failed
+    change_udf_process_failed
+    change_udf_destory_failed
+)
+
+set(COMPILE_DEFINITIONS
+    CHANGE_UDF_NORMAL
+    CHANGE_UDF_NO_INIT
+    CHANGE_UDF_NO_PROCESS
+    CHANGE_UDF_NO_DESTROY
+    CHANGE_UDF_INIT_FAILED
+    CHANGE_UDF_PROCESS_FAILED
+    CHANGE_UDF_DESTORY_FAILED
+)
+
+foreach(index RANGE 0 6)
+    list(GET TARGET_NAMES ${index} target_name)
+    list(GET COMPILE_DEFINITIONS ${index} compile_def)
+    add_library(${target_name} STATIC MODULE change_udf.c)
+    target_include_directories(${target_name} PUBLIC ${TD_UDF_INC})
+    target_compile_definitions(${target_name} PRIVATE ${compile_def})
+    target_link_libraries(${target_name} PUBLIC os)
+endforeach()
\ No newline at end of file
diff --git a/source/libs/function/test/runUdf.c b/source/libs/function/test/runUdf.c
index f28b44d1b8..0c47247e21 100644
--- a/source/libs/function/test/runUdf.c
+++ b/source/libs/function/test/runUdf.c
@@ -1,6 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "uv.h"
 
 #include "fnLog.h"