From 64eada9324f7662d84579663a9527d3bc152b1cd Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Mon, 10 Feb 2025 21:39:10 +0800
Subject: [PATCH 01/11] fix: change commit id for taos-tools

---
 tools/taos-tools/src/CMakeLists.txt | 95 +++--------------------------
 1 file changed, 10 insertions(+), 85 deletions(-)

diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index 7b3b487917..c2598d56b0 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -38,63 +38,17 @@ ENDIF ()
 
 FIND_PACKAGE(Git)
 IF(GIT_FOUND)
-    IF (EXISTS "${CMAKE_CURRENT_LIST_DIR}/../VERSION")
-        MESSAGE("Found VERSION file")
-        EXECUTE_PROCESS(
-            COMMAND grep "^taosdump" "${CMAKE_CURRENT_LIST_DIR}/../VERSION"
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSDUMP_FULLTAG
-            )
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 HEAD"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
-            )
-        EXECUTE_PROCESS(
-            COMMAND grep "^taosbenchmark" "${CMAKE_CURRENT_LIST_DIR}/../VERSION"
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSBENCHMARK_FULLTAG
-            )
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 HEAD"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
-            )
-    ELSE ()
-        MESSAGE("Use git tag")
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags|grep taosdump|tail -1"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE TAG_RESULT
-            OUTPUT_VARIABLE TAOSDUMP_FULLTAG
-            )
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 ${TAOSDUMP_FULLTAG}"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
-            )
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags|grep taosbenchmark|tail -1"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE TAG_RESULT
-            OUTPUT_VARIABLE TAOSBENCHMARK_FULLTAG
-            )
-        EXECUTE_PROCESS(
-            COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 ${TAOSBENCHMARK_FULLTAG}"
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
-            )
-    ENDIF ()
+    #commit id
     EXECUTE_PROCESS(
-        COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdump.c"
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSDUMP_STATUS
-        ERROR_QUIET
-        )
+        COMMAND git log -1 --format=%H
+        WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
+        OUTPUT_VARIABLE GIT_COMMIT_ID
+        )    
+
+    SET(TAOSBENCHMARK_COMMIT_SHA1, ${GIT_COMMIT_ID})
+    SET(TAOSDUMP_COMMIT_SHA1, ${GIT_COMMIT_ID})
+    MESSAGE("taosBenchmark commid_id:${TAOSBENCHMARK_COMMIT_SHA1}")
+    MESSAGE("taosdump commid_id:${TAOSDUMP_COMMIT_SHA1}")
 
     # version    
     IF (DEFINED TD_VER_NUMBER)
@@ -118,35 +72,6 @@ IF(GIT_FOUND)
         MESSAGE(STATUS "taosBenchmark use origin version: " ${TAOSBENCHMARK_TAG})        
     ENDIF ()
 
-    EXECUTE_PROCESS(
-        COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. status -z -s ${CMAKE_CURRENT_LIST_DIR}/bench*.c"
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSBENCHMARK_STATUS
-        ERROR_QUIET
-        )
-    IF ("${TAOSDUMP_COMMIT_SHA1}" STREQUAL "")
-        SET(TAOSDUMP_COMMIT_SHA1 "unknown")
-    ELSE ()
-        STRING(SUBSTRING "${TAOSDUMP_COMMIT_SHA1}" 0 40 TAOSDUMP_COMMIT_SHA1)
-        STRING(STRIP "${TAOSDUMP_COMMIT_SHA1}" TAOSDUMP_COMMIT_SHA1)
-    ENDIF ()
-    IF ("${TAOSDUMP_TAG}" STREQUAL "")
-        SET(TAOSDUMP_TAG "0.1.0")
-    ELSE ()
-        STRING(STRIP "${TAOSDUMP_TAG}" TAOSDUMP_TAG)
-    ENDIF ()
-
-    IF ("${TAOSBENCHMARK_COMMIT_SHA1}" STREQUAL "")
-        SET(TAOSBENCHMARK_COMMIT_SHA1 "unknown")
-    ELSE ()
-        STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_SHA1}" 0 40 TAOSBENCHMARK_COMMIT_SHA1)
-        STRING(STRIP "${TAOSBENCHMARK_COMMIT_SHA1}" TAOSBENCHMARK_COMMIT_SHA1)
-    ENDIF ()
-    IF ("${TAOSBENCHMARK_TAG}" STREQUAL "")
-        SET(TAOSBENCHMARK_TAG "0.1.0")
-    ELSE ()
-        STRING(STRIP "${TAOSBENCHMARK_TAG}" TAOSBENCHMARK_TAG)
-    ENDIF ()
 ELSE()
     MESSAGE("Git not found")
     SET(TAOSDUMP_COMMIT_SHA1 "unknown")

