refact<cluster>: adjust show types

include/common/tmsg.h

@@ -86,30 +86,31 @@ enum {
 
 typedef enum _mgmt_table {
   TSDB_MGMT_TABLE_START,
-  TSDB_MGMT_TABLE_ACCT,
-  TSDB_MGMT_TABLE_USER,
-  TSDB_MGMT_TABLE_DB,
-  TSDB_MGMT_TABLE_TABLE,
   TSDB_MGMT_TABLE_DNODE,
   TSDB_MGMT_TABLE_MNODE,
+  TSDB_MGMT_TABLE_MODULE,
   TSDB_MGMT_TABLE_QNODE,
   TSDB_MGMT_TABLE_SNODE,
   TSDB_MGMT_TABLE_BNODE,
-  TSDB_MGMT_TABLE_VGROUP,
+  TSDB_MGMT_TABLE_CLUSTER,
+  TSDB_MGMT_TABLE_DB,
+  TSDB_MGMT_TABLE_FUNC,
+  TSDB_MGMT_TABLE_INDEX,
   TSDB_MGMT_TABLE_STB,
-  TSDB_MGMT_TABLE_MODULE,
-  TSDB_MGMT_TABLE_QUERIES,
   TSDB_MGMT_TABLE_STREAMS,
-  TSDB_MGMT_TABLE_VARIABLES,
-  TSDB_MGMT_TABLE_CONNS,
-  TSDB_MGMT_TABLE_TRANS,
+  TSDB_MGMT_TABLE_TABLE,
+  TSDB_MGMT_TABLE_USER,
   TSDB_MGMT_TABLE_GRANTS,
+  TSDB_MGMT_TABLE_VGROUP,
+  TSDB_MGMT_TABLE_TOPICS,
+  TSDB_MGMT_TABLE_CONSUMERS,
+  TSDB_MGMT_TABLE_SUBSCRIBES,
+  TSDB_MGMT_TABLE_TRANS,
+  TSDB_MGMT_TABLE_SMAS,
+  TSDB_MGMT_TABLE_CONFIGS,
+  TSDB_MGMT_TABLE_CONNS,
+  TSDB_MGMT_TABLE_QUERIES,
   TSDB_MGMT_TABLE_VNODES,
-  TSDB_MGMT_TABLE_CLUSTER,
-  TSDB_MGMT_TABLE_STREAMTABLES,
-  TSDB_MGMT_TABLE_TP,
-  TSDB_MGMT_TABLE_FUNC,
-  TSDB_MGMT_TABLE_INDEX,
   TSDB_MGMT_TABLE_MAX,
 } EShowType;
 

include/libs/nodes/nodes.h

@@ -52,7 +52,8 @@ extern "C" {
   for (SListCell* cell = (NULL != (list) ? (list)->pHead : NULL); (NULL != cell ? (node = &(cell->pNode), true) : (node = NULL, false)); cell = cell->pNext)
 
 typedef enum ENodeType {
-  // Syntax nodes are used in parser and planner module, and some are also used in executor module, such as COLUMN, VALUE, OPERATOR, FUNCTION and so on.
+  // Syntax nodes are used in parser and planner module, and some are also used in executor module, such as COLUMN,
+  // VALUE, OPERATOR, FUNCTION and so on.
   QUERY_NODE_COLUMN = 1,
   QUERY_NODE_VALUE,
   QUERY_NODE_OPERATOR,
@@ -69,7 +70,7 @@ typedef enum ENodeType {
   QUERY_NODE_INTERVAL_WINDOW,
   QUERY_NODE_NODE_LIST,
   QUERY_NODE_FILL,
-  QUERY_NODE_RAW_EXPR, // Only be used in parser module.
+  QUERY_NODE_RAW_EXPR,  // Only be used in parser module.
   QUERY_NODE_TARGET,
   QUERY_NODE_DATABLOCK_DESC,
   QUERY_NODE_SLOT_DESC,
@@ -126,30 +127,30 @@ typedef enum ENodeType {
   QUERY_NODE_REDISTRIBUTE_VGROUP_STMT,
   QUERY_NODE_SPLIT_VGROUP_STMT,
   QUERY_NODE_SYNCDB_STMT,
-  QUERY_NODE_SHOW_DATABASES_STMT,
-  QUERY_NODE_SHOW_TABLES_STMT,
-  QUERY_NODE_SHOW_STABLES_STMT,
-  QUERY_NODE_SHOW_USERS_STMT,
   QUERY_NODE_SHOW_DNODES_STMT,
-  QUERY_NODE_SHOW_VGROUPS_STMT,
   QUERY_NODE_SHOW_MNODES_STMT,
   QUERY_NODE_SHOW_MODULES_STMT,
   QUERY_NODE_SHOW_QNODES_STMT,
+  QUERY_NODE_SHOW_SNODES_STMT,
+  QUERY_NODE_SHOW_BNODES_STMT,
+  QUERY_NODE_SHOW_DATABASES_STMT,
   QUERY_NODE_SHOW_FUNCTIONS_STMT,
   QUERY_NODE_SHOW_INDEXES_STMT,
+  QUERY_NODE_SHOW_STABLES_STMT,
   QUERY_NODE_SHOW_STREAMS_STMT,
-  QUERY_NODE_SHOW_APPS_STMT,
-  QUERY_NODE_SHOW_CONNECTIONS_STMT,
+  QUERY_NODE_SHOW_TABLES_STMT,
+  QUERY_NODE_SHOW_USERS_STMT,
   QUERY_NODE_SHOW_LICENCE_STMT,
-  QUERY_NODE_SHOW_CREATE_DATABASE_STMT,
-  QUERY_NODE_SHOW_CREATE_TABLE_STMT,
-  QUERY_NODE_SHOW_CREATE_STABLE_STMT, 
-  QUERY_NODE_SHOW_QUERIES_STMT,
-  QUERY_NODE_SHOW_SCORES_STMT,
+  QUERY_NODE_SHOW_VGROUPS_STMT,
   QUERY_NODE_SHOW_TOPICS_STMT,
-  QUERY_NODE_SHOW_VARIABLE_STMT,
-  QUERY_NODE_SHOW_BNODES_STMT,
-  QUERY_NODE_SHOW_SNODES_STMT,
+  QUERY_NODE_SHOW_CONSUMERS_STMT,
+  QUERY_NODE_SHOW_SUBSCRIBES_STMT,
+  QUERY_NODE_SHOW_TRANS_STMT,
+  QUERY_NODE_SHOW_SMAS_STMT,
+  QUERY_NODE_SHOW_CONFIGS_STMT,
+  QUERY_NODE_SHOW_CONNECTIONS_STMT,
+  QUERY_NODE_SHOW_QUERIES_STMT,
+  QUERY_NODE_SHOW_VNODES_STMT,
   QUERY_NODE_KILL_CONNECTION_STMT,
   QUERY_NODE_KILL_QUERY_STMT,
 

include/util/tdef.h

@@ -106,6 +106,7 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_MODULES                "modules"
 #define TSDB_INS_TABLE_QNODES                 "qnodes"
 #define TSDB_INS_TABLE_BNODES                 "bnodes"
+#define TSDB_INS_TABLE_SNODES                 "snodes"
 #define TSDB_INS_TABLE_CLUSTER                "cluster"
 #define TSDB_INS_TABLE_USER_DATABASES         "user_databases"
 #define TSDB_INS_TABLE_USER_FUNCTIONS         "user_functions"
@@ -115,15 +116,17 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_USER_TABLES            "user_tables"
 #define TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED "user_table_distributed"
 #define TSDB_INS_TABLE_USER_USERS             "user_users"
-#define TSDB_INS_TABLE_VGROUPS                "vgroups"
-#define TSDB_INS_TABLE_BNODES                 "bnodes"
-#define TSDB_INS_TABLE_SNODES                 "snodes"
 #define TSDB_INS_TABLE_LICENCES               "grants"
+#define TSDB_INS_TABLE_VGROUPS                "vgroups"
+#define TSDB_INS_TABLE_TOPICS                 "topics"
+#define TSDB_INS_TABLE_CONSUMERS              "consumers"
+#define TSDB_INS_TABLE_SUBSCRIBES             "subscribes"
 #define TSDB_INS_TABLE_TRANS                  "trans"
 #define TSDB_INS_TABLE_SMAS                   "smas"
 #define TSDB_INS_TABLE_CONFIGS                "configs"
 #define TSDB_INS_TABLE_CONNS                  "connections"
 #define TSDB_INS_TABLE_QUERIES                "queries"
+#define TSDB_INS_TABLE_VNODES                 "vnodes"
 
 #define TSDB_INDEX_TYPE_SMA      "SMA"
 #define TSDB_INDEX_TYPE_FULLTEXT "FULLTEXT"

source/dnode/mgmt/test/sut/inc/sut.h

@@ -20,7 +20,6 @@
 #include "os.h"
 
 #include "dnode.h"
-#include "tmsg.h"
 #include "tdataformat.h"
 #include "tglobal.h"
 #include "tmsg.h"
@@ -48,92 +47,61 @@ class Testbase {
   int32_t    connId;
 
  public:
-  void SendShowMetaReq(int8_t showType, const char* db);
-  void SendShowRetrieveReq();
-
-  STableMetaRsp*     GetShowMeta();
-  SRetrieveTableRsp* GetRetrieveRsp();
+  int32_t SendShowReq(int8_t showType, const char *tb, const char* db);
+  int32_t GetShowRows();
 
+#if 0
   int32_t     GetMetaNum();
   const char* GetMetaTbName();
-  int32_t     GetMetaColId(int32_t index);
-  int8_t      GetMetaType(int32_t index);
-  int32_t     GetMetaBytes(int32_t index);
-  const char* GetMetaName(int32_t index);
-
-  const char* GetShowName();
-  int32_t     GetShowRows();
-  int8_t      GetShowInt8();
-  int16_t     GetShowInt16();
-  int32_t     GetShowInt32();
-  int64_t     GetShowInt64();
-  int64_t     GetShowTimestamp();
-  const char* GetShowBinary(int32_t len);
+  int8_t      GetMetaType(int32_t col);
+  int32_t     GetMetaBytes(int32_t col);
+  const char* GetMetaName(int32_t col);
+
+  int8_t      GetShowInt8(int32_t row, int32_t col);
+  int16_t     GetShowInt16(int32_t row, int32_t col);
+  int32_t     GetShowInt32(int32_t row, int32_t col);
+  int64_t     GetShowInt64(int32_t row, int32_t col);
+  int64_t     GetShowTimestamp(int32_t row, int32_t col);
+  const char* GetShowBinary(int32_t row, int32_t col);
+#endif
 
  private:
-  int64_t            showId;
-  STableMetaRsp      metaRsp;
-  SRetrieveTableRsp* pRetrieveRsp;
-  char*              pData;
-  int32_t            pos;
+  SRetrieveMetaTableRsp* showRsp;
 };
 
+#if 0
+
 #define CHECK_META(tbName, numOfColumns)        \
   {                                             \
     EXPECT_EQ(test.GetMetaNum(), numOfColumns); \
     EXPECT_STREQ(test.GetMetaTbName(), tbName); \
   }
 
-#define CHECK_SCHEMA(colId, type, bytes, colName)   \
-  {                                                 \
-    EXPECT_EQ(test.GetMetaType(colId), type);       \
-    EXPECT_EQ(test.GetMetaBytes(colId), bytes);     \
-    EXPECT_STREQ(test.GetMetaName(colId), colName); \
-  }
-
-#define CheckBinary(val, len) \
-  { EXPECT_STREQ(test.GetShowBinary(len), val); }
-
-#define CheckBinaryByte(b, len)                   \
+#define CHECK_SCHEMA(col, type, bytes, colName)   \
   {                                               \
-    char* bytes = (char*)taosMemoryCalloc(1, len);          \
-    for (int32_t i = 0; i < len - 1; ++i) {       \
-      bytes[i] = b;                               \
-    }                                             \
-    EXPECT_STREQ(test.GetShowBinary(len), bytes); \
+    EXPECT_EQ(test.GetMetaType(col), type);       \
+    EXPECT_EQ(test.GetMetaBytes(col), bytes);     \
+    EXPECT_STREQ(test.GetMetaName(col), colName); \
   }
 
+#define CheckBinary(row, col, val) \
+  { EXPECT_STREQ(test.GetShowBinary(row, col), val); }
+
 #define CheckInt8(val) \
-  { EXPECT_EQ(test.GetShowInt8(), val); }
+  { EXPECT_EQ(test.GetShowInt8(row, col), val); }
 
 #define CheckInt16(val) \
-  { EXPECT_EQ(test.GetShowInt16(), val); }
+  { EXPECT_EQ(test.GetShowInt16(row, col), val); }
 
 #define CheckInt32(val) \
-  { EXPECT_EQ(test.GetShowInt32(), val); }
+  { EXPECT_EQ(test.GetShowInt32row, col(), val); }
 
 #define CheckInt64(val) \
-  { EXPECT_EQ(test.GetShowInt64(), val); }
+  { EXPECT_EQ(test.GetShowInt64(row, col), val); }
 
 #define CheckTimestamp() \
-  { EXPECT_GT(test.GetShowTimestamp(), 0); }
-
-#define IgnoreBinary(len) \
-  { test.GetShowBinary(len); }
-
-#define IgnoreInt8() \
-  { test.GetShowInt8(); }
-
-#define IgnoreInt16() \
-  { test.GetShowInt16(); }
-
-#define IgnoreInt32() \
-  { test.GetShowInt32(); }
-
-#define IgnoreInt64() \
-  { test.GetShowInt64(); }
+  { EXPECT_GT(test.GetShowTimestamp(row, col), 0); }
 
-#define IgnoreTimestamp() \
-  { test.GetShowTimestamp(); }
+#endif
 
 #endif /* _TD_TEST_BASE_H_ */

source/dnode/mgmt/test/sut/src/sut.cpp

@@ -49,16 +49,14 @@ void Testbase::Init(const char* path, int16_t port) {
   InitLog("/tmp/td");
   server.Start(path, fqdn, port, firstEp);
   client.Init("root", "taosdata", fqdn, port);
-
-  tFreeSTableMetaRsp(&metaRsp);
-  showId = 0;
-  pData = 0;
-  pos = 0;
-  pRetrieveRsp = NULL;
+  showRsp = NULL;
 }
 
 void Testbase::Cleanup() {
-  tFreeSTableMetaRsp(&metaRsp);
+  if (showRsp != NULL) {
+    rpcFreeCont(showRsp);
+    showRsp = NULL;
+  }
   client.Cleanup();
   taosMsleep(10);
   server.Stop();
@@ -84,112 +82,40 @@ SRpcMsg* Testbase::SendReq(tmsg_t msgType, void* pCont, int32_t contLen) {
   return client.SendReq(&rpcMsg);
 }
 
-void Testbase::SendShowMetaReq(int8_t showType, const char* db) {
-  SShowReq showReq = {0};
-  showReq.type = showType;
-  strcpy(showReq.db, db);
-
-  int32_t contLen = tSerializeSShowReq(NULL, 0, &showReq);
-  void*   pReq = rpcMallocCont(contLen);
-  tSerializeSShowReq(pReq, contLen, &showReq);
-  tFreeSShowReq(&showReq);
-
-  SRpcMsg* pRsp = SendReq(TDMT_MND_SHOW, pReq, contLen);
-  ASSERT(pRsp->pCont != nullptr);
-
-  if (pRsp->contLen == 0) return;
-
-  SShowRsp showRsp = {0};
-  tDeserializeSShowRsp(pRsp->pCont, pRsp->contLen, &showRsp);
-  tFreeSTableMetaRsp(&metaRsp);
-  metaRsp = showRsp.tableMeta;
-  showId = showRsp.showId;
-}
-
-int32_t Testbase::GetMetaColId(int32_t index) {
-  SSchema* pSchema = &metaRsp.pSchemas[index];
-  return pSchema->colId;
-}
-
-int8_t Testbase::GetMetaType(int32_t index) {
-  SSchema* pSchema = &metaRsp.pSchemas[index];
-  return pSchema->type;
-}
-
-int32_t Testbase::GetMetaBytes(int32_t index) {
-  SSchema* pSchema = &metaRsp.pSchemas[index];
-  return pSchema->bytes;
-}
-
-const char* Testbase::GetMetaName(int32_t index) {
-  SSchema* pSchema = &metaRsp.pSchemas[index];
-  return pSchema->name;
-}
-
-int32_t Testbase::GetMetaNum() { return metaRsp.numOfColumns; }
-
-const char* Testbase::GetMetaTbName() { return metaRsp.tbName; }
+int32_t Testbase::SendShowReq(int8_t showType, const char *tb, const char* db) {
+  if (showRsp != NULL) {
+    rpcFreeCont(showRsp);
+    showRsp = NULL;
+  }
 
-void Testbase::SendShowRetrieveReq() {
   SRetrieveTableReq retrieveReq = {0};
-  retrieveReq.showId = showId;
-//  retrieveReq.free = 0;
+  retrieveReq.type = showType;
+  strcpy(retrieveReq.db, db);
+  strcpy(retrieveReq.tb, tb);
 
   int32_t contLen = tSerializeSRetrieveTableReq(NULL, 0, &retrieveReq);
   void*   pReq = rpcMallocCont(contLen);
   tSerializeSRetrieveTableReq(pReq, contLen, &retrieveReq);
 
-//  SRpcMsg* pRsp = SendReq(TDMT_MND_SHOW_RETRIEVE, pReq, contLen);
-//  pRetrieveRsp = (SRetrieveTableRsp*)pRsp->pCont;
-//  pRetrieveRsp->numOfRows = htonl(pRetrieveRsp->numOfRows);
-//  pRetrieveRsp->useconds = htobe64(pRetrieveRsp->useconds);
-//  pRetrieveRsp->compLen = htonl(pRetrieveRsp->compLen);
-
-  pData = pRetrieveRsp->data;
-  pos = 0;
-}
-
-const char* Testbase::GetShowName() { return metaRsp.tbName; }
-
-int8_t Testbase::GetShowInt8() {
-  int8_t data = *((int8_t*)(pData + pos));
-  pos += sizeof(int8_t);
-  return data;
-}
-
-int16_t Testbase::GetShowInt16() {
-  int16_t data = *((int16_t*)(pData + pos));
-  pos += sizeof(int16_t);
-  return data;
-}
+  SRpcMsg* pRsp = SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
+  ASSERT(pRsp->pCont != nullptr);
 
-int32_t Testbase::GetShowInt32() {
-  int32_t data = *((int32_t*)(pData + pos));
-  pos += sizeof(int32_t);
-  return data;
-}
+  if (pRsp->contLen == 0) return -1;
 
-int64_t Testbase::GetShowInt64() {
-  int64_t data = *((int64_t*)(pData + pos));
-  pos += sizeof(int64_t);
-  return data;
-}
+  showRsp = (SRetrieveMetaTableRsp*)pRsp->pCont;
+  showRsp->handle = htobe64(showRsp->handle);  // show Id
+  showRsp->useconds = htobe64(showRsp->useconds);
+  showRsp->numOfRows = htonl(showRsp->numOfRows);
+  showRsp->compLen = htonl(showRsp->compLen);
+  if (showRsp->numOfRows <= 0) return -1;
 
-int64_t Testbase::GetShowTimestamp() {
-  int64_t data = *((int64_t*)(pData + pos));
-  pos += sizeof(int64_t);
-  return data;
+  return 0;
 }
 
-const char* Testbase::GetShowBinary(int32_t len) {
-  pos += sizeof(VarDataLenT);
-  char* data = (char*)(pData + pos);
-  pos += len;
-  return data;
+int32_t Testbase::GetShowRows() {
+  if (showRsp != NULL) {
+    return showRsp->numOfRows;
+  } else {
+    return 0;
+  }
 }
-
-int32_t Testbase::GetShowRows() { return pRetrieveRsp->numOfRows; }
-
-STableMetaRsp* Testbase::GetShowMeta() { return &metaRsp; }
-
-SRetrieveTableRsp* Testbase::GetRetrieveRsp() { return pRetrieveRsp; }

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

@@ -73,8 +73,8 @@ int32_t mndInitDnode(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_DND_CONFIG_DNODE_RSP, mndProcessConfigDnodeRsp);
   mndSetMsgHandle(pMnode, TDMT_MND_STATUS, mndProcessStatusReq);
 
-  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_VARIABLES, mndRetrieveConfigs);
-  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_VARIABLES, mndCancelGetNextConfig);
+  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_CONFIGS, mndRetrieveConfigs);
+  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_CONFIGS, mndCancelGetNextConfig);
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_DNODE, mndRetrieveDnodes);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_DNODE, mndCancelGetNextDnode);
 

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

@@ -290,6 +290,9 @@ static const SInfosTableMeta infosMeta[] = {
     {TSDB_INS_TABLE_USER_USERS, userUsersSchema, tListLen(userUsersSchema)},
     {TSDB_INS_TABLE_LICENCES, grantsSchema, tListLen(grantsSchema)},
     {TSDB_INS_TABLE_VGROUPS, vgroupsSchema, tListLen(vgroupsSchema)},
+    {TSDB_INS_TABLE_TOPICS, topicSchema, tListLen(topicSchema)},
+    {TSDB_INS_TABLE_CONSUMERS, consumerSchema, tListLen(consumerSchema)},
+    {TSDB_INS_TABLE_SUBSCRIBES, subscribeSchema, tListLen(subscribeSchema)},
     {TSDB_INS_TABLE_TRANS, transSchema, tListLen(transSchema)},
     {TSDB_INS_TABLE_SMAS, smaSchema, tListLen(smaSchema)},
     {TSDB_INS_TABLE_CONFIGS, configSchema, tListLen(configSchema)},

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

@@ -58,8 +58,8 @@ int32_t mndInitStream(SMnode *pMnode) {
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM, mndProcessDropStreamReq);*/
   /*mndSetMsgHandle(pMnode, TDMT_MND_DROP_STREAM_RSP, mndProcessDropStreamInRsp);*/
 
-  //  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TP, mndRetrieveStream);
-  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TP, mndCancelGetNextStream);
+  //  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TOPICS, mndRetrieveStream);
+  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TOPICS, mndCancelGetNextStream);
 
   return sdbSetTable(pMnode->pSdb, table);
 }

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

