refactor: minor changes

2025-03-06 16:45:46 +08:00 · 2025-03-06 16:45:46 +08:00 · 95116370b5
parent 1be6ef595d
commit 95116370b5
6 changed files with 84 additions and 28 deletions
--- a/README-CN.md
+++ b/README-CN.md
@ -162,10 +162,10 @@ make
 可以使用Jemalloc作为内存分配器，而不是使用glibc:

 ```bash
-cmake .. -DJEMALLOC_ENABLED=true
+cmake .. -DJEMALLOC_ENABLED=ON
 ```
-TDengine构建脚本可以自动检测x86、x86-64、arm64平台上主机的体系结构。
-您也可以通过CPUTYPE选项手动指定架构:
+TDengine构建脚本可以自动检测 x86、x86-64、arm64 平台上主机的体系结构。
+您也可以通过 CPUTYPE 选项手动指定架构:

 ```bash
 cmake .. -DCPUTYPE=aarch64 && cmake --build .
--- a/README.md
+++ b/README.md
@ -177,7 +177,7 @@ If you want to compile taosKeeper, you need to add the `--DBUILD_KEEPER=true` op
 You can use Jemalloc as memory allocator instead of glibc:

 ```bash
-cmake .. -DJEMALLOC_ENABLED=true
+cmake .. -DJEMALLOC_ENABLED=ON
 ```

 TDengine build script can auto-detect the host machine's architecture on x86, x86-64, arm64 platform.
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@ -116,7 +116,6 @@ ELSE()
    set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz")
 ENDIF()

-# force set all platform to JEMALLOC_ENABLED = false
 # SET(JEMALLOC_ENABLED OFF)

 IF(TD_WINDOWS)
@ -262,10 +261,10 @@ ENDIF()

 IF(TD_LINUX)
    IF(${JEMALLOC_ENABLED})
-        MESSAGE(STATUS "JEMALLOC_ENABLED Enabled")
+        MESSAGE(STATUS "JEMALLOC Enabled")
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=attributes")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=attributes")
    ELSE()
-        MESSAGE(STATUS "JEMALLOC_ENABLED Disabled")
+        MESSAGE(STATUS "JEMALLOC Disabled")
    ENDIF()
 ENDIF()
--- a/source/libs/function/test/CMakeLists.txt
+++ b/source/libs/function/test/CMakeLists.txt
@ -1,33 +1,78 @@
-set(TD_UDF_INC
+
+
+add_executable(runUdf 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"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+    PRIVATE "${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})
+target_link_libraries(
+    runUdf
+    PUBLIC uv_a
+    PRIVATE os util common nodes function
+)

 add_library(udf1 STATIC MODULE udf1.c)
-target_include_directories(udf1 PUBLIC ${TD_UDF_INC})
+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"
+)
+
 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_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"
+)
+
 target_link_libraries(udf1_dup PUBLIC os)

+add_library(udf2 STATIC MODULE 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"
+)
+
+target_link_libraries(udf2 PUBLIC os)
+
 add_library(udf2_dup STATIC MODULE udf2_dup.c)
-target_include_directories(udf2_dup PUBLIC ${TD_UDF_INC})
+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"
+)
+
 target_link_libraries(udf2_dup PUBLIC os)

 set(TARGET_NAMES
@ -53,8 +98,20 @@ set(COMPILE_DEFINITIONS
 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_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})
-    target_link_libraries(${target_name} PUBLIC os)
-endforeach()
+    target_link_libraries(
+        ${target_name} PUBLIC os
+    )
+endforeach()
--- a/tests/ci/container_build_newmachine.sh
+++ b/tests/ci/container_build_newmachine.sh
@ -61,7 +61,7 @@ docker run \
    -v /root/go/pkg/mod:/root/go/pkg/mod \
    -v /root/.cache/go-build:/root/.cache/go-build \
    -v /root/.cos-local.1:/root/.cos-local.2 \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 "
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y; pip3 install taospy==2.7.2; cd $REP_DIR; rm -rf debug ;mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j 10|| exit 1 "
 # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \

 if [[ -d ${WORKDIR}/debugNoSan  ]] ;then
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@ -81,7 +81,7 @@ docker run \
    -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \
    -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
    -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ;make -j|| exit 1"
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ;make -j|| exit 1"
 # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \

 if [[ -d ${WORKDIR}/debugNoSan  ]] ;then
@ -133,7 +133,7 @@ docker run \
    -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \
    -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
    -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j|| exit 1 "
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j|| exit 1 "

 mv  ${REP_REAL_PATH}/debug  ${WORKDIR}/debugSan

@ -168,7 +168,7 @@ date
 #     -v ${REP_REAL_PATH}/community/contrib/xml2/:${REP_DIR}/community/contrib/xml2 \
 #     -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
 #     -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \
-#     --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true -DCMAKE_BUILD_TYPE=Release -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j || exit 1 "
+#     --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y; pip3 install taospy==2.7.2; cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DCMAKE_BUILD_TYPE=Release -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j || exit 1 "

 # mv  ${REP_REAL_PATH}/debug  ${WORKDIR}/debugRelease