From 3fef8682e798ae92c6fc0998c487bb7853241642 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Mon, 10 Feb 2025 21:49:20 +0800
Subject: [PATCH 02/11] fix: get for split taosbenchmark

---
 tools/taos-tools/src/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index c2598d56b0..c98c7487a1 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -42,11 +42,13 @@ IF(GIT_FOUND)
     EXECUTE_PROCESS(
         COMMAND git log -1 --format=%H
         WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
-        OUTPUT_VARIABLE GIT_COMMIT_ID
+        OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
         )    
-
-    SET(TAOSBENCHMARK_COMMIT_SHA1, ${GIT_COMMIT_ID})
-    SET(TAOSDUMP_COMMIT_SHA1, ${GIT_COMMIT_ID})
+    EXECUTE_PROCESS(
+        COMMAND git log -1 --format=%H
+        WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
+        OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
+        )  
     MESSAGE("taosBenchmark commid_id:${TAOSBENCHMARK_COMMIT_SHA1}")
     MESSAGE("taosdump commid_id:${TAOSDUMP_COMMIT_SHA1}")
 

From 8bbc64aa25f37a8e397520ef8a22d6493d907728 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 09:55:36 +0800
Subject: [PATCH 03/11] fix: rebuild printVersion module

---
 tools/taos-tools/src/CMakeLists.txt    | 101 ++++++++++---------------
 tools/taos-tools/src/benchCommandOpt.c |  28 +------
 tools/taos-tools/src/taosdump.c        |  25 ++----
 3 files changed, 50 insertions(+), 104 deletions(-)

diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index c98c7487a1..072baee219 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -36,85 +36,57 @@ ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
     MESSAGE(STATUS "Set CPUTYPE to loongarch64")
 ENDIF ()
 
+#
+# collect --version information
+#
+
+MESSAGE("collect --version show info:")
+# version
+IF (DEFINED TD_VER_NUMBER)
+    ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}")
+    MESSAGE("version:${TD_VER_NUMBER}")
+ELSE ()    
+    # abort build
+    MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.")
+ENDIF ()
+
+# commit id
 FIND_PACKAGE(Git)
 IF(GIT_FOUND)
-    #commit id
+    # get
     EXECUTE_PROCESS(
         COMMAND git log -1 --format=%H
         WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
-        OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
+        OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_ID
         )    
     EXECUTE_PROCESS(
         COMMAND git log -1 --format=%H
         WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
-        OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
-        )  
-    MESSAGE("taosBenchmark commid_id:${TAOSBENCHMARK_COMMIT_SHA1}")
-    MESSAGE("taosdump commid_id:${TAOSDUMP_COMMIT_SHA1}")
-
-    # version    
-    IF (DEFINED TD_VER_NUMBER)
-        # use tdengine version
-        SET(TAOSBENCHMARK_TAG ${TD_VER_NUMBER})   
-        SET(TAOSDUMP_TAG ${TD_VER_NUMBER})
-        MESSAGE(STATUS "use TD_VER_NUMBER version: " ${TD_VER_NUMBER})
-    ELSE ()    
-        # use internal version
-        EXECUTE_PROCESS(
-            COMMAND sh "-c" "echo '${TAOSDUMP_FULLTAG}' | awk -F '-' '{print $2}'"
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSDUMP_TAG
-            )
-        MESSAGE(STATUS "taosdump use origin version: " ${TAOSDUMP_TAG})    
-        EXECUTE_PROCESS(
-            COMMAND sh "-c" "echo '${TAOSBENCHMARK_FULLTAG}' | awk -F '-' '{print $2}'"
-            RESULT_VARIABLE RESULT
-            OUTPUT_VARIABLE TAOSBENCHMARK_TAG
-            )
-        MESSAGE(STATUS "taosBenchmark use origin version: " ${TAOSBENCHMARK_TAG})        
-    ENDIF ()
+        OUTPUT_VARIABLE TAOSDUMP_COMMIT_ID
+        )
+    
+    # show
+    MESSAGE("")
+    MESSAGE("taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
+    MESSAGE("taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
+    MESSAGE("")    
 
+    # define
+    ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}")
+    ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_COMMIT_ID}")        
 ELSE()