@@ -51,8 +51,8 @@ int32_t mndInitTopic(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_TOPIC, mndProcessDropTopicReq);
   mndSetMsgHandle(pMnode, TDMT_VND_DROP_TOPIC_RSP, mndProcessDropTopicInRsp);
 
-//  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TP, mndRetrieveTopic);
-  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TP, mndCancelGetNextTopic);
+//  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TOPICS, mndRetrieveTopic);
+  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TOPICS, mndCancelGetNextTopic);
 
   return sdbSetTable(pMnode->pSdb, table);
 }

source/dnode/mnode/impl/test/acct/acct.cpp

@@ -54,17 +54,3 @@ TEST_F(MndTestAcct, 03_Drop_Acct) {
   ASSERT_NE(pRsp, nullptr);
   ASSERT_EQ(pRsp->code, TSDB_CODE_MND_MSG_NOT_PROCESSED);
 }
-
-TEST_F(MndTestAcct, 04_Show_Acct) {
-  SShowReq showReq = {0};
-  showReq.type = TSDB_MGMT_TABLE_ACCT;
-
-  int32_t contLen = tSerializeSShowReq(NULL, 0, &showReq);
-  void*   pReq = rpcMallocCont(contLen);
-  tSerializeSShowReq(pReq, contLen, &showReq);
-  tFreeSShowReq(&showReq);
-
-  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
-  ASSERT_NE(pRsp, nullptr);
-  ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_MSG);
-}
\ No newline at end of file

