Merge remote-tracking branch 'origin/3.0' into enh/TD-26215

cmake/cmake.version

@@ -15,6 +15,18 @@ IF (TD_PRODUCT_NAME)
   ADD_DEFINITIONS(-DTD_PRODUCT_NAME="${TD_PRODUCT_NAME}")
 ENDIF ()
 
+IF (CUS_NAME)
+  ADD_DEFINITIONS(-DCUS_NAME="${CUS_NAME}")
+ENDIF ()
+
+IF (CUS_PROMPT)
+  ADD_DEFINITIONS(-DCUS_PROMPT="${CUS_PROMPT}")
+ENDIF ()
+
+IF (CUS_EMAIL)
+  ADD_DEFINITIONS(-DCUS_EMAIL="${CUS_EMAIL}")
+ENDIF ()
+
 find_program(HAVE_GIT NAMES git)
 
 IF (DEFINED GITINFO)

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
 

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

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

source/client/src/clientEnv.c

@@ -38,13 +38,8 @@
 #include "tversion.h"
 #include "tconv.h"
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
-#include "cus_name.h"
-#endif
 
-#ifndef CUS_PROMPT
+#include "cus_name.h"
-#define CUS_PROMPT "taos"
-#endif
 
 #define TSC_VAR_NOT_RELEASE 1
 #define TSC_VAR_RELEASED    0

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)

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 "<support@taosdata.com>"
-#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."

source/dnode/vnode/src/tqCommon/tqCommon.c

@@ -1225,6 +1225,7 @@ int32_t tqStreamTaskProcessTaskResumeReq(void* handle, int64_t sversion, char* m
     streamMetaReleaseTask(pMeta, pHTask);
   }
 
+  streamMetaReleaseTask(pMeta, pTask);
   return TSDB_CODE_SUCCESS;
 }
 

source/libs/stream/src/streamMeta.c

@@ -573,11 +573,11 @@ void streamMetaClear(SStreamMeta* pMeta) {
 }
 
 void streamMetaClose(SStreamMeta* pMeta) {
-  stDebug("vgId:%d start to close stream meta", pMeta->vgId);
   if (pMeta == NULL) {
     return;
   }
 
+  stDebug("vgId:%d start to close stream meta", pMeta->vgId);
   int32_t code = taosRemoveRef(streamMetaRefPool, pMeta->rid);
   if (code) {
     stError("vgId:%d failed to remove meta ref:%" PRId64 ", code:%s", pMeta->vgId, pMeta->rid, tstrerror(code));

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

source/os/src/osTimer.c

@@ -87,6 +87,8 @@ static TdThread      timerThread;
 static timer_t       timerId;
 static volatile bool stopTimer = false;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
 static void *taosProcessAlarmSignal(void *tharg) {
   // Block the signal
   sigset_t sigset;
@@ -110,8 +112,8 @@ static void *taosProcessAlarmSignal(void *tharg) {
   sevent.sigev_signo = SIGALRM;
 
   if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) {
-     terrno = TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
-     return NULL;
+    return NULL;
   }
 
   taosThreadCleanupPush(taosDeleteTimer, &timerId);
@@ -128,7 +130,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
       break;
     }
 
-    int signo;
+    int     signo;
     int32_t code = 0;
     while (!stopTimer) {
       code = sigwait(&sigset, &signo);
@@ -145,6 +147,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
 
   return NULL;
 }
+#pragma GCC diagnostic pop
 #endif
 
 int taosInitTimer(void (*callback)(int), int ms) {

tests/army/tools/benchmark/basic/commandline.py

@@ -31,18 +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}")
+            tdLog.exit(f"checkVersion return lines count {len(outputs)} != 4")
         # version string len
-        assert len(outputs[0]) > 27
+        assert len(outputs[1]) > 24
-        assert outputs[0][:22] == "taosBenchmark version:"
-
         # commit id
-        assert len(outputs[1]) > 43
+        assert len(outputs[2]) > 43
-        assert outputs[1][:4] == "git:"
+        assert outputs[2][:4] == "git:"
         # build info
-        assert len(outputs[2]) > 36
+        assert len(outputs[3]) > 36
-        assert outputs[2][:6] == "build:"
+        assert outputs[3][:6] == "build:"
 
         tdLog.info("check taosBenchmark version successfully.")        
 

tests/army/tools/taosdump/ws/taosdumpEscapedDb.py

@@ -31,17 +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}")
+            tdLog.exit(f"checkVersion return lines count {len(outputs)} != 4")
         # version string len
-        assert len(outputs[0]) > 22
+        assert len(outputs[1]) > 19
-        assert outputs[0][:17] == "taosdump version:"
         # commit id
-        assert len(outputs[1]) > 43
+        assert len(outputs[2]) > 43
-        assert outputs[1][:4] == "git:"
+        assert outputs[2][:4] == "git:"
         # build info
-        assert len(outputs[2]) > 36
+        assert len(outputs[3]) > 36
-        assert outputs[2][:6] == "build:"
+        assert outputs[3][:6] == "build:"
 
         tdLog.info("check taosdump version successfully.")
 

tools/shell/src/shellArguments.c

@@ -17,16 +17,10 @@
 #include <pwd.h>
 #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 "   -> "
 

tools/shell/src/shellEngine.c

@@ -1267,6 +1267,9 @@ void *shellCancelHandler(void *arg) {
   return NULL;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+
 void *shellThreadLoop(void *arg) {
   setThreadName("shellThreadLoop");
   taosGetOldTerminalMode();
@@ -1298,6 +1301,7 @@ void *shellThreadLoop(void *arg) {
   taosThreadCleanupPop(1);
   return NULL;
 }
+#pragma GCC diagnostic pop
 
 int32_t shellExecute() {
   printf(shell.info.clientVersion, shell.info.cusName, taos_get_client_info(), shell.info.cusName);

tools/taos-tools/inc/dump.h

@@ -49,22 +49,6 @@
 // ---------------- define ----------------
 //
 
-#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     "<support@taosdata.com>"
-#endif
-#endif
-
 
 // use 256 as normal buffer length
 #define BUFFER_LEN              256

tools/taos-tools/src/benchCommandOpt.c

@@ -10,7 +10,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <bench.h>
+ #include "cus_name.h"  // include/util/
+ #include <bench.h>
 #include "benchLog.h"
 #include <toolsdef.h>
 
@@ -29,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("%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);
 }

tools/taos-tools/src/benchSys.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <bench.h>
 #include "benchLog.h"
+#include "cus_name.h"
 
 #ifdef LINUX
 #include <argp.h>
@@ -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       "<support@taosdata.com>"
-#endif
-#endif
 
 #ifdef WINDOWS
 char      g_configDir[MAX_PATH_LEN] = {0};  // "C:\\TDengine\\cfg"};

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
@@ -262,7 +263,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);
 }