Merge branch '3.0' into feature/TD-11274-3.0

cmake/cmake.install

@@ -22,6 +22,7 @@ ELSEIF (TD_WINDOWS)
   INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
   INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosd.exe DESTINATION .)
   INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/udfd.exe DESTINATION .)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosBenchmark.exe DESTINATION .)
 
   IF (TD_MVN_INSTALLED)
     INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.38-dist.jar DESTINATION connector/jdbc)

cmake/cmake.platform

@@ -97,13 +97,13 @@ IF ("${CPUTYPE}" STREQUAL "")
 ELSE ()
   # if generate ARM version:
   #   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
-  IF (${CPUTYPE} MATCHES "aarch32" or ${CPUTYPE} MATCHES "arm32")
+  IF (${CPUTYPE} MATCHES "aarch32" OR ${CPUTYPE} MATCHES "arm32")
     SET(PLATFORM_ARCH_STR "arm")
     MESSAGE(STATUS "input cpuType: aarch32")
     ADD_DEFINITIONS("-D_TD_ARM_")
     ADD_DEFINITIONS("-D_TD_ARM_32")
     SET(TD_ARM_32 TRUE)
-  ELSEIF (${CPUTYPE} MATCHES "aarch64" or ${CPUTYPE} MATCHES "arm64")
+  ELSEIF (${CPUTYPE} MATCHES "aarch64" OR ${CPUTYPE} MATCHES "arm64")
     SET(PLATFORM_ARCH_STR "arm64")
     MESSAGE(STATUS "input cpuType: aarch64")
     ADD_DEFINITIONS("-D_TD_ARM_")

include/os/osSystem.h

@@ -32,6 +32,7 @@ extern "C" {
 typedef struct TdCmd *TdCmdPtr;
 
 TdCmdPtr taosOpenCmd(const char* cmd);
+int64_t  taosGetsCmd(TdCmdPtr pCmd, int32_t maxSize, char *__restrict buf);
 int64_t  taosGetLineCmd(TdCmdPtr pCmd, char** __restrict ptrBuf);
 int32_t  taosEOFCmd(TdCmdPtr pCmd);
 int64_t  taosCloseCmd(TdCmdPtr* ppCmd);

packaging/release.bat

@@ -11,13 +11,13 @@ if !%2==! GOTO USAGE
 if "%1" == "cluster" (
 	set work_dir=%internal_dir%
 	set packagServerName_x64=TDengine-enterprise-server-%2-beta-Windows-x64
-	set packagServerName_x86=TDengine-enterprise-server-%2-beta-Windows-x86
+	@REM set packagServerName_x86=TDengine-enterprise-server-%2-beta-Windows-x86
 	set packagClientName_x64=TDengine-enterprise-client-%2-beta-Windows-x64
 	set packagClientName_x86=TDengine-enterprise-client-%2-beta-Windows-x86
 ) else (
 	set work_dir=%community_dir%
 	set packagServerName_x64=TDengine-server-%2-Windows-x64
-	set packagServerName_x86=TDengine-server-%2-Windows-x86
+	@REM set packagServerName_x86=TDengine-server-%2-Windows-x86
 	set packagClientName_x64=TDengine-client-%2-Windows-x64
 	set packagClientName_x86=TDengine-client-%2-Windows-x86
 )
@@ -59,8 +59,8 @@ rd /s /Q C:\TDengine
 cmake --install .
 if not %errorlevel% == 0  ( call :RUNFAILED build x86 failed & exit /b 1)
 cd %package_dir%
-iscc /DMyAppInstallName="%packagServerName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
-if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x86% failed & exit /b 1)
+@REM iscc /DMyAppInstallName="%packagServerName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
+@REM if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x86% failed & exit /b 1)
 iscc /DMyAppInstallName="%packagClientName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="taosd.exe" tools\tdengine.iss /O..\release
 if not %errorlevel% == 0  ( call :RUNFAILED package %packagClientName_x86% failed & exit /b 1)
 

source/libs/sync/src/syncReplication.c

@@ -199,7 +199,6 @@ int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode) {
 
     // send msg
     syncNodeAppendEntriesBatch(pSyncNode, pDestId, pMsg);
-    syncAppendEntriesBatchDestroy(pMsg);
 
     // speed up
     if (pMsg->dataCount > 0 && pSyncNode->commitIndex - pMsg->prevLogIndex > SYNC_SLOW_DOWN_RANGE) {
@@ -216,6 +215,8 @@ int32_t syncNodeAppendEntriesPeersSnapshot2(SSyncNode* pSyncNode) {
       } while (0);
 #endif
     }
+
+    syncAppendEntriesBatchDestroy(pMsg);
   }
 
   return ret;

source/os/src/osSemaphore.c

@@ -16,6 +16,7 @@
 #define ALLOW_FORBID_FUNC
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "tdef.h"
 #include "pthread.h"
 
 #ifdef WINDOWS
@@ -57,7 +58,7 @@ int32_t taosGetAppName(char* name, int32_t* len) {
     end = filepath;
   }
 
-  strcpy(name, end);
+  tstrncpy(name, end, TSDB_APP_NAME_LEN);
 
   if (len != NULL) {
     *len = (int32_t)strlen(end);
@@ -625,7 +626,7 @@ int32_t taosGetAppName(char *name, int32_t *len) {
   buf[PATH_MAX] = '\0';
   size_t n = strlen(buf);
   if (len) *len = n;
-  if (name) strcpy(name, buf);
+  if (name) tstrncpy(name, buf, TSDB_APP_NAME_LEN);
   return 0;
 }
 
@@ -668,7 +669,7 @@ int32_t taosGetAppName(char* name, int32_t* len) {
 
   ++end;
 
-  strcpy(name, end);
+  tstrncpy(name, end, TSDB_APP_NAME_LEN);
 
   if (len != NULL) {
     *len = strlen(name);

source/os/src/osSysinfo.c

@@ -398,7 +398,7 @@ int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores) {
   if (line != NULL) taosMemoryFree(line);
   taosCloseFile(&pFile);
 
-  if (code != 0) {
+  if (code != 0 && (done & 1) == 0) {
     TdFilePtr pFile1 = taosOpenFile("/proc/device-tree/model", TD_FILE_READ | TD_FILE_STREAM);
     if (pFile1 == NULL) return code;
     taosGetsFile(pFile1, maxLen, cpuModel);
@@ -407,6 +407,16 @@ int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores) {
     done |= 1;
   }
 
+  if (code != 0 && (done & 1) == 0) {
+    TdCmdPtr pCmd = taosOpenCmd("uname -a");
+    if (pCmd == NULL) return code;
+    if (taosGetsCmd(pCmd, maxLen, cpuModel) > 0) {
+      code = 0;
+      done |= 1;
+    }
+    taosCloseCmd(&pCmd);
+  }
+
   if ((done & 2) == 0) {
   	*numOfCores = coreCount;
   	done |= 2;

source/os/src/osSystem.c

@@ -248,6 +248,16 @@ TdCmdPtr taosOpenCmd(const char* cmd) {
 #endif
 }
 
+int64_t taosGetsCmd(TdCmdPtr pCmd, int32_t maxSize, char *__restrict buf) {
+  if (pCmd == NULL || buf == NULL) {
+    return -1;
+  }
+  if (fgets(buf, maxSize, (FILE*)pCmd) == NULL) {
+    return -1;
+  }
+  return strlen(buf);
+}
+
 int64_t taosGetLineCmd(TdCmdPtr pCmd, char** __restrict ptrBuf) {
   if (pCmd == NULL || ptrBuf == NULL) {
     return -1;