From f4774273ee258f74528cbf862401a4b9ed2170ab Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 13 Feb 2025 10:12:36 +0800 Subject: [PATCH] enh: unified oem --version output --- tests/army/tools/benchmark/basic/commandline.py | 2 -- tests/army/tools/taosdump/ws/taosdumpEscapedDb.py | 1 - tools/taos-tools/src/benchCommandOpt.c | 2 +- tools/taos-tools/src/taosdump.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py index 0a60e1f876..6fb26364b7 100644 --- a/tests/army/tools/benchmark/basic/commandline.py +++ b/tests/army/tools/benchmark/basic/commandline.py @@ -35,8 +35,6 @@ class TDTestCase(TBase): tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") # version string len assert len(outputs[0]) > 27 - assert outputs[0][:22] == "taosBenchmark version:" - # commit id assert len(outputs[1]) > 43 assert outputs[1][:4] == "git:" diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py index 6c535f794e..f9a0e31258 100644 --- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py +++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py @@ -35,7 +35,6 @@ 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:" diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c index 1968a731f5..1c072e0105 100644 --- a/tools/taos-tools/src/benchCommandOpt.c +++ b/tools/taos-tools/src/benchCommandOpt.c @@ -29,7 +29,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("%s\n%sBenchmark version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER); printf("git: %s\n", TAOSBENCHMARK_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 8593752265..abe885054b 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, "taosdump version: %s\n", TD_VER_NUMBER); + fprintf(file, "%s\n%sdump version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER); fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID); fprintf(file, "build: %s\n", BUILD_INFO); }