From c972a4894578e10afc75e8f91b58b8bbdd41331b Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 6 Jun 2024 12:45:26 +0800
Subject: [PATCH 1/3] fix: industry product uniform -V

---
 src/CMakeLists.txt    | 2 --
 src/benchCommandOpt.c | 6 +++++-
 src/taosdump.c        | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a177a5e..fa1e3eb0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -127,7 +127,6 @@ IF(GIT_FOUND)
     IF ("${TAOSDUMP_COMMIT_SHA1}" STREQUAL "")
         SET(TAOSDUMP_COMMIT_SHA1 "unknown")
     ELSE ()
-        STRING(SUBSTRING "${TAOSDUMP_COMMIT_SHA1}" 0 7 TAOSDUMP_COMMIT_SHA1)
         STRING(STRIP "${TAOSDUMP_COMMIT_SHA1}" TAOSDUMP_COMMIT_SHA1)
     ENDIF ()
     IF ("${TAOSDUMP_TAG}" STREQUAL "")
@@ -139,7 +138,6 @@ IF(GIT_FOUND)
     IF ("${TAOSBENCHMARK_COMMIT_SHA1}" STREQUAL "")
         SET(TAOSBENCHMARK_COMMIT_SHA1 "unknown")
     ELSE ()
-        STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_SHA1}" 0 7 TAOSBENCHMARK_COMMIT_SHA1)
         STRING(STRIP "${TAOSBENCHMARK_COMMIT_SHA1}" TAOSBENCHMARK_COMMIT_SHA1)
     ENDIF ()
     IF ("${TAOSBENCHMARK_TAG}" STREQUAL "")
diff --git a/src/benchCommandOpt.c b/src/benchCommandOpt.c
index faa2e407..35161be4 100644
--- a/src/benchCommandOpt.c
+++ b/src/benchCommandOpt.c
@@ -28,6 +28,10 @@ extern char      g_configDir[MAX_PATH_LEN];
 #define TAOSBENCHMARK_STATUS "unknown"
 #endif
 
+#ifndef TD_PRODUCT_NAME
+#define TD_PRODUCT_NAME "TDengine"
+#endif
+
 // libtaos.so
 extern char buildinfo[];
 
@@ -48,7 +52,7 @@ void printVersion() {
     char taosBenchmark_status[] = TAOSBENCHMARK_STATUS;
 
     // version
-    printf("version: %s\ngitinfo: %s\n", taosBenchmark_ver, taosBenchmark_commit);
+    printf("%s\ntaosBenchmark version: %s\ngit: %s\n", TD_PRODUCT_NAME, taosBenchmark_ver, taosBenchmark_commit);
 #ifdef LINUX
     printf("buildInfo: %s\n ", buildinfo);
 #endif
diff --git a/src/taosdump.c b/src/taosdump.c
index 47c1917e..a4fd79ff 100644
--- a/src/taosdump.c
+++ b/src/taosdump.c
@@ -82,6 +82,9 @@
 #define TAOSDUMP_STATUS "unknown"
 #endif
 
+#ifndef TD_PRODUCT_NAME
+#define TD_PRODUCT_NAME "TDengine"
+#endif
 
 // use 256 as normal buffer length
 #define BUFFER_LEN              256
@@ -670,7 +673,7 @@ static void printVersion(FILE *file) {
 
     char taosdump_commit[] = TAOSDUMP_COMMIT_SHA1;
 
-    fprintf(file,"version: %s\ngitinfo: %s\n", taostools_ver, taosdump_commit);
+    fprintf(file,"%s\ntaosdump version: %s\ngit: %s\n", TD_PRODUCT_NAME, taostools_ver, taosdump_commit);
 #ifdef LINUX
     printf("buildInfo: %s\n ", buildinfo);
 #endif

From 5574e0d9fc485c21b0c6800684ac81f3ea3ee756 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 6 Jun 2024 13:49:42 +0800
Subject: [PATCH 2/3] fix: moidfy git commit length

---
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa1e3eb0..e8a6da33 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -127,6 +127,7 @@ IF(GIT_FOUND)
     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 "")
@@ -138,6 +139,7 @@ IF(GIT_FOUND)
     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 "")

From 193319045d9e4e9311b5bb74ab93e513d8c68b78 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 6 Jun 2024 13:53:49 +0800
Subject: [PATCH 3/3] fix: version info buildInfo to build

---
 src/benchCommandOpt.c | 2 +-
 src/taosdump.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/benchCommandOpt.c b/src/benchCommandOpt.c
index 35161be4..cfff986c 100644
--- a/src/benchCommandOpt.c
+++ b/src/benchCommandOpt.c
@@ -54,7 +54,7 @@ void printVersion() {
     // version
     printf("%s\ntaosBenchmark version: %s\ngit: %s\n", TD_PRODUCT_NAME, taosBenchmark_ver, taosBenchmark_commit);
 #ifdef LINUX
-    printf("buildInfo: %s\n ", buildinfo);
+    printf("build: %s\n ", buildinfo);
 #endif
     if (strlen(taosBenchmark_status) > 0) {
         printf("status: %s\n", taosBenchmark_status);
diff --git a/src/taosdump.c b/src/taosdump.c
index a4fd79ff..334f76d7 100644
--- a/src/taosdump.c
+++ b/src/taosdump.c
@@ -675,7 +675,7 @@ static void printVersion(FILE *file) {
 
     fprintf(file,"%s\ntaosdump version: %s\ngit: %s\n", TD_PRODUCT_NAME, taostools_ver, taosdump_commit);
 #ifdef LINUX
-    printf("buildInfo: %s\n ", buildinfo);
+    printf("build: %s\n ", buildinfo);
 #endif
     if (strlen(taosdump_status) > 0) {
         fprintf(file, "status:%s\n", taosdump_status);