source/dnode/mnode/impl/test/bnode/mbnode.cpp

@@ -39,14 +39,7 @@ Testbase   MndTestBnode::test;
 TestServer MndTestBnode::server2;
 
 TEST_F(MndTestBnode, 01_Show_Bnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_BNODE, "");
-  CHECK_META("show bnodes", 3);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_BNODE, "bnodes", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -76,14 +69,8 @@ TEST_F(MndTestBnode, 02_Create_Bnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_BNODE, "");
-    CHECK_META("show bnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_BNODE, "bnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9018", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
@@ -115,8 +102,7 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     ASSERT_EQ(pRsp->code, 0);
 
     taosMsleep(1300);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -132,16 +118,8 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_BNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_BNODE, "bnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9018", TSDB_EP_LEN);
-    CheckBinary("localhost:9019", TSDB_EP_LEN);
-    CheckTimestamp();
-    CheckTimestamp();
   }
 
   {
@@ -156,13 +134,8 @@ TEST_F(MndTestBnode, 03_Drop_Bnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_BNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_BNODE, "bnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9018", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {

source/dnode/mnode/impl/test/topic/topic.cpp

@@ -99,7 +99,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  { test.SendShowMetaReq(TSDB_MGMT_TABLE_TP, ""); }
+  { test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, ""); }
 
   {
     int32_t  contLen = 0;
@@ -126,7 +126,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TP, dbname);
+    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     CHECK_META("show topics", 3);
 
     CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE, "name");
@@ -143,7 +143,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     // restart
     test.Restart();
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TP, dbname);
+    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
 
