Merge pull request #750 from taosdata/feat/TD-30458

fix: industry product uniform -V
taosdata · Jun 6, 2024 · b12e18d · b12e18d
2 parents a6b1a12 + 1933190
commit b12e18d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -127,7 +127,7 @@ 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(SUBSTRING "${TAOSDUMP_COMMIT_SHA1}" 0 40 TAOSDUMP_COMMIT_SHA1)
         STRING(STRIP "${TAOSDUMP_COMMIT_SHA1}" TAOSDUMP_COMMIT_SHA1)
     ENDIF ()
     IF ("${TAOSDUMP_TAG}" STREQUAL "")
@@ -139,7 +139,7 @@ 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(SUBSTRING "${TAOSBENCHMARK_COMMIT_SHA1}" 0 40 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
@@ -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,9 +52,9 @@ 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);
+    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
@@ -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,9 +673,9 @@ 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);
+    printf("build: %s\n ", buildinfo);
 #endif
     if (strlen(taosdump_status) > 0) {
         fprintf(file, "status:%s\n", taosdump_status);