Merge branch '3.0' into feature/3.0_interval_hash_optimize

docs/en/12-taos-sql/25-grant.md

 ---
-sidebar_label: Permissions Management
-title: Permissions Management
+sidebar_label: Access Control
+title: User and Access Control
+description: Manage user and user's permission
 ---
 
 This document describes how to manage permissions in TDengine.

packaging/MPtestJenkinsfile

@@ -107,7 +107,7 @@ pipeline {
                 stage('ubuntu16') {
                     agent{label " ubuntu16 "}
                     steps {
-                        timeout(time: 10, unit: 'MINUTES'){
+                        timeout(time: 30, unit: 'MINUTES'){
                             sync_source("${BRANCH_NAME}")
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
@@ -130,7 +130,7 @@ pipeline {
                 stage('ubuntu18') {
                     agent{label " ubuntu18 "}
                     steps {
-                        timeout(time: 10, unit: 'MINUTES'){
+                        timeout(time: 30, unit: 'MINUTES'){
                             sync_source("${BRANCH_NAME}")
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
@@ -153,7 +153,7 @@ pipeline {
                 stage('centos7') {
                     agent{label " centos7_9 "}
                     steps {
-                        timeout(time: 10, unit: 'MINUTES'){
+                        timeout(time: 30, unit: 'MINUTES'){
                             sync_source("${BRANCH_NAME}")
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
@@ -176,7 +176,7 @@ pipeline {
                 stage('centos8') {
                     agent{label " centos8_3 "}
                     steps {
-                        timeout(time: 10, unit: 'MINUTES'){
+                        timeout(time: 30, unit: 'MINUTES'){
                             sync_source("${BRANCH_NAME}")
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging

packaging/docker/README.md

@@ -158,7 +158,7 @@ When you build your application with docker, you should add the TDengine client
 FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y wget
 ENV TDENGINE_VERSION=2.4.0.0
-RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && cd TDengine-client-${TDENGINE_VERSION} \
    && ./install_client.sh \
@@ -265,7 +265,7 @@ Full version of dockerfile could be:
 ```dockerfile
 FROM golang:1.17.6-buster as builder
 ENV TDENGINE_VERSION=2.4.0.0
-RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && cd TDengine-client-${TDENGINE_VERSION} \
    && ./install_client.sh \
@@ -279,7 +279,7 @@ RUN go env && go mod tidy && go build
 FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y wget
 ENV TDENGINE_VERSION=2.4.0.0
-RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
    && cd TDengine-client-${TDENGINE_VERSION} \
    && ./install_client.sh \

packaging/testpackage.sh

@@ -83,8 +83,10 @@ wget https://www.taosdata.com/assets-download/3.0/${originPackageName}
 
 
 if [[ ${packgeName} =~ "deb" ]];then
+    cd ${installPath}
     echo "dpkg ${packgeName}" &&  dpkg -i ${packgeName}
 elif [[ ${packgeName} =~ "rpm" ]];then
+    cd ${installPath}
     echo "rpm ${packgeName}"  && rpm -ivh ${packgeName}
 elif [[ ${packgeName} =~ "tar" ]];then
     echo "tar ${packgeName}" && tar -xvf ${packgeName} 

source/client/src/clientHb.c

@@ -145,7 +145,7 @@ static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalo
 }
 
 static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
-  SClientHbReq *pReq = taosHashGet(pAppHbMgr->activeInfo, &pRsp->connKey, sizeof(SClientHbKey));
+  SClientHbReq *pReq = taosHashAcquire(pAppHbMgr->activeInfo, &pRsp->connKey, sizeof(SClientHbKey));
   if (NULL == pReq) {
     tscWarn("pReq to get activeInfo, may be dropped, refId:%" PRIx64 ", type:%d", pRsp->connKey.tscRid,
             pRsp->connKey.connType);
@@ -260,6 +260,8 @@ static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
     }
   }
 
+  taosHashRelease(pAppHbMgr->activeInfo, pReq);
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -914,10 +916,11 @@ int hbRegisterConn(SAppHbMgr *pAppHbMgr, int64_t tscRefId, int64_t clusterId, in
 }
 
 void hbDeregisterConn(SAppHbMgr *pAppHbMgr, SClientHbKey connKey) {
-  SClientHbReq *pReq = taosHashGet(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
+  SClientHbReq *pReq = taosHashAcquire(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
   if (pReq) {
     tFreeClientHbReq(pReq);
     taosHashRemove(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
+    taosHashRelease(pAppHbMgr->activeInfo, pReq);
   }
 
   if (NULL == pReq) {

source/libs/parser/src/parser.c

@@ -136,8 +136,7 @@ static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) {
 }
 
 static EDealRes rewriteQueryExprAliasImpl(SNode* pNode, void* pContext) {
-  if (nodesIsExprNode(pNode) && QUERY_NODE_COLUMN != nodeType(pNode) && '\0' == ((SExprNode*)pNode)->userAlias[0]) {
-    strcpy(((SExprNode*)pNode)->userAlias, ((SExprNode*)pNode)->aliasName);
+  if (nodesIsExprNode(pNode) && QUERY_NODE_COLUMN != nodeType(pNode)) {
     sprintf(((SExprNode*)pNode)->aliasName, "#%d", *(int32_t*)pContext);
     ++(*(int32_t*)pContext);
   }

tests/script/api/batchprepare.c

@@ -2598,7 +2598,6 @@ void runAll(TAOS *taos) {
   printf("%s Begin\n", gCaseCtrl.caseCatalog);
   runCaseList(taos);
 
-#if 0
   strcpy(gCaseCtrl.caseCatalog, "Micro DB precision Test");
   printf("%s Begin\n", gCaseCtrl.caseCatalog);
   gCaseCtrl.precision = TIME_PRECISION_MICRO;
@@ -2654,7 +2653,6 @@ void runAll(TAOS *taos) {
   gCaseCtrl.bindColNum = 6;
   runCaseList(taos);
   gCaseCtrl.bindColNum = 0;
-#endif
 
 /*
   strcpy(gCaseCtrl.caseCatalog, "Bind Col Type Test");