Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/td-21076

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG ac69142
+        GIT_TAG 4a4027c
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

packaging/tools/make_install.sh

@@ -497,27 +497,27 @@ function install_service_on_systemd() {
 
   taosd_service_config="${service_config_dir}/${serverName}.service"
 
-  ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Description=${productName} server service' >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo [Unit]                             >> ${taosd_service_config}"
+  ${csudo}bash -c "echo Description=${productName} server service >> ${taosd_service_config}"
+  ${csudo}bash -c "echo After=network-online.target        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo Wants=network-online.target        >> ${taosd_service_config}"
   ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
-  ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'ExecStart=/usr/bin/${serverName}'           >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'ExecStartPre=${installDir}/bin/startPre.sh'           >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
+  ${csudo}bash -c "echo [Service]                          >> ${taosd_service_config}"
+  ${csudo}bash -c "echo Type=simple                        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo ExecStart=/usr/bin/${serverName}           >> ${taosd_service_config}"
+  ${csudo}bash -c "echo ExecStartPre=${installDir}/bin/startPre.sh           >> ${taosd_service_config}"
+  ${csudo}bash -c "echo TimeoutStopSec=1000000s            >> ${taosd_service_config}"
+  ${csudo}bash -c "echo LimitNOFILE=infinity               >> ${taosd_service_config}"
+  ${csudo}bash -c "echo LimitNPROC=infinity                >> ${taosd_service_config}"
+  ${csudo}bash -c "echo LimitCORE=infinity                 >> ${taosd_service_config}"
+  ${csudo}bash -c "echo TimeoutStartSec=0                  >> ${taosd_service_config}"
+  ${csudo}bash -c "echo StandardOutput=null                >> ${taosd_service_config}"
+  ${csudo}bash -c "echo Restart=always                     >> ${taosd_service_config}"
+  ${csudo}bash -c "echo StartLimitBurst=3                  >> ${taosd_service_config}"
+  ${csudo}bash -c "echo StartLimitInterval=60s             >> ${taosd_service_config}"
   ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
-  ${csudo}bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
+  ${csudo}bash -c "echo [Install]                          >> ${taosd_service_config}"
+  ${csudo}bash -c "echo WantedBy=multi-user.target         >> ${taosd_service_config}"
   ${csudo}systemctl enable ${serverName}
 }
 

source/dnode/mnode/impl/src/mndConsumer.c

@@ -555,6 +555,12 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) {
     }
 
     if (mndCheckDbPrivilegeByName(pMnode, pMsg->info.conn.user, MND_OPER_READ_DB, pTopic->db) != 0) {
+      mndReleaseTopic(pMnode, pTopic);
+      goto SUBSCRIBE_OVER;
+    }
+
+    if (mndCheckTopicPrivilege(pMnode, pMsg->info.conn.user, MND_OPER_SUBSCRIBE, pTopic) != 0) {
+      mndReleaseTopic(pMnode, pTopic);
       goto SUBSCRIBE_OVER;
     }
 

source/os/src/osSysinfo.c

@@ -97,6 +97,7 @@ LONG WINAPI exceptionHandler(LPEXCEPTION_POINTERS exception);
 
 #include <errno.h>
 #include <libproc.h>
+#include <sys/sysctl.h>
 
 #else
 
@@ -275,34 +276,34 @@ int32_t taosGetEmail(char *email, int32_t maxLen) {
 #endif
 }
 
+
+
 int32_t taosGetOsReleaseName(char *releaseName, int32_t maxLen) {
 #ifdef WINDOWS
   snprintf(releaseName, maxLen, "Windows");
   return 0;
 #elif defined(_TD_DARWIN_64)
-  char    line[1024];
-  size_t  size = 0;
-  int32_t code = -1;
+  char osversion[32];
+  size_t osversion_len = sizeof(osversion) - 1;
+  int osversion_name[] = { CTL_KERN, KERN_OSRELEASE };
 
-  TdFilePtr pFile = taosOpenFile("/etc/os-release", TD_FILE_READ | TD_FILE_STREAM);
-  if (pFile == NULL) return false;
+  if (sysctl(osversion_name, 2, osversion, &osversion_len, NULL, 0) == -1) {
+    return -1;
+  }
 
-  while ((size = taosGetsFile(pFile, sizeof(line), line)) != -1) {
-    line[size - 1] = '\0';
-    if (strncmp(line, "PRETTY_NAME", 11) == 0) {
-      const char *p = strchr(line, '=') + 1;
-      if (*p == '"') {
-        p++;
-        line[size - 2] = 0;
-      }
-      tstrncpy(releaseName, p, maxLen);
-      code = 0;
-      break;
-    }
+  uint32_t major, minor;
+  if (sscanf(osversion, "%u.%u", &major, &minor) != 2) {
+      return -1;
+  }
+  if (major >= 20) {
+      major -= 9; // macOS 11 and newer
+      sprintf(releaseName, "macOS %u.%u", major, minor);
+  } else {
+      major -= 4; // macOS 10.1.1 and newer
+      sprintf(releaseName, "macOS 10.%d.%d", major, minor);
   }
 
-  taosCloseFile(&pFile);
-  return code;
+  return 0;
 #else
   char    line[1024];
   size_t  size = 0;

tools/shell/src/shellWebsocket.c

@@ -223,7 +223,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
       if (code == TSDB_CODE_WS_SEND_TIMEOUT || code == TSDB_CODE_WS_RECV_TIMEOUT) {
         fprintf(stderr, "Hint: use -t to increase the timeout in seconds\n");
       } else if (code == TSDB_CODE_WS_INTERNAL_ERRO || code == TSDB_CODE_WS_CLOSED) {
-        fprintf(stderr, "TDengine server is down, will try to reconnect\n");
+        fprintf(stderr, "TDengine server is disconnected, will try to reconnect\n");
         shell.ws_conn = NULL;
       }
       ws_free_result(res);