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"