Merge branch 'main' into fix/TD-21424_TD-21389_TD-21420

cmake/taosadapter_CMakeLists.txt.in

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

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

@@ -633,6 +633,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     const char *status = "ready";
     if (objStatus == SDB_STATUS_CREATING) status = "creating";
     if (objStatus == SDB_STATUS_DROPPING) status = "dropping";
+    if (!mndIsDnodeOnline(pObj->pDnode, curMs)) status = "offline";
     char b3[9 + VARSTR_HEADER_SIZE] = {0};
     STR_WITH_MAXSIZE_TO_VARSTR(b3, status, pShow->pMeta->pSchemas[cols].bytes);
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);

source/libs/parser/src/parAstParser.c

@@ -434,7 +434,7 @@ static int32_t collectMetaKeyFromShowStables(SCollectMetaKeyCxt* pCxt, SShowStmt
                                          pCxt->pMetaCache);
   if (TSDB_CODE_SUCCESS == code) {
     code = reserveUserAuthInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->pUser,
-                                  ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ, pCxt->pMetaCache);
+                                  ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ_OR_WRITE, pCxt->pMetaCache);
   }
   return code;
 }
@@ -452,7 +452,7 @@ static int32_t collectMetaKeyFromShowTables(SCollectMetaKeyCxt* pCxt, SShowStmt*
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = reserveUserAuthInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->pUser,
-                                  ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ, pCxt->pMetaCache);
+                                  ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ_OR_WRITE, pCxt->pMetaCache);
   }
   return code;
 }

source/libs/parser/src/parAuthenticator.c

@@ -97,7 +97,7 @@ static int32_t authInsert(SAuthCxt* pCxt, SInsertStmt* pInsert) {
 }
 
 static int32_t authShowTables(SAuthCxt* pCxt, SShowStmt* pStmt) {
-  return checkAuth(pCxt, ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ);
+  return checkAuth(pCxt, ((SValueNode*)pStmt->pDbName)->literal, AUTH_TYPE_READ_OR_WRITE);
 }
 
 static int32_t authShowCreateTable(SAuthCxt* pCxt, SShowCreateTableStmt* pStmt) {

tests/system-test/0-others/user_control.py

@@ -283,7 +283,7 @@ class TDTestCase:
                 use.error(f"insert into {DBNAME}.{CTBNAME} (ts) values (now())")
             elif check_priv == PRIVILEGES_WRITE:
                 use.query(f"use {DBNAME}")
-                use.error(f"show {DBNAME}.tables")
+                use.query(f"show {DBNAME}.tables")
                 use.error(f"select * from {DBNAME}.{CTBNAME}")
                 use.query(f"insert into {DBNAME}.{CTBNAME} (ts) values (now())")
             elif check_priv is None:

tests/system-test/6-cluster/clusterCommonCheck.py

@@ -174,34 +174,34 @@ class ClusterComCheck:
                 tdLog.exit("mnode number is correct")
             if offlineDnodeNo == 1:
                 if  tdSql.queryResult[0][2]=='offline' :
-                    if  tdSql.queryResult[1][2]=='leader'  and  tdSql.queryResult[1][3]== 'ready'  :
-                        if  tdSql.queryResult[2][2]=='follower' and  tdSql.queryResult[2][3]== 'ready'  :
+                    if  tdSql.queryResult[1][2]=='leader':
+                        if  tdSql.queryResult[2][2]=='follower':
                             tdLog.success("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
-                    elif tdSql.queryResult[1][2]=='follower' and  tdSql.queryResult[1][3]== 'ready' :
-                        if  tdSql.queryResult[2][2]=='leader' and  tdSql.queryResult[2][3]== 'ready' :
+                    elif tdSql.queryResult[1][2]=='follower':
+                        if  tdSql.queryResult[2][2]=='leader':
                             tdLog.debug("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
                 count+=1
             elif offlineDnodeNo == 2:
                 if  tdSql.queryResult[1][2]=='offline' :
-                    if  tdSql.queryResult[0][2]=='leader' and  tdSql.queryResult[0][3]== 'ready' :
-                        if  tdSql.queryResult[2][2]=='follower' and  tdSql.queryResult[2][3]== 'ready' :
+                    if  tdSql.queryResult[0][2]=='leader':
+                        if  tdSql.queryResult[2][2]=='follower':
                             tdLog.debug("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
-                    elif tdSql.queryResult[0][2]=='follower' and  tdSql.queryResult[0][3]== 'ready' :
-                        if  tdSql.queryResult[2][2]=='leader' and  tdSql.queryResult[2][3]== 'ready' :
+                    elif tdSql.queryResult[0][2]=='follower':
+                        if  tdSql.queryResult[2][2]=='leader':
                             tdLog.debug("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
                 count+=1
             elif offlineDnodeNo == 3:
                 if  tdSql.queryResult[2][2]=='offline' :
-                    if  tdSql.queryResult[0][2]=='leader' and  tdSql.queryResult[0][3]== 'ready' :
-                        if  tdSql.queryResult[1][2]=='follower' and  tdSql.queryResult[1][3]== 'ready' :
+                    if  tdSql.queryResult[0][2]=='leader':
+                        if  tdSql.queryResult[1][2]=='follower':
                             tdLog.debug("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
-                    elif tdSql.queryResult[0][2]=='follower' and  tdSql.queryResult[0][3]== 'ready' :
-                        if  tdSql.queryResult[1][2]=='leader' and  tdSql.queryResult[1][3]== 'ready' :
+                    elif tdSql.queryResult[0][2]=='follower':
+                        if  tdSql.queryResult[1][2]=='leader':
                             tdLog.debug("stop mnodes  on dnode %d  successfully in 10s" %offlineDnodeNo)
                             return True
                 count+=1
@@ -219,8 +219,8 @@ class ClusterComCheck:
             else:
                 tdLog.exit("mnode number is correct")
             if  tdSql.queryResult[0][2]=='leader' :
-                if  tdSql.queryResult[1][2]=='offline'  and  tdSql.queryResult[1][3]== 'ready'  :
-                    if  tdSql.queryResult[2][2]=='offline' and  tdSql.queryResult[2][3]== 'ready'  :
+                if  tdSql.queryResult[1][2]=='offline':
+                    if  tdSql.queryResult[2][2]=='offline':
                         tdLog.success("stop mnodes of follower  on dnode successfully in 10s")
                         return True
             count+=1