@@ -167,7 +167,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_TOPIC_NOT_EXIST);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TP, dbname);
+    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 0);
   }

source/libs/executor/src/scanoperator.c

@@ -772,24 +772,22 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataB
   // TODO remove it
   int32_t     tableType = 0;
   const char* name = tNameGetTableName(pName);
-  if (strncasecmp(name, TSDB_INS_TABLE_USER_DATABASES, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_DB;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_USER_USERS, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_USER;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_DNODES, tListLen(pName->tname)) == 0) {
+  if (strncasecmp(name, TSDB_INS_TABLE_DNODES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_DNODE;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_LICENCES, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_GRANTS;
   } else if (strncasecmp(name, TSDB_INS_TABLE_MNODES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_MNODE;
   } else if (strncasecmp(name, TSDB_INS_TABLE_MODULES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_MODULE;
   } else if (strncasecmp(name, TSDB_INS_TABLE_QNODES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_QNODE;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_SNODES, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_SNODE;
   } else if (strncasecmp(name, TSDB_INS_TABLE_BNODES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_BNODE;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_SNODES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_SNODE;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_CLUSTER, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_CLUSTER;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_USER_DATABASES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_DB;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_FUNCTIONS, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_FUNC;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_INDEXES, tListLen(pName->tname)) == 0) {
@@ -800,13 +798,33 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataB
     tableType = TSDB_MGMT_TABLE_STREAMS;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_TABLES, tListLen(pName->tname)) == 0) {
     tableType = TSDB_MGMT_TABLE_TABLE;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_VGROUPS, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_VGROUP;
   } else if (strncasecmp(name, TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED, tListLen(pName->tname)) == 0) {
     //    tableType = TSDB_MGMT_TABLE_DIST;
-  } else if (strncasecmp(name, TSDB_INS_TABLE_CLUSTER, tListLen(pName->tname)) == 0) {
-    tableType = TSDB_MGMT_TABLE_CLUSTER;
-  } else {
+  } else if (strncasecmp(name, TSDB_INS_TABLE_USER_USERS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_USER;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_LICENCES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_GRANTS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_VGROUPS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_VGROUP;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_TOPICS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_TOPICS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_CONSUMERS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_CONSUMERS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_SUBSCRIBES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_SUBSCRIBES;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_TRANS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_TRANS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_SMAS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_SMAS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_CONFIGS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_CONFIGS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_CONNS, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_CONNS;
+  } else if (strncasecmp(name, TSDB_INS_TABLE_QUERIES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_QUERIES;
+  }  else if (strncasecmp(name, TSDB_INS_TABLE_VNODES, tListLen(pName->tname)) == 0) {
+    tableType = TSDB_MGMT_TABLE_VNODES;
+  }else {
     ASSERT(0);
   }
 

source/libs/nodes/src/nodesCodeFuncs.c

@@ -132,30 +132,52 @@ const char* nodesNodeName(ENodeType type) {
       return "DropTopicStmt";
     case QUERY_NODE_ALTER_LOCAL_STMT:
       return "AlterLocalStmt";
-    case QUERY_NODE_SHOW_DATABASES_STMT:
-      return "ShowDatabaseStmt";
-    case QUERY_NODE_SHOW_TABLES_STMT:
-      return "ShowTablesStmt";
-    case QUERY_NODE_SHOW_STABLES_STMT:
-      return "ShowStablesStmt";
-    case QUERY_NODE_SHOW_USERS_STMT:
-      return "ShowUsersStmt";
     case QUERY_NODE_SHOW_DNODES_STMT:
       return "ShowDnodesStmt";
-    case QUERY_NODE_SHOW_VGROUPS_STMT:
-      return "ShowVgroupsStmt";
     case QUERY_NODE_SHOW_MNODES_STMT:
       return "ShowMnodesStmt";
     case QUERY_NODE_SHOW_MODULES_STMT:
       return "ShowModulesStmt";
     case QUERY_NODE_SHOW_QNODES_STMT:
       return "ShowQnodesStmt";
+    case QUERY_NODE_SHOW_SNODES_STMT:
+      return "ShowSnodesStmt";
+    case QUERY_NODE_SHOW_BNODES_STMT:
+      return "ShowBnodesStmt";
+    case QUERY_NODE_SHOW_DATABASES_STMT:
+      return "ShowDatabaseStmt";
     case QUERY_NODE_SHOW_FUNCTIONS_STMT:
       return "ShowFunctionsStmt";
     case QUERY_NODE_SHOW_INDEXES_STMT:
       return "ShowIndexesStmt";
+    case QUERY_NODE_SHOW_STABLES_STMT:
+      return "ShowStablesStmt";
     case QUERY_NODE_SHOW_STREAMS_STMT:
       return "ShowStreamsStmt";
+    case QUERY_NODE_SHOW_TABLES_STMT:
+      return "ShowTablesStmt";
+    case QUERY_NODE_SHOW_USERS_STMT:
+      return "ShowUsersStmt";
+    case QUERY_NODE_SHOW_LICENCE_STMT:
+      return "ShowGrantsStmt";
+    case QUERY_NODE_SHOW_VGROUPS_STMT:
+      return "ShowVgroupsStmt";
+    case QUERY_NODE_SHOW_TOPICS_STMT:
+      return "ShowTopicsStmt";
+    case QUERY_NODE_SHOW_CONSUMERS_STMT:
+      return "ShowConsumersStmt";
+    case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
+      return "ShowSubscribesStmt";
+    case QUERY_NODE_SHOW_TRANS_STMT:
+      return "ShowTransStmt";
+    case QUERY_NODE_SHOW_SMAS_STMT:
+      return "ShowSmasStmt";
+    case QUERY_NODE_SHOW_CONFIGS_STMT:
+      return "ShowConfigsStmt";
+    case QUERY_NODE_SHOW_QUERIES_STMT:
+      return "ShowQueriesStmt";
+    case QUERY_NODE_SHOW_VNODES_STMT:
+      return "ShowVnodeStmt";
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return "LogicScan";
     case QUERY_NODE_LOGIC_PLAN_JOIN:

source/libs/nodes/src/nodesUtilFuncs.c

@@ -146,30 +146,29 @@ SNodeptr nodesMakeNode(ENodeType type) {
       return makeNode(type, sizeof(SDescribeStmt));
     case QUERY_NODE_RESET_QUERY_CACHE_STMT:
       return makeNode(type, sizeof(SNode));
-    case QUERY_NODE_SHOW_DATABASES_STMT:
-    case QUERY_NODE_SHOW_TABLES_STMT:
-    case QUERY_NODE_SHOW_STABLES_STMT:
-    case QUERY_NODE_SHOW_USERS_STMT:
     case QUERY_NODE_SHOW_DNODES_STMT:
-    case QUERY_NODE_SHOW_VGROUPS_STMT:
     case QUERY_NODE_SHOW_MNODES_STMT:
     case QUERY_NODE_SHOW_MODULES_STMT:
     case QUERY_NODE_SHOW_QNODES_STMT:
+    case QUERY_NODE_SHOW_SNODES_STMT:
+    case QUERY_NODE_SHOW_BNODES_STMT:
+    case QUERY_NODE_SHOW_DATABASES_STMT:
     case QUERY_NODE_SHOW_FUNCTIONS_STMT:
     case QUERY_NODE_SHOW_INDEXES_STMT:
+    case QUERY_NODE_SHOW_STABLES_STMT:
     case QUERY_NODE_SHOW_STREAMS_STMT:
-    case QUERY_NODE_SHOW_APPS_STMT:
-    case QUERY_NODE_SHOW_CONNECTIONS_STMT:
+    case QUERY_NODE_SHOW_TABLES_STMT:
+    case QUERY_NODE_SHOW_USERS_STMT:
     case QUERY_NODE_SHOW_LICENCE_STMT:
-    case QUERY_NODE_SHOW_CREATE_DATABASE_STMT:
-    case QUERY_NODE_SHOW_CREATE_TABLE_STMT:
-    case QUERY_NODE_SHOW_CREATE_STABLE_STMT: 
-    case QUERY_NODE_SHOW_QUERIES_STMT:
-    case QUERY_NODE_SHOW_SCORES_STMT:
+    case QUERY_NODE_SHOW_VGROUPS_STMT:
     case QUERY_NODE_SHOW_TOPICS_STMT:
-    case QUERY_NODE_SHOW_VARIABLE_STMT:
-    case QUERY_NODE_SHOW_BNODES_STMT:
-    case QUERY_NODE_SHOW_SNODES_STMT:
+    case QUERY_NODE_SHOW_CONSUMERS_STMT:
+    case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
+    case QUERY_NODE_SHOW_TRANS_STMT:
+    case QUERY_NODE_SHOW_SMAS_STMT:
+    case QUERY_NODE_SHOW_CONFIGS_STMT:
+    case QUERY_NODE_SHOW_QUERIES_STMT:
+    case QUERY_NODE_SHOW_VNODES_STMT:
       return makeNode(type, sizeof(SShowStmt));
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return makeNode(type, sizeof(SScanLogicNode));

source/libs/parser/src/parAstCreater.c

@@ -927,18 +927,6 @@ SNode* createShowStmt(SAstCreateContext* pCxt, ENodeType type, SNode* pDbName, S
   return (SNode*)pStmt;
 }
 
-SNode* createShowCreateDatabaseStmt(SAstCreateContext* pCxt, const SToken* pDbName) {
-  SNode* pStmt = nodesMakeNode(QUERY_NODE_SHOW_CREATE_DATABASE_STMT);
-  CHECK_OUT_OF_MEM(pStmt);
-  return pStmt;
-}
-
-SNode* createShowCreateTableStmt(SAstCreateContext* pCxt, ENodeType type, SNode* pRealTable) {
-  SNode* pStmt = nodesMakeNode(type);
-  CHECK_OUT_OF_MEM(pStmt);
-  return pStmt;
-}
-
 SNode* createCreateUserStmt(SAstCreateContext* pCxt, SToken* pUserName, const SToken* pPassword) {
   char password[TSDB_USET_PASSWORD_LEN] = {0};
   if (!checkUserName(pCxt, pUserName) || !checkPassword(pCxt, pPassword, password)) {

source/libs/parser/src/parTranslater.c

@@ -1913,24 +1913,20 @@ static int32_t translateAlterDnode(STranslateContext* pCxt, SAlterDnodeStmt* pSt
 }
 
 static int32_t nodeTypeToShowType(ENodeType nt) {
-  switch (nt) {
-    case QUERY_NODE_SHOW_APPS_STMT:
-      return 0;  // todo
-    case QUERY_NODE_SHOW_CONNECTIONS_STMT:
-      return TSDB_MGMT_TABLE_CONNS;
-    case QUERY_NODE_SHOW_LICENCE_STMT:
-      return TSDB_MGMT_TABLE_GRANTS;
-    case QUERY_NODE_SHOW_QUERIES_STMT:
-      return TSDB_MGMT_TABLE_QUERIES;
-    case QUERY_NODE_SHOW_SCORES_STMT:
-      return 0;  // todo
-    case QUERY_NODE_SHOW_TOPICS_STMT:
-      return 0;  // todo
-    case QUERY_NODE_SHOW_VARIABLE_STMT:
-      return TSDB_MGMT_TABLE_VARIABLES;
-    default:
-      break;
-  }
+  // switch (nt) {
+  //   case QUERY_NODE_SHOW_CONNECTIONS_STMT:
+  //     return TSDB_MGMT_TABLE_CONNS;
+  //   case QUERY_NODE_SHOW_LICENCE_STMT:
+  //     return TSDB_MGMT_TABLE_GRANTS;
+  //   case QUERY_NODE_SHOW_QUERIES_STMT:
+  //     return TSDB_MGMT_TABLE_QUERIES;
+  //   case QUERY_NODE_SHOW_TOPICS_STMT:
+  //     return 0;  // todo
+  //   case QUERY_NODE_SHOW_VARIABLE_STMT:
+  //     return TSDB_MGMT_TABLE_VARIABLES;
+  //   default:
+  //     break;
+  // }
   return 0;
 }
 
@@ -2361,19 +2357,11 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
     case QUERY_NODE_ALTER_DNODE_STMT:
       code = translateAlterDnode(pCxt, (SAlterDnodeStmt*)pNode);
       break;
-    case QUERY_NODE_SHOW_APPS_STMT:
     case QUERY_NODE_SHOW_CONNECTIONS_STMT:
     case QUERY_NODE_SHOW_QUERIES_STMT:
-    case QUERY_NODE_SHOW_SCORES_STMT:
     case QUERY_NODE_SHOW_TOPICS_STMT:
-    case QUERY_NODE_SHOW_VARIABLE_STMT:
       code = translateShow(pCxt, (SShowStmt*)pNode);
       break;
-    case QUERY_NODE_SHOW_CREATE_DATABASE_STMT:
-    case QUERY_NODE_SHOW_CREATE_TABLE_STMT:
-    case QUERY_NODE_SHOW_CREATE_STABLE_STMT:
-      // todo
-      break;
     case QUERY_NODE_CREATE_INDEX_STMT:
       code = translateCreateIndex(pCxt, (SCreateIndexStmt*)pNode);
       break;

source/libs/parser/src/sql.c

@@ -3585,7 +3585,7 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
         break;
       case 181: /* cmd ::= SHOW APPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT, NULL, NULL); }
+// { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT, NULL, NULL); }
         break;
       case 182: /* cmd ::= SHOW CONNECTIONS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT, NULL, NULL); }
@@ -3595,25 +3595,25 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT, NULL, NULL); }
         break;
       case 185: /* cmd ::= SHOW CREATE DATABASE db_name */
-{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy29); }
+// { pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy29); }
         break;
       case 186: /* cmd ::= SHOW CREATE TABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy182); }
+// { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy182); }
         break;
       case 187: /* cmd ::= SHOW CREATE STABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy182); }
+// { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy182); }
         break;
       case 188: /* cmd ::= SHOW QUERIES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT, NULL, NULL); }
         break;
       case 189: /* cmd ::= SHOW SCORES */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT, NULL, NULL); }
+// { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT, NULL, NULL); }
         break;
       case 190: /* cmd ::= SHOW TOPICS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TOPICS_STMT, NULL, NULL); }
         break;
       case 191: /* cmd ::= SHOW VARIABLES */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLE_STMT, NULL, NULL); }
+// { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLE_STMT, NULL, NULL); }
         break;
       case 192: /* cmd ::= SHOW BNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT, NULL, NULL); }