-    MESSAGE("Git not found")
-    SET(TAOSDUMP_COMMIT_SHA1 "unknown")
-    SET(TAOSBENCHMARK_COMMIT_SHA1 "unknown")
-    SET(TAOSDUMP_TAG "0.1.0")
-    SET(TAOSDUMP_STATUS "unknown")
-    SET(TAOSBENCHMARK_STATUS "unknown")
+    MESSAGE(FATAL_ERROR "build taos-tools FIND_PACKAGE(Git) failed.")
 ENDIF (GIT_FOUND)
 
-STRING(STRIP "${TAOSDUMP_STATUS}" TAOSDUMP_STATUS)
-STRING(STRIP "${TAOSBENCHMARK_STATUS}" TAOSBENCHMARK_STATUS)
+# build date
+ADD_DEFINITIONS(-DBUILD_DATA="${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
+MESSAGE("build:${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
 
-IF (TAOSDUMP_STATUS MATCHES "M")
-    SET(TAOSDUMP_STATUS "modified")
-ELSE()
-    SET(TAOSDUMP_STATUS "")
-ENDIF ()
 
-IF (TAOSBENCHMARK_STATUS MATCHES "M")
-    SET(TAOSBENCHMARK_STATUS "modified")
-ELSE()
-    SET(TAOSBENCHMARK_STATUS "")
-ENDIF ()
-
-MESSAGE("")
-MESSAGE("taosdump last tag: ${TAOSDUMP_TAG}")
-MESSAGE("taosdump commit: ${TAOSDUMP_COMMIT_SHA1}")
-MESSAGE("taosdump status: ${TAOSDUMP_STATUS}")
-MESSAGE("")
-MESSAGE("taosBenchmark last tag: ${TAOSBENCHMARK_TAG}")
-MESSAGE("taosBenchmark commit: ${TAOSBENCHMARK_COMMIT_SHA1}")
-MESSAGE("taosBenchmark status: ${TAOSBENCHMARK_STATUS}")
-MESSAGE("")
-
-ADD_DEFINITIONS(-DTAOSDUMP_TAG="${TAOSDUMP_TAG}")
-ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_SHA1="${TAOSDUMP_COMMIT_SHA1}")
-ADD_DEFINITIONS(-DTAOSDUMP_STATUS="${TAOSDUMP_STATUS}")
-ADD_DEFINITIONS(-DTAOSBENCHMARK_TAG="${TAOSBENCHMARK_TAG}")
-ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_SHA1="${TAOSBENCHMARK_COMMIT_SHA1}")
-ADD_DEFINITIONS(-DTAOSBENCHMARK_STATUS="${TAOSBENCHMARK_STATUS}")
 
+#
+# build proj
+#
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/build/lib ${CMAKE_BINARY_DIR}/build/lib64)
 LINK_DIRECTORIES(/usr/lib /usr/lib64)
 INCLUDE_DIRECTORIES(/usr/local/taos/include)
@@ -179,6 +151,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
         ENDIF()
     ENDIF ()
 
+    # websocket
     IF (${WEBSOCKET})
         ADD_DEFINITIONS(-DWEBSOCKET)
         INCLUDE_DIRECTORIES(/usr/local/include/)
