diff --git a/include/os/osDir.h b/include/os/osDir.h index c0d8530b4f..99d3ebccde 100644 --- a/include/os/osDir.h +++ b/include/os/osDir.h @@ -31,9 +31,7 @@ extern "C" { #endif -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" -#endif #ifdef WINDOWS diff --git a/include/util/cus_name.h b/include/util/cus_name.h index 16f677f855..fe05491742 100644 --- a/include/util/cus_name.h +++ b/include/util/cus_name.h @@ -16,12 +16,23 @@ #ifndef _CUS_NAME_H_ #define _CUS_NAME_H_ +// +// support OEM +// +#ifndef TD_PRODUCT_NAME +#ifdef TD_ENTERPRISE +#define TD_PRODUCT_NAME "TDengine Enterprise Edition" +#else +#define TD_PRODUCT_NAME "TDengine Community Edition" +#endif +#endif + #ifndef CUS_NAME #define CUS_NAME "TDengine" #endif #ifndef CUS_PROMPT -#define CUS_PROMPT "taos" +#define CUS_PROMPT "taos" #endif #ifndef CUS_EMAIL diff --git a/include/util/tdef.h b/include/util/tdef.h index 0cfc7ab591..cd7a697e59 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -17,6 +17,7 @@ #define _TD_UTIL_DEF_H_ #include "os.h" +#include "cus_name.h" #ifdef __cplusplus extern "C" { @@ -79,14 +80,6 @@ extern const int32_t TYPE_BYTES[21]; #define TSDB_DEFAULT_PASS "taosdata" #endif -#ifndef TD_PRODUCT_NAME -#ifdef TD_ENTERPRISE -#define TD_PRODUCT_NAME "TDengine Enterprise Edition" -#else -#define TD_PRODUCT_NAME "TDengine Community Edition" -#endif -#endif - #define TSDB_TRUE 1 #define TSDB_FALSE 0 #define TSDB_OK 0 diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c index b69585a356..11bdb16eca 100644 --- a/source/client/src/clientEnv.c +++ b/source/client/src/clientEnv.c @@ -38,13 +38,7 @@ #include "tversion.h" #include "tconv.h" -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" -#endif - -#ifndef CUS_PROMPT -#define CUS_PROMPT "taos" -#endif #define TSC_VAR_NOT_RELEASE 1 #define TSC_VAR_RELEASED 0 diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 5b3a015553..ade301aab7 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -28,9 +28,6 @@ #include "tutil.h" -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) -#include "cus_name.h" -#endif #define CONFIG_PATH_LEN (TSDB_FILENAME_LEN + 12) #define CONFIG_FILE_LEN (CONFIG_PATH_LEN + 32) diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c index b5eeb78b5e..51e4d86acb 100644 --- a/source/dnode/mgmt/exe/dmMain.c +++ b/source/dnode/mgmt/exe/dmMain.c @@ -27,22 +27,8 @@ #include "dmUtil.h" #include "tcs.h" #include "qworker.h" - -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" -#else -#ifndef CUS_NAME -#define CUS_NAME "TDengine" -#endif -#ifndef CUS_PROMPT -#define CUS_PROMPT "taos" -#endif - -#ifndef CUS_EMAIL -#define CUS_EMAIL "" -#endif -#endif // clang-format off #define DM_APOLLO_URL "The apollo string to use when configuring the server, such as: -a 'jsonFile:./tests/cfg.json', cfg.json text can be '{\"fqdn\":\"td1\"}'." #define DM_CFG_DIR "Configuration directory." diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c index 526f1a33e4..6cb0e00b82 100644 --- a/source/os/src/osSysinfo.c +++ b/source/os/src/osSysinfo.c @@ -16,14 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" #include "taoserror.h" - -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" -#else -#ifndef CUS_PROMPT -#define CUS_PROMPT "taos" -#endif -#endif #define PROCESS_ITEM 12 #define UUIDLEN37 37 diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py index 6fb26364b7..f7cd36d9f6 100644 --- a/tests/army/tools/benchmark/basic/commandline.py +++ b/tests/army/tools/benchmark/basic/commandline.py @@ -31,16 +31,16 @@ class TDTestCase(TBase): # run outputs = etool.runBinFile("taosBenchmark", "-V") print(outputs) - if len(outputs) != 3: + if len(outputs) != 4: tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") # version string len - assert len(outputs[0]) > 27 + assert len(outputs[1]) > 24 # commit id - assert len(outputs[1]) > 43 - assert outputs[1][:4] == "git:" + assert len(outputs[2]) > 43 + assert outputs[2][:4] == "git:" # build info - assert len(outputs[2]) > 36 - assert outputs[2][:6] == "build:" + assert len(outputs[3]) > 36 + assert outputs[3][:6] == "build:" 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 f9a0e31258..982cd18002 100644 --- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py +++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py @@ -31,16 +31,16 @@ class TDTestCase(TBase): # run outputs = etool.runBinFile("taosdump", "-V") print(outputs) - if len(outputs) != 3: + if len(outputs) != 4: tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") # version string len - assert len(outputs[0]) > 22 + assert len(outputs[1]) > 19 # commit id - assert len(outputs[1]) > 43 - assert outputs[1][:4] == "git:" + assert len(outputs[2]) > 43 + assert outputs[2][:4] == "git:" # build info - assert len(outputs[2]) > 36 - assert outputs[2][:6] == "build:" + assert len(outputs[3]) > 36 + assert outputs[3][:6] == "build:" tdLog.info("check taosdump version successfully.") diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c index 88918a14ac..ba210850eb 100644 --- a/tools/shell/src/shellArguments.c +++ b/tools/shell/src/shellArguments.c @@ -17,16 +17,10 @@ #include #endif +#include "cus_name.h" #include "shellInt.h" #include "version.h" -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) -#include "cus_name.h" -#else -#ifndef CUS_PROMPT -#define CUS_PROMPT "taos" -#endif -#endif #define TAOS_CONSOLE_PROMPT_CONTINUE " -> " diff --git a/tools/taos-tools/inc/dump.h b/tools/taos-tools/inc/dump.h index 1050676af3..b21dca4343 100644 --- a/tools/taos-tools/inc/dump.h +++ b/tools/taos-tools/inc/dump.h @@ -49,22 +49,6 @@ // ---------------- define ---------------- // -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) -#include -#else -#ifndef CUS_NAME - #define CUS_NAME "TDengine" -#endif - -#ifndef CUS_PROMPT - #define CUS_PROMPT "taos" -#endif - -#ifndef CUS_EMAIL - #define CUS_EMAIL "" -#endif -#endif - // use 256 as normal buffer length #define BUFFER_LEN 256 diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c index 1c072e0105..8c18b54eac 100644 --- a/tools/taos-tools/src/benchCommandOpt.c +++ b/tools/taos-tools/src/benchCommandOpt.c @@ -10,7 +10,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. */ -#include + #include "cus_name.h" // include/util/ + #include #include "benchLog.h" #include diff --git a/tools/taos-tools/src/benchSys.c b/tools/taos-tools/src/benchSys.c index 1a229f2cbd..9e29701515 100644 --- a/tools/taos-tools/src/benchSys.c +++ b/tools/taos-tools/src/benchSys.c @@ -12,6 +12,7 @@ #include #include #include "benchLog.h" +#include "cus_name.h" #ifdef LINUX #include @@ -21,23 +22,7 @@ #endif #endif -extern char version[]; -#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) -#include "cus_name.h" -#else -#ifndef CUS_NAME -#define CUS_NAME "TDengine" -#endif - -#ifndef CUS_PROMPT -#define CUS_PROMPT "taos" -#endif - -#ifndef CUS_EMAIL -#define CUS_EMAIL "" -#endif -#endif #ifdef WINDOWS char g_configDir[MAX_PATH_LEN] = {0}; // "C:\\TDengine\\cfg"}; diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c index abe885054b..d27812b67a 100644 --- a/tools/taos-tools/src/taosdump.c +++ b/tools/taos-tools/src/taosdump.c @@ -11,6 +11,7 @@ #define _GNU_SOURCE +#include "cus_name.h" // include/util/ #include "dump.h" #include "dumpUtil.h" #ifdef WEBSOCKET