Merge pull request #20104 from taosdata/feat/3.0_wxy

enh: drop tables syntax optimization

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

@@ -716,7 +716,7 @@ int32_t mndProcessRpcMsg(SRpcMsg *pMsg) {
   } else if (code == 0) {
     mGTrace("msg:%p, successfully processed", pMsg);
   } else {
-    mGError("msg:%p, failed to process since %s, app:%p type:%s", pMsg, terrstr(), pMsg->info.ahandle,
+    mGError("msg:%p, failed to process since %s, app:%p type:%s", pMsg, tstrerror(code), pMsg->info.ahandle,
             TMSG_INFO(pMsg->msgType));
   }
 

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

@@ -893,7 +893,7 @@ static int32_t mndProcessTtlTimer(SRpcMsg *pReq) {
 
 static int32_t mndFindSuperTableTagIndex(const SStbObj *pStb, const char *tagName) {
   for (int32_t tag = 0; tag < pStb->numOfTags; tag++) {
-    if (strcasecmp(pStb->pTags[tag].name, tagName) == 0) {
+    if (strcmp(pStb->pTags[tag].name, tagName) == 0) {
       return tag;
     }
   }
@@ -903,7 +903,7 @@ static int32_t mndFindSuperTableTagIndex(const SStbObj *pStb, const char *tagNam
 
 static int32_t mndFindSuperTableColumnIndex(const SStbObj *pStb, const char *colName) {
   for (int32_t col = 0; col < pStb->numOfColumns; col++) {
-    if (strcasecmp(pStb->pColumns[col].name, colName) == 0) {
+    if (strcmp(pStb->pColumns[col].name, colName) == 0) {
       return col;
     }
   }

source/libs/parser/inc/sql.y

@@ -301,7 +301,7 @@ create_subtable_clause(A) ::=
 %type multi_drop_clause                                                           { SNodeList* }
 %destructor multi_drop_clause                                                     { nodesDestroyList($$); }
 multi_drop_clause(A) ::= drop_table_clause(B).                                    { A = createNodeList(pCxt, B); }
-multi_drop_clause(A) ::= multi_drop_clause(B) drop_table_clause(C).               { A = addNodeToList(pCxt, B, C); }
+multi_drop_clause(A) ::= multi_drop_clause(B) NK_COMMA drop_table_clause(C).      { A = addNodeToList(pCxt, B, C); }
 
 drop_table_clause(A) ::= exists_opt(B) full_table_name(C).                        { A = createDropTableClause(pCxt, B, C); }
 

source/libs/parser/test/parInitialDTest.cpp

@@ -245,6 +245,7 @@ TEST_F(ParserInitialDTest, dropTable) {
   useDb("root", "test");
 
   run("DROP TABLE t1");
+  run("DROP TABLE t1, st1s1, st1s2");
 }
 
 TEST_F(ParserInitialDTest, dropTopic) {

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

@@ -373,7 +373,7 @@ class TDTestCase:
         version = 'version: ' + version
         retVal = retVal.replace("\n", "")
         retVal = retVal.replace("\r", "")
-        if retVal != version:
+        if retVal.startswith(version) == False:
             print ("return version: [%s]"%retVal)
             print ("dict version: [%s]"%version)
             tdLog.exit("taos -V version not match")

tools/shell/inc/shellInt.h

@@ -86,7 +86,7 @@ typedef struct {
   const char* promptContinue;
   const char* osname;
   int32_t     promptSize;
-  char        programVersion[32];
+  char        programVersion[256];
 } SShellOsDetails;
 
 typedef struct {

tools/shell/src/shellArguments.c

@@ -413,7 +413,9 @@ int32_t shellParseArgs(int32_t argc, char *argv[]) {
   sprintf(shell.info.promptHeader, "%s> ", cusPrompt);
   shell.info.promptContinue = TAOS_CONSOLE_PROMPT_CONTINUE;
   shell.info.promptSize = strlen(shell.info.promptHeader);
-  snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), "version: %s", version);
+  snprintf(shell.info.programVersion, sizeof(shell.info.programVersion),
+           "version: %s compatible_version: %s\ngitinfo: %s\nbuildInfo: %s", version, compatible_version, gitinfo,
+           buildinfo);
 
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   shell.info.osname = "Windows";