@@ -204,6 +177,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
         SET(GCC_COVERAGE_LINK_FLAGS    "-lgcov --coverage")
     ENDIF ()
 
+    # sanitizer
     IF (${BUILD_SANITIZER})
         MESSAGE("${Yellow} Enable memory sanitize by BUILD_SANITIZER ${ColourReset}")
         IF (${OS_ID} MATCHES "Darwin")
@@ -215,6 +189,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
         SET(TOOLS_SANITIZE_FLAG "")
     ENDIF ()
 
+    # TOOLS_BUILD_TYPE
     IF (${TOOLS_BUILD_TYPE} MATCHES "Debug")
         IF ((${TOOLS_SANITIZE} MATCHES "true") OR (${BUILD_SANITIZER}))
             MESSAGE("${Yellow} Enable memory sanitize by TOOLS_SANITIZE ${ColourReset}")
diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c
index b868e19bae..d38ee25525 100644
--- a/tools/taos-tools/src/benchCommandOpt.c
+++ b/tools/taos-tools/src/benchCommandOpt.c
@@ -16,20 +16,6 @@
 
 extern char      g_configDir[MAX_PATH_LEN];
 
-// get taosBenchmark commit number version
-#ifndef TAOSBENCHMARK_COMMIT_SHA1
-#define TAOSBENCHMARK_COMMIT_SHA1 "unknown"
-#endif
-
-#ifndef TAOSBENCHMARK_TAG
-#define TAOSBENCHMARK_TAG "0.1.0"
-#endif
-
-#ifndef TAOSBENCHMARK_STATUS
-#define TAOSBENCHMARK_STATUS "unknown"
-#endif
-
-
 char *g_aggreFuncDemo[] = {"*",
                            "count(*)",
                            "avg(current)",
@@ -42,16 +28,10 @@ char *g_aggreFunc[] = {"*",       "count(*)", "avg(C0)",   "sum(C0)",
                        "max(C0)", "min(C0)",  "first(C0)", "last(C0)"};
 
 void printVersion() {
-    char taosBenchmark_ver[] = TAOSBENCHMARK_TAG;
-    char taosBenchmark_commit[] = TAOSBENCHMARK_COMMIT_SHA1;
-    char taosBenchmark_status[] = TAOSBENCHMARK_STATUS;
-
-    // version
-    printf("taosBenchmark version: %s\ngit: %s\n", taosBenchmark_ver, taosBenchmark_commit);
-    printf("build: %s\n", getBuildInfo());
-    if (strlen(taosBenchmark_status) > 0) {
-        printf("status: %s\n", taosBenchmark_status);
-    } 
+    // version, macro define in src/CMakeLists.txt
+    printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
+    printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
+    printf("build: %s\n", BUILD_DATA);
 }
 
 void parseFieldDatatype(char *dataType, BArray *fields, bool isTag) {
diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c
index 7a7b890168..6a2cffe407 100644
--- a/tools/taos-tools/src/taosdump.c
+++ b/tools/taos-tools/src/taosdump.c
@@ -236,8 +236,6 @@ struct arguments g_args = {
     1000        // retrySleepMs
 };
 
-
-
 static uint64_t getUniqueIDFromEpoch() {
     struct timeval tv;
 
@@ -256,24 +254,17 @@ static uint64_t getUniqueIDFromEpoch() {
     return id;
 }
 
-
+// --version -V 
 static void printVersion(FILE *file) {
-    char taostools_longver[] = TAOSDUMP_TAG;
-    char taosdump_status[] = TAOSDUMP_STATUS;
-
-    char *dupSeq = strdup(taostools_longver);
-    char *running = dupSeq;
-    char *taostools_ver = strsep(&running, "-");
-
-    char taosdump_commit[] = TAOSDUMP_COMMIT_SHA1;
-
-    fprintf(file,"taosdump version: %s\ngit: %s\n", taostools_ver, taosdump_commit);
-    printf("build: %s\n", getBuildInfo());
-    if (strlen(taosdump_status) > 0) {
-        fprintf(file, "status:%s\n", taosdump_status);
+    if (file == NULL) {
+        printf("fail, printVersion file is null.\n");
+        return ;
     }
 
-    free(dupSeq);
+    // version, macro define in src/CMakeLists.txt
+    fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER);
+    fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID);
+    fprintf(file, "build: %s\n", BUILD_DATA);
 }
 
 static char *typeToStr(int type) {

From d0d97ce892023767cd75ab7b29d025250d5370dd Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 10:49:37 +0800
Subject: [PATCH 04/11] fix: rename BUILD_INFO macro define

---
 tools/taos-tools/src/CMakeLists.txt    | 19 ++++++++-----------
 tools/taos-tools/src/benchCommandOpt.c |  2 +-
 tools/taos-tools/src/taosdump.c        |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index 072baee219..c25d319cbf 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -39,12 +39,11 @@ ENDIF ()
 #
 # collect --version information
 #
-
 MESSAGE("collect --version show info:")
 # version
 IF (DEFINED TD_VER_NUMBER)
     ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}")
-    MESSAGE("version:${TD_VER_NUMBER}")
+    MESSAGE("-- version:${TD_VER_NUMBER}")
 ELSE ()    
     # abort build
     MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.")
@@ -66,11 +65,8 @@ IF(GIT_FOUND)
         )
     
     # show
-    MESSAGE("")
-    MESSAGE("taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
-    MESSAGE("taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
-    MESSAGE("")    
-
+    MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
+    MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
     # define
     ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}")
     ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_COMMIT_ID}")        
@@ -78,10 +74,11 @@ ELSE()
     MESSAGE(FATAL_ERROR "build taos-tools FIND_PACKAGE(Git) failed.")
 ENDIF (GIT_FOUND)
 
-# build date
-ADD_DEFINITIONS(-DBUILD_DATA="${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
-MESSAGE("build:${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
-
+# build info
+SET(BUILD_INFO, "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
+ADD_DEFINITIONS(-DBUILD_INFO="${BUILD_INFO}")
+MESSAGE("-- build:${BUILD_INFO}")
+MESSAGE("")
 
 
 #
diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c
index d38ee25525..1968a731f5 100644
--- a/tools/taos-tools/src/benchCommandOpt.c
+++ b/tools/taos-tools/src/benchCommandOpt.c
@@ -31,7 +31,7 @@ void printVersion() {
     // version, macro define in src/CMakeLists.txt
     printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
     printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
-    printf("build: %s\n", BUILD_DATA);
+    printf("build: %s\n", BUILD_INFO);
 }
 
 void parseFieldDatatype(char *dataType, BArray *fields, bool isTag) {
diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c
index 6a2cffe407..c4c5f34b91 100644
--- a/tools/taos-tools/src/taosdump.c
+++ b/tools/taos-tools/src/taosdump.c
@@ -264,7 +264,7 @@ static void printVersion(FILE *file) {
     // version, macro define in src/CMakeLists.txt
     fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER);
     fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID);
-    fprintf(file, "build: %s\n", BUILD_DATA);
+    fprintf(file, "build: %s\n", BUILD_INFO);
 }
 
 static char *typeToStr(int type) {

From 6df1d5ad05298b8289ec911fa6db09757e34d84b Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 11:26:24 +0800
Subject: [PATCH 05/11] fix: commit id string have return line

---
 tools/taos-tools/inc/dump.h            | 12 ------------
 tools/taos-tools/src/CMakeLists.txt    | 12 +++++-------
 tools/taos-tools/src/benchCommandOpt.c |  2 +-
 tools/taos-tools/src/taosdump.c        |  6 +++---
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/tools/taos-tools/inc/dump.h b/tools/taos-tools/inc/dump.h
index 4f4beb97aa..1050676af3 100644
--- a/tools/taos-tools/inc/dump.h
+++ b/tools/taos-tools/inc/dump.h
@@ -65,18 +65,6 @@
 #endif
 #endif
 
-// get taosdump commit number version
-#ifndef TAOSDUMP_COMMIT_SHA1
-#define TAOSDUMP_COMMIT_SHA1 "unknown"
-#endif
-
-#ifndef TAOSDUMP_TAG
-#define TAOSDUMP_TAG "0.1.0"
-#endif
-
-#ifndef TAOSDUMP_STATUS
-#define TAOSDUMP_STATUS "unknown"
-#endif
 
 // use 256 as normal buffer length
 #define BUFFER_LEN              256
diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index c25d319cbf..105e714502 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -56,14 +56,12 @@ IF(GIT_FOUND)
     EXECUTE_PROCESS(
         COMMAND git log -1 --format=%H
         WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
-        OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_ID
+        OUTPUT_VARIABLE GIT_COMMIT_ID
         )    
-    EXECUTE_PROCESS(
-        COMMAND git log -1 --format=%H
-        WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
-        OUTPUT_VARIABLE TAOSDUMP_COMMIT_ID
-        )
-    
+
+    STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
+    STRING(SUBSTRING "${TAOSDUMP_COMMIT_ID}"      0 40 GIT_COMMIT_ID)
+
     # show
     MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
     MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c
index 1968a731f5..52f403a75f 100644
--- a/tools/taos-tools/src/benchCommandOpt.c
+++ b/tools/taos-tools/src/benchCommandOpt.c
@@ -30,7 +30,7 @@ char *g_aggreFunc[] = {"*",       "count(*)", "avg(C0)",   "sum(C0)",
 void printVersion() {
     // version, macro define in src/CMakeLists.txt
     printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
-    printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
+    printf("git: %s\n", TAOSBENCHMAR_COMMIT_ID);
     printf("build: %s\n", BUILD_INFO);
 }
 
diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c
index c4c5f34b91..c7b9010f75 100644
--- a/tools/taos-tools/src/taosdump.c
+++ b/tools/taos-tools/src/taosdump.c
@@ -8919,8 +8919,8 @@ static int dumpExtraInfoHead(void *taos, FILE *fp) {
                 errno, strerror(errno));
     }
 
-    char taostools_ver[] = TAOSDUMP_TAG;
-    char taosdump_commit[] = TAOSDUMP_COMMIT_SHA1;
+    char taostools_ver[]   = TD_VER_NUMBER;
+    char taosdump_commit[] = TAOSDUMP_COMMIT_ID;
 
     snprintf(buffer, BUFFER_LEN, "#!"CUS_PROMPT"dump_ver: %s_%s\n",
                 taostools_ver, taosdump_commit);
@@ -9439,7 +9439,7 @@ static int dumpInDbs(const char *dbPath) {
     }
 #endif
 
-    int taosToolsMajorVer = atoi(TAOSDUMP_TAG);
+    int taosToolsMajorVer = atoi(TD_VER_NUMBER);
     if ((g_dumpInDataMajorVer > 1) && (1 == taosToolsMajorVer)) {
         errorPrint("\tThe data file was generated by version %d\n"
                    "\tCannot be restored by current version: %d\n\n"

From f3e3d7d74cad87b438106f9c0342c401c6a4587c Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 11:45:09 +0800
Subject: [PATCH 06/11] fix: SET function no dot error

---
 tools/taos-tools/src/CMakeLists.txt    | 14 +++++++-------
 tools/taos-tools/src/benchCommandOpt.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt
index 105e714502..da05133f89 100644
--- a/tools/taos-tools/src/CMakeLists.txt
+++ b/tools/taos-tools/src/CMakeLists.txt
@@ -43,7 +43,7 @@ MESSAGE("collect --version show info:")
 # version
 IF (DEFINED TD_VER_NUMBER)
     ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}")
-    MESSAGE("-- version:${TD_VER_NUMBER}")
+    MESSAGE(STATUS "version:${TD_VER_NUMBER}")
 ELSE ()    
     # abort build
     MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.")
@@ -59,12 +59,12 @@ IF(GIT_FOUND)
         OUTPUT_VARIABLE GIT_COMMIT_ID
         )    
 
-    STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
-    STRING(SUBSTRING "${TAOSDUMP_COMMIT_ID}"      0 40 GIT_COMMIT_ID)
+    STRING(SUBSTRING "${GIT_COMMIT_ID}" 0 40 TAOSBENCHMARK_COMMIT_ID)
+    SET(TAOSDUMP_COMMIT_ID "${TAOSBENCHMARK_COMMIT_ID}")
 
     # show
-    MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
-    MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
+    MESSAGE(STATUS "taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
+    MESSAGE(STATUS "taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
     # define
     ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}")
     ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_COMMIT_ID}")        
@@ -73,9 +73,9 @@ ELSE()
 ENDIF (GIT_FOUND)
 
 # build info
-SET(BUILD_INFO, "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
+SET(BUILD_INFO "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
 ADD_DEFINITIONS(-DBUILD_INFO="${BUILD_INFO}")
-MESSAGE("-- build:${BUILD_INFO}")
+MESSAGE(STATUS "build:${BUILD_INFO}")
 MESSAGE("")
 
 
diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c
index 52f403a75f..1968a731f5 100644
--- a/tools/taos-tools/src/benchCommandOpt.c
+++ b/tools/taos-tools/src/benchCommandOpt.c
@@ -30,7 +30,7 @@ char *g_aggreFunc[] = {"*",       "count(*)", "avg(C0)",   "sum(C0)",
 void printVersion() {
     // version, macro define in src/CMakeLists.txt
     printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
-    printf("git: %s\n", TAOSBENCHMAR_COMMIT_ID);
+    printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
     printf("build: %s\n", BUILD_INFO);
 }
 

From db0e07dd0482320d0b113252e1b3e0091f849931 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 11:50:26 +0800
Subject: [PATCH 07/11] fix: taodump string for version

---
 tools/taos-tools/src/taosdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c
index c7b9010f75..8593752265 100644
--- a/tools/taos-tools/src/taosdump.c
+++ b/tools/taos-tools/src/taosdump.c
@@ -262,7 +262,7 @@ static void printVersion(FILE *file) {
     }
 
     // version, macro define in src/CMakeLists.txt
-    fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER);
+    fprintf(file, "taosdump version: %s\n", TD_VER_NUMBER);
     fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID);
     fprintf(file, "build: %s\n", BUILD_INFO);
 }

From fde835b450c9fc96c395cc6313df1d57d69e959f Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 15:01:12 +0800
Subject: [PATCH 08/11] fix: add check case

---
 tests/army/tools/benchmark/basic/commandline.py | 17 ++++++++++++++++-
 .../army/tools/taosdump/ws/taosdumpEscapedDb.py | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py
index e1ed3b90a4..6af0644c20 100644
--- a/tests/army/tools/benchmark/basic/commandline.py
+++ b/tests/army/tools/benchmark/basic/commandline.py
@@ -21,16 +21,31 @@ from frame.sql import *
 from frame.caseBase import *
 from frame import *
 
-
 class TDTestCase(TBase):
     def caseDescription(self):
         """
         [TD-11510] taosBenchmark test cases
         """
 
+    def checkVersion(self):
+        # run
+        outputs = etool.runBinFile("taosBenchmark", "-V")
+        print(outputs)
+        if len(outputs) != 3:
+            tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
+        # version string len
+        assert len(outputs[0]) > 34
+        assert len(outputs[1]) > 43
+        assert len(outputs[2]) > 36
+
+        tdLog.info("check taosBenchmark version successfully.")
 
 
     def run(self):
+        # check version
+        self.checkVersion()
+
+        # command line
         binPath = etool.benchMarkFile()
         cmd = (
             "%s -F 7 -n 10 -t 2 -x -y -M -C -d newtest -l 5 -A binary,nchar\(31\) -b tinyint,binary\(23\),bool,nchar -w 29 -E -m $%%^*"
diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
index f338c62688..7709b0e4cc 100644
--- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
+++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
@@ -27,10 +27,24 @@ class TDTestCase(TBase):
         case1<sdsang>: [TS-3072] taosdump dump escaped db name test
         """
 
+    def checkVersion(self):
+        # run
+        outputs = etool.runBinFile("taosdump", "-V")
+        print(outputs)
+        if len(outputs) != 3:
+            tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
+        # version string len
+        assert len(outputs[0]) > 34
+        assert len(outputs[1]) > 43
+        assert len(outputs[2]) > 36
 
+        tdLog.info("check taosdump version successfully.")
 
 
     def run(self):
+        # check version
+        self.checkVersion()
+
         tdSql.prepare()
 
         tdSql.execute("drop database if exists db")

From 806fa9cb7195b4e22c79bbd87b117d4c6c106bdb Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 16:19:33 +0800
Subject: [PATCH 09/11] fix: taodump version is short

---
 tests/army/tools/taosdump/ws/taosdumpEscapedDb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
index 7709b0e4cc..0c9a236e59 100644
--- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
+++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
@@ -34,7 +34,7 @@ class TDTestCase(TBase):
         if len(outputs) != 3:
             tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
         # version string len
-        assert len(outputs[0]) > 34
+        assert len(outputs[0]) > 22
         assert len(outputs[1]) > 43
         assert len(outputs[2]) > 36
 

From 646336a213e53a4f51f9fc8ce8b081291354890e Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 11 Feb 2025 21:59:53 +0800
Subject: [PATCH 10/11] fix: doc taosdump

---
 tests/army/tools/benchmark/basic/commandline.py   | 2 ++
 tests/army/tools/taosdump/ws/taosdumpEscapedDb.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py
index 6af0644c20..12b3e5a920 100644
--- a/tests/army/tools/benchmark/basic/commandline.py
+++ b/tests/army/tools/benchmark/basic/commandline.py
@@ -35,7 +35,9 @@ class TDTestCase(TBase):
             tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
         # version string len
         assert len(outputs[0]) > 34
+        # commid id
         assert len(outputs[1]) > 43
+        # build info
         assert len(outputs[2]) > 36
 
         tdLog.info("check taosBenchmark version successfully.")
diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
index 0c9a236e59..47feb43120 100644
--- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
+++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
@@ -35,7 +35,9 @@ class TDTestCase(TBase):
             tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
         # version string len
         assert len(outputs[0]) > 22
+        # commit id
         assert len(outputs[1]) > 43
+        # build info
         assert len(outputs[2]) > 36
 
         tdLog.info("check taosdump version successfully.")

From fa4fc1bb457d182b41adb0a5e6cbf489cb3359d3 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Wed, 12 Feb 2025 13:45:30 +0800
Subject: [PATCH 11/11] fix: reduce version check length

---
 tests/army/tools/benchmark/basic/commandline.py   | 10 +++++++---
 tests/army/tools/taosdump/ws/taosdumpEscapedDb.py |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py
index 12b3e5a920..0a60e1f876 100644
--- a/tests/army/tools/benchmark/basic/commandline.py
+++ b/tests/army/tools/benchmark/basic/commandline.py
@@ -34,13 +34,17 @@ class TDTestCase(TBase):
         if len(outputs) != 3:
             tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
         # version string len
-        assert len(outputs[0]) > 34
-        # commid id
+        assert len(outputs[0]) > 27
+        assert outputs[0][:22] == "taosBenchmark version:"
+
+        # commit id
         assert len(outputs[1]) > 43
+        assert outputs[1][:4] == "git:"
         # build info
         assert len(outputs[2]) > 36
+        assert outputs[2][:6] == "build:"
 
-        tdLog.info("check taosBenchmark version successfully.")
+        tdLog.info("check taosBenchmark version successfully.")        
 
 
     def run(self):
diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
index 47feb43120..6c535f794e 100644
--- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
+++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
@@ -35,10 +35,13 @@ class TDTestCase(TBase):
             tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
         # version string len
         assert len(outputs[0]) > 22
+        assert outputs[0][:17] == "taosdump version:"
         # commit id
         assert len(outputs[1]) > 43
+        assert outputs[1][:4] == "git:"
         # build info
         assert len(outputs[2]) > 36
+        assert outputs[2][:6] == "build:"
 
         tdLog.info("check taosdump version successfully.")