Merge pull request #11528 from taosdata/feature/check

test: reopen mnode unitest

source/dnode/mnode/impl/inc/mndDb.h

@@ -27,7 +27,7 @@ void    mndCleanupDb(SMnode *pMnode);
 SDbObj *mndAcquireDb(SMnode *pMnode, const char *db);
 void    mndReleaseDb(SMnode *pMnode, SDbObj *pDb);
 int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, void **ppRsp, int32_t *pRspLen);
-char   *mnGetDbStr(char *src);
+char   *mndGetDbStr(char *src);
 int32_t mndExtractDbInfo(SMnode *pMnode, SDbObj *pDb, SUseDbRsp *pRsp, const SUseDbReq *pReq);
 
 #ifdef __cplusplus

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

@@ -1342,7 +1342,7 @@ SYNC_DB_OVER:
   return code;
 }
 
-char *mnGetDbStr(char *src) {
+char *mndGetDbStr(char *src) {
   char *pos = strstr(src, TS_PATH_DELIMITER);
   if (pos != NULL) ++pos;
 
@@ -1357,7 +1357,7 @@ static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, in
   int32_t cols = 0;
 
   char* buf = taosMemoryMalloc(pShow->bytes[cols]);
-  char *name = mnGetDbStr(pDb->name);
+  char *name = mndGetDbStr(pDb->name);
   if (name != NULL) {
     STR_WITH_MAXSIZE_TO_VARSTR(buf, name, pShow->bytes[cols]);
   } else {

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

@@ -95,11 +95,13 @@ static const SInfosTableSchema userDBSchema[] = {
 };
 
 static const SInfosTableSchema userFuncSchema[] = {
-    {.name = "name", .bytes = 32, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "name", .bytes = TSDB_FUNC_NAME_LEN - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "comment", .bytes = PATH_MAX - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "aggregate", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "comment", .bytes = TSDB_TYPE_STR_MAX_LEN - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
-    {.name = "ntables", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
-    {.name = "precision", .bytes = 2, .type = TSDB_DATA_TYPE_VARCHAR},
-    {.name = "status", .bytes = 10, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "code_len", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "bufsize", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
 };
 
 static const SInfosTableSchema userIdxSchema[] = {

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

@@ -131,6 +131,13 @@ static int32_t mndProcessRetrieveSysTableReq(SNodeMsg *pReq) {
     req.type = retrieveReq.type;
     strncpy(req.db, retrieveReq.db, tListLen(req.db));
 
+    STableMetaRsp *pMeta = (STableMetaRsp *)taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb) + 1);
+    if (pMeta == NULL) {
+      terrno = TSDB_CODE_MND_INVALID_INFOS_TBL;
+      mError("failed to process show-retrieve req:%p since %s", pShow, terrstr());
+      return -1;
+    }
+
     pShow = mndCreateShowObj(pMnode, &req);
     if (pShow == NULL) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -138,7 +145,7 @@ static int32_t mndProcessRetrieveSysTableReq(SNodeMsg *pReq) {
       return -1;
     }
 
-    pShow->pMeta = (STableMetaRsp *)taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb) + 1);
+    pShow->pMeta = pMeta;
     pShow->numOfColumns = pShow->pMeta->numOfColumns;
     int32_t offset = 0;
 

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

@@ -58,7 +58,7 @@ static void    mndTransSendRpcRsp(SMnode *pMnode, STrans *pTrans);
 static int32_t mndProcessTransReq(SNodeMsg *pReq);
 static int32_t mndProcessKillTransReq(SNodeMsg *pReq);
 
-static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
+static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows);
 static void    mndCancelGetNextTrans(SMnode *pMnode, void *pIter);
 
 int32_t mndInitTrans(SMnode *pMnode) {
@@ -73,7 +73,7 @@ int32_t mndInitTrans(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_TRANS_TIMER, mndProcessTransReq);
   mndSetMsgHandle(pMnode, TDMT_MND_KILL_TRANS, mndProcessKillTransReq);
 
-//  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans);
+  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndCancelGetNextTrans);
   return sdbSetTable(pMnode->pSdb, table);
 }
@@ -1259,7 +1259,7 @@ void mndTransPullup(SMnode *pMnode) {
   sdbWriteFile(pMnode->pSdb);
 }
 
-static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
+static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
   SMnode *pMnode = pReq->pNode;
   SSdb   *pSdb = pMnode->pSdb;
   int32_t numOfRows = 0;
@@ -1273,34 +1273,34 @@ static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int
 
     cols = 0;
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pTrans->id;
-    cols++;
+    SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->id, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pTrans->createdTime;
-    cols++;
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->createdTime, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, mndTransStr(pTrans->stage));
-    cols++;
+    char stage[TSDB_TRANS_STAGE_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(stage, mndTransStr(pTrans->stage), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)stage, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    char *name = mnGetDbStr(pTrans->dbname);
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, name, pShow->bytes[cols]);
-    cols++;
+    char dbname[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, mndGetDbStr(pTrans->dbname), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)dbname, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, mndTransType(pTrans->transType));
-    cols++;
+    char transType[TSDB_TRANS_TYPE_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, mndTransType(pTrans->transType), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)transType, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pTrans->lastExecTime;
-    cols++;
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->lastExecTime, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, pTrans->lastError);
-    cols++;
+    char lastError[TSDB_TRANS_ERROR_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, pTrans->lastError, pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)lastError, false);
 
     numOfRows++;
     sdbRelease(pSdb, pTrans);

source/dnode/mnode/impl/test/CMakeLists.txt

 enable_testing()
 
-#add_subdirectory(user)
 add_subdirectory(acct)
-#add_subdirectory(trans)
-#add_subdirectory(qnode)
-#add_subdirectory(snode)
 add_subdirectory(bnode)
-#add_subdirectory(show)
-#add_subdirectory(profile)
-#add_subdirectory(dnode)
-#add_subdirectory(mnode)
-#add_subdirectory(db)
-#add_subdirectory(stb)
-#add_subdirectory(sma)
-#add_subdirectory(func)
-#add_subdirectory(topic)
+add_subdirectory(db)
+add_subdirectory(dnode)
+add_subdirectory(func)
+add_subdirectory(mnode)
+add_subdirectory(profile)
+add_subdirectory(qnode)
+add_subdirectory(show)
+add_subdirectory(sma)
+add_subdirectory(snode)
+add_subdirectory(stb)
+add_subdirectory(topic)
+add_subdirectory(trans)
+add_subdirectory(user)

source/dnode/mnode/impl/test/db/CMakeLists.txt

@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_db
-#    COMMAND mnode_test_db
-#)
+add_test(
+    NAME dbTest
+    COMMAND dbTest
+)

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

@@ -26,29 +26,8 @@ class MndTestDb : public ::testing::Test {
 Testbase MndTestDb::test;
 
 TEST_F(MndTestDb, 01_ShowDb) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "vgroups");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "ntables");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_SMALLINT, 2, "replica");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_SMALLINT, 2, "quorum");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_SMALLINT, 2, "days");
-  CHECK_SCHEMA(7, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "keep0,keep1,keep2");
-  CHECK_SCHEMA(8, TSDB_DATA_TYPE_INT, 4, "cache");
-  CHECK_SCHEMA(9, TSDB_DATA_TYPE_INT, 4, "blocks");
-  CHECK_SCHEMA(10, TSDB_DATA_TYPE_INT, 4, "minrows");
-  CHECK_SCHEMA(11, TSDB_DATA_TYPE_INT, 4, "maxrows");
-  CHECK_SCHEMA(12, TSDB_DATA_TYPE_TINYINT, 1, "wallevel");
-  CHECK_SCHEMA(13, TSDB_DATA_TYPE_INT, 4, "fsync");
-  CHECK_SCHEMA(14, TSDB_DATA_TYPE_TINYINT, 1, "comp");
-  CHECK_SCHEMA(15, TSDB_DATA_TYPE_TINYINT, 1, "cachelast");
-  CHECK_SCHEMA(16, TSDB_DATA_TYPE_BINARY, 3 + VARSTR_HEADER_SIZE, "precision");
-//  CHECK_SCHEMA(17, TSDB_DATA_TYPE_TINYINT, 1, "update");
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 2);
 }
 
 TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
@@ -58,7 +37,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.numOfVgroups = 2;
     createReq.cacheBlockSize = 16;
     createReq.totalBlocks = 10;
-    createReq.daysPerFile = 10;
+    createReq.daysPerFile = 1000;
     createReq.daysToKeep0 = 3650;
     createReq.daysToKeep1 = 3650;
     createReq.daysToKeep2 = 3650;
@@ -66,6 +45,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.maxRows = 4096;
     createReq.commitTime = 3600;
     createReq.fsyncPeriod = 3000;
+    createReq.ttl = 0;
     createReq.walLevel = 1;
     createReq.precision = 0;
     createReq.compression = 2;
@@ -74,6 +54,9 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.update = 0;
     createReq.cacheLastRow = 0;
     createReq.ignoreExist = 1;
+    createReq.streamMode = 0;
+    createReq.singleSTable = 0;
+    createReq.numOfRetensions = 0;
 
     int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
@@ -84,47 +67,11 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                      // vgroups
-  CheckInt32(0);                      // ntables
-  CheckInt16(1);                      // replica
-  CheckInt16(1);                      // quorum
-  CheckInt16(10);                     // days
-  CheckBinary("3650,3650,3650", 24);  // days
-  CheckInt32(16);                     // cache
-  CheckInt32(10);                     // blocks
-  CheckInt32(100);                    // minrows
-  CheckInt32(4096);                   // maxrows
-  CheckInt8(1);                       // wallevel
-  CheckInt32(3000);                   // fsync
-  CheckInt8(2);                       // comp
-  CheckInt8(0);                       // cachelast
-  CheckBinary("ms", 3);               // precision
-  CheckInt8(0);                       // update
-
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_VGROUP, "1.d1");
-  CHECK_META("show vgroups", 4);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "vgId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_INT, 4, "tables");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "v1_dnode");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, 9 + VARSTR_HEADER_SIZE, "v1_status");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
+
+  test.SendShowReq(TSDB_MGMT_TABLE_VGROUP, "vgroups", "1.d1");
   EXPECT_EQ(test.GetShowRows(), 2);
-  CheckInt32(2);
-  CheckInt32(3);
-  IgnoreInt32();
-  IgnoreInt32();
-  CheckInt16(1);
-  CheckInt16(1);
-  CheckBinary("master", 9);
-  CheckBinary("master", 9);
 
   {
     SAlterDbReq alterdbReq = {0};
@@ -147,55 +94,14 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                   // vgroups
-  CheckInt32(0);                   // tables
-  CheckInt16(1);                   // replica
-  CheckInt16(2);                   // quorum
-  CheckInt16(10);                  // days
-  CheckBinary("300,400,500", 24);  // days
-  CheckInt32(16);                  // cache
-  CheckInt32(12);                  // blocks
-  CheckInt32(100);                 // minrows
-  CheckInt32(4096);                // maxrows
-  CheckInt8(2);                    // wallevel
-  CheckInt32(4000);                // fsync
-  CheckInt8(2);                    // comp
-  CheckInt8(1);                    // cachelast
-  CheckBinary("ms", 3);            // precision
-  CheckInt8(0);                    // update
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   // restart
   test.Restart();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                   // vgroups
-  CheckInt32(0);                   // tables
-  CheckInt16(1);                   // replica
-  CheckInt16(2);                   // quorum
-  CheckInt16(10);                  // days
-  CheckBinary("300,400,500", 24);  // days
-  CheckInt32(16);                  // cache
-  CheckInt32(12);                  // blocks
-  CheckInt32(100);                 // minrows
-  CheckInt32(4096);                // maxrows
-  CheckInt8(2);                    // wallevel
-  CheckInt32(4000);                // fsync
-  CheckInt8(2);                    // comp
-  CheckInt8(1);                    // cachelast
-  CheckBinary("ms", 3);            // precision
-  CheckInt8(0);                    // update
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   {
     SDropDbReq dropdbReq = {0};
@@ -214,11 +120,8 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     EXPECT_STREQ(dropdbRsp.db, "1.d1");
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 2);
 }
 
 TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
@@ -228,7 +131,7 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.numOfVgroups = 2;
     createReq.cacheBlockSize = 16;
     createReq.totalBlocks = 10;
-    createReq.daysPerFile = 10;
+    createReq.daysPerFile = 1000;
     createReq.daysToKeep0 = 3650;
     createReq.daysToKeep1 = 3650;
     createReq.daysToKeep2 = 3650;
@@ -236,6 +139,7 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.maxRows = 4096;
     createReq.commitTime = 3600;
     createReq.fsyncPeriod = 3000;
+    createReq.ttl = 0;
     createReq.walLevel = 1;
     createReq.precision = 0;
     createReq.compression = 2;
@@ -244,6 +148,9 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.update = 0;
     createReq.cacheLastRow = 0;
     createReq.ignoreExist = 1;
+    createReq.streamMode = 0;
+    createReq.singleSTable = 0;
+    createReq.numOfRetensions = 0;
 
     int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
@@ -254,12 +161,8 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d2", TSDB_DB_NAME_LEN - 1);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   uint64_t d2_uid = 0;
 

source/dnode/mnode/impl/test/dnode/CMakeLists.txt

@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_dnode
-#    COMMAND mnode_test_dnode
-#)
+add_test(
+    NAME mdnodeTest
+    COMMAND mdnodeTest
+)

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

@@ -51,27 +51,8 @@ TestServer MndTestDnode::server4;
 TestServer MndTestDnode::server5;
 
 TEST_F(MndTestDnode, 01_ShowDnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-
-  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_SMALLINT, 2, "vnodes");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_SMALLINT, 2, "support_vnodes");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "status");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "offline_reason");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 02_ConfigDnode) {
@@ -162,25 +143,8 @@ TEST_F(MndTestDnode, 03_Create_Dnode) {
 
   taosMsleep(1300);
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckInt16(1);
-  CheckInt16(2);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9024", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 04_Drop_Dnode) {
@@ -236,19 +200,9 @@ TEST_F(MndTestDnode, 04_Drop_Dnode) {
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
-
   taosMsleep(2000);
   server2.Stop();
   server2.DoStart();
@@ -298,40 +252,9 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   }
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
 
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-
   // restart
   uInfo("stop all server");
   test.Restart();
@@ -341,37 +264,6 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   server5.Restart();
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
-
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }

source/dnode/mnode/impl/test/func/CMakeLists.txt

-aux_source_directory(. FUNC_SRC)
-add_executable(mnode_test_func ${FUNC_SRC})
+aux_source_directory(. MNODE_FUNC_TEST_SRC)
+add_executable(funcTest ${MNODE_FUNC_TEST_SRC})
 target_link_libraries(
-    mnode_test_func
+    funcTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_func
-    COMMAND mnode_test_func
+    NAME funcTest
+    COMMAND funcTest
 )

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

@@ -26,18 +26,7 @@ class MndTestFunc : public ::testing::Test {
 Testbase MndTestFunc::test;
 
 TEST_F(MndTestFunc, 01_Show_Func) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_FUNC_NAME_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, PATH_MAX + VARSTR_HEADER_SIZE, "comment");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_INT, 4, "aggregate");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_TYPE_STR_MAX_LEN + VARSTR_HEADER_SIZE, "outputtype");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_INT, 4, "code_len");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_INT, 4, "bufsize");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -194,19 +183,8 @@ TEST_F(MndTestFunc, 02_Create_Func) {
     }
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("f1", TSDB_FUNC_NAME_LEN);
-  CheckBinaryByte('m', TSDB_FUNC_COMMENT_LEN);
-  CheckInt32(0);
-  CheckBinary("SMALLINT", TSDB_TYPE_STR_MAX_LEN);
-  CheckTimestamp();
-  CheckInt32(TSDB_FUNC_CODE_LEN);
-  CheckInt32(4);
 }
 
 TEST_F(MndTestFunc, 03_Retrieve_Func) {
@@ -331,10 +309,7 @@ TEST_F(MndTestFunc, 03_Retrieve_Func) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-    CHECK_META("show functions", 7);
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -529,20 +504,12 @@ TEST_F(MndTestFunc, 04_Drop_Func) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 
   // restart
   test.Restart();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("f2", TSDB_FUNC_NAME_LEN);
 }

source/dnode/mnode/impl/test/mnode/CMakeLists.txt

-aux_source_directory(. MTEST_SRC)
-add_executable(mnode_test_mnode ${MTEST_SRC})
+aux_source_directory(. MNODE_MNODE_TEST_SRC)
+add_executable(mmnodeTest ${MNODE_MNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_mnode
+    mmnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_mnode
-    COMMAND mnode_test_mnode
+    NAME mmnodeTest
+    COMMAND mmnodeTest
 )

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

@@ -39,23 +39,8 @@ Testbase   MndTestMnode::test;
 TestServer MndTestMnode::server2;
 
 TEST_F(MndTestMnode, 01_ShowDnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-  CHECK_META("show mnodes", 5);
-
-  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_BINARY, 12 + VARSTR_HEADER_SIZE, "role");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_TIMESTAMP, 8, "role_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckInt16(1);
-  CheckBinary("localhost:9028", TSDB_EP_LEN);
-  CheckBinary("master", 12);
-  CheckTimestamp();
-  IgnoreTimestamp();
 }
 
 TEST_F(MndTestMnode, 02_Create_Mnode_Invalid_Id) {
@@ -104,8 +89,7 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     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);
   }
 
@@ -122,20 +106,8 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9028", TSDB_EP_LEN);
-    CheckBinary("localhost:9029", TSDB_EP_LEN);
-    CheckBinary("master", 12);
-    CheckBinary("slave", 12);
-    CheckTimestamp();
-    CheckTimestamp();
-    IgnoreTimestamp();
-    IgnoreTimestamp();
   }
 
   {
@@ -151,15 +123,8 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9028", TSDB_EP_LEN);
-    CheckBinary("master", 12);
-    CheckTimestamp();
-    IgnoreTimestamp();
   }
 
   {

source/dnode/mnode/impl/test/profile/CMakeLists.txt

-aux_source_directory(. PROFILE_SRC)
-add_executable(mnode_test_profile ${PROFILE_SRC})
+aux_source_directory(. MNODE_PROFILE_TEST_SRC)
+add_executable(profileTest ${MNODE_PROFILE_TEST_SRC})
 target_link_libraries(
-    mnode_test_profile
+    profileTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_profile
-    COMMAND mnode_test_profile
+    NAME profileTest
+    COMMAND profileTest
 )

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

@@ -46,7 +46,7 @@ TEST_F(MndTestProfile, 01_ConnectMsg) {
 
   EXPECT_EQ(connectRsp.acctId, 1);
   EXPECT_GT(connectRsp.clusterId, 0);
-  EXPECT_EQ(connectRsp.connId, 1);
+  EXPECT_NE(connectRsp.connId, 0);
   EXPECT_EQ(connectRsp.superUser, 1);
 
   EXPECT_EQ(connectRsp.epSet.inUse, 0);
@@ -74,32 +74,16 @@ TEST_F(MndTestProfile, 02_ConnectMsg_InvalidDB) {
 }
 
 TEST_F(MndTestProfile, 03_ConnectMsg_Show) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CONNS, "");
-  CHECK_META("show connections", 7);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "connId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "user");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_APP_NAME_LEN + VARSTR_HEADER_SIZE, "program");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "pid");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE, "ip:port");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "login_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_TIMESTAMP, 8, "last_access");
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckInt32(1);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("mnode_test_profile", TSDB_APP_NAME_LEN);
-  CheckInt32(1234);
-  IgnoreBinary(TSDB_IPv4ADDR_LEN + 6);
-  CheckTimestamp();
-  CheckTimestamp();
+  test.SendShowReq(TSDB_MGMT_TABLE_CONNS, "connections", "");
+  EXPECT_EQ(test.GetShowRows(), 0);
 }
 
 TEST_F(MndTestProfile, 04_HeartBeatMsg) {
   SClientHbBatchReq batchReq = {0};
   batchReq.reqs = taosArrayInit(0, sizeof(SClientHbReq));
   SClientHbReq req = {0};
-  req.connKey = {.connId = 123, .hbType = CONN_TYPE__TMQ};
+  req.connKey.tscRid = 123;
+  req.connKey.connType = CONN_TYPE__TMQ;
   req.info = taosHashInit(64, hbKeyHashFunc, 1, HASH_ENTRY_LOCK);
   SKv kv = {0};
   kv.key = 123;
@@ -311,24 +295,6 @@ TEST_F(MndTestProfile, 08_KillQueryMsg_InvalidConn) {
 }
 
 TEST_F(MndTestProfile, 09_KillQueryMsg) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_QUERIES, "");
-  CHECK_META("show queries", 14);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "queryId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_INT, 4, "connId");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "user");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE, "ip:port");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, 22 + VARSTR_HEADER_SIZE, "qid");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "created_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_BIGINT, 8, "time");
-  CHECK_SCHEMA(7, TSDB_DATA_TYPE_BINARY, 18 + VARSTR_HEADER_SIZE, "sql_obj_id");
-  CHECK_SCHEMA(8, TSDB_DATA_TYPE_INT, 4, "pid");
-  CHECK_SCHEMA(9, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "ep");
-  CHECK_SCHEMA(10, TSDB_DATA_TYPE_BOOL, 1, "stable_query");
-  CHECK_SCHEMA(11, TSDB_DATA_TYPE_INT, 4, "sub_queries");
-  CHECK_SCHEMA(12, TSDB_DATA_TYPE_BINARY, TSDB_SHOW_SUBQUERY_LEN + VARSTR_HEADER_SIZE, "sub_query_info");
-  CHECK_SCHEMA(13, TSDB_DATA_TYPE_BINARY, TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE, "sql");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_QUERIES, "queries", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }

source/dnode/mnode/impl/test/qnode/CMakeLists.txt

-aux_source_directory(. QTEST_SRC)
-add_executable(mnode_test_qnode ${QTEST_SRC})
+aux_source_directory(. MNODE_QNODE_TEST_SRC)
+add_executable(mqnodeTest ${MNODE_QNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_qnode
+    mqnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_qnode
-    COMMAND mnode_test_qnode
+    NAME mqnodeTest
+    COMMAND mqnodeTest
 )

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

@@ -39,14 +39,7 @@ Testbase   MndTestQnode::test;
 TestServer MndTestQnode::server2;
 
 TEST_F(MndTestQnode, 01_Show_Qnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-  CHECK_META("show qnodes", 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_QNODE, "qnodes", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -76,14 +69,8 @@ TEST_F(MndTestQnode, 02_Create_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
@@ -115,8 +102,7 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     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(MndTestQnode, 03_Drop_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckBinary("localhost:9015", TSDB_EP_LEN);
-    CheckTimestamp();
-    CheckTimestamp();
   }
 
   {
@@ -156,13 +134,8 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {

source/dnode/mnode/impl/test/show/CMakeLists.txt

-aux_source_directory(. SHOW_SRC)
-add_executable(mnode_test_show ${SHOW_SRC})
+aux_source_directory(. MNODE_SHOW_TEST_SRC)
+add_executable(showTest ${MNODE_SHOW_TEST_SRC})
 target_link_libraries(
-    mnode_test_show
+    showTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_show
-    COMMAND mnode_test_show
+    NAME showTest
+    COMMAND showTest
 )

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

@@ -34,9 +34,9 @@ TEST_F(MndTestShow, 01_ShowMsg_InvalidMsgMax) {
   tSerializeSShowReq(pReq, contLen, &showReq);
   tFreeSShowReq(&showReq);
 
-  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SHOW, pReq, contLen);
+  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
   ASSERT_NE(pRsp, nullptr);
-  ASSERT_EQ(pRsp->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+  ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_MSG);
 }
 
 TEST_F(MndTestShow, 02_ShowMsg_InvalidMsgStart) {
@@ -48,9 +48,9 @@ TEST_F(MndTestShow, 02_ShowMsg_InvalidMsgStart) {
   tSerializeSShowReq(pReq, contLen, &showReq);
   tFreeSShowReq(&showReq);
 
-  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SHOW, pReq, contLen);
+  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
   ASSERT_NE(pRsp, nullptr);
-  ASSERT_EQ(pRsp->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+  ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_MSG);
 }
 
 TEST_F(MndTestShow, 03_ShowMsg_Conn) {
@@ -67,42 +67,11 @@ TEST_F(MndTestShow, 03_ShowMsg_Conn) {
   ASSERT_NE(pRsp, nullptr);
   ASSERT_EQ(pRsp->code, 0);
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CONNS, "");
-
-  STableMetaRsp* pMeta = test.GetShowMeta();
-  EXPECT_STREQ(pMeta->tbName, "show connections");
-  EXPECT_EQ(pMeta->numOfTags, 0);
-  EXPECT_EQ(pMeta->numOfColumns, 7);
-  EXPECT_EQ(pMeta->precision, 0);
-  EXPECT_EQ(pMeta->tableType, 0);
-  EXPECT_EQ(pMeta->update, 0);
-  EXPECT_EQ(pMeta->sversion, 0);
-  EXPECT_EQ(pMeta->tversion, 0);
-  EXPECT_EQ(pMeta->tuid, 0);
-  EXPECT_EQ(pMeta->suid, 0);
-
-  test.SendShowRetrieveReq();
-
-  SRetrieveTableRsp* pRetrieveRsp = test.GetRetrieveRsp();
-  EXPECT_EQ(pRetrieveRsp->numOfRows, 1);
-  EXPECT_EQ(pRetrieveRsp->useconds, 0);
-  EXPECT_EQ(pRetrieveRsp->completed, 1);
-  EXPECT_EQ(pRetrieveRsp->precision, TSDB_TIME_PRECISION_MILLI);
-  EXPECT_EQ(pRetrieveRsp->compressed, 0);
-  EXPECT_EQ(pRetrieveRsp->compLen, 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_CONNS, "connections", "");
+  // EXPECT_EQ(test.GetShowRows(), 1);
 }
 
 TEST_F(MndTestShow, 04_ShowMsg_Cluster) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CLUSTER, "");
-  CHECK_META( "show cluster", 3);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BIGINT, 8, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_CLUSTER, "cluster", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  IgnoreInt64();
-  IgnoreBinary(TSDB_CLUSTER_ID_LEN);
-  CheckTimestamp();
 }
\ No newline at end of file

source/dnode/mnode/impl/test/sma/CMakeLists.txt

-aux_source_directory(. SMA_SRC)
-add_executable(mnode_test_sma ${SMA_SRC})
+aux_source_directory(. MNODE_SMA_TEST_SRC)
+add_executable(smaTest ${MNODE_SMA_TEST_SRC})
 target_link_libraries(
-    mnode_test_sma
+    smaTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_sma
-    COMMAND mnode_test_sma
+    NAME smaTest
+    COMMAND smaTest
 )

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

@@ -207,7 +207,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
     pReq = BuildCreateStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
   }
@@ -216,7 +216,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
     pReq = BuildCreateTSmaReq(smaname, stbname, 0, "expr", "tagsFilter", "sql", "ast", &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_SMA, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
   }
@@ -225,7 +225,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
   test.Restart();
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     CHECK_META("show indexes", 3);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
@@ -239,7 +239,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
      pReq = BuildDropTSmaReq(smaname, 0, &contLen);
     pRsp = test.SendReq(TDMT_MND_DROP_SMA, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 0);
   }
@@ -263,10 +263,8 @@ TEST_F(MndTestSma, 02_Create_Show_Meta_Drop_Restart_BSma) {
     pReq = BuildCreateBSmaStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-//    CheckBinary("bsmastb", TSDB_TABLE_NAME_LEN);
   }
 
   test.Restart();
@@ -281,8 +279,7 @@ TEST_F(MndTestSma, 02_Create_Show_Meta_Drop_Restart_BSma) {
     pReq = BuildDropStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_DROP_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 

source/dnode/mnode/impl/test/snode/CMakeLists.txt

-aux_source_directory(. STEST_SRC)
-add_executable(mnode_test_snode ${STEST_SRC})
+aux_source_directory(. MNODE_SNODE_TEST_SRC)
+add_executable(msnodeTest ${MNODE_SNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_snode
+    msnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_snode
-    COMMAND mnode_test_snode
+    NAME msnodeTest
+    COMMAND msnodeTest
 )

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

@@ -39,14 +39,7 @@ Testbase   MndTestSnode::test;
 TestServer MndTestSnode::server2;
 
 TEST_F(MndTestSnode, 01_Show_Snode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-  CHECK_META("show snodes", 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_SNODE, "snodes", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -76,14 +69,8 @@ TEST_F(MndTestSnode, 02_Create_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    CHECK_META("show snodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
@@ -115,8 +102,7 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     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(MndTestSnode, 03_Drop_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckBinary("localhost:9017", TSDB_EP_LEN);
-    CheckTimestamp();
-    CheckTimestamp();
   }
 
   {
@@ -156,13 +134,8 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {

source/dnode/mnode/impl/test/stb/CMakeLists.txt

@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_stb
-#    COMMAND mnode_test_stb
-#)
+add_test(
+    NAME stbTest
+    COMMAND stbTest
+)

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

@@ -43,7 +43,7 @@ void* MndTestStb::BuildCreateDbReq(const char* dbname, int32_t* pContLen) {
   createReq.numOfVgroups = 2;
   createReq.cacheBlockSize = 16;
   createReq.totalBlocks = 10;
-  createReq.daysPerFile = 10;
+  createReq.daysPerFile = 1000;
   createReq.daysToKeep0 = 3650;
   createReq.daysToKeep1 = 3650;
   createReq.daysToKeep2 = 3650;
@@ -314,19 +314,8 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE, "name");
-    CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-    CHECK_SCHEMA(2, TSDB_DATA_TYPE_INT, 4, "columns");
-    CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "tags");
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   // ----- meta ------
@@ -407,15 +396,8 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   test.Restart();
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -432,9 +414,7 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -496,13 +476,7 @@ TEST_F(MndTestStb, 02_Alter_Stb_AddTag) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
-    EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(4);
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
   }
 
   {
@@ -542,13 +516,8 @@ TEST_F(MndTestStb, 03_Alter_Stb_DropTag) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(2);
   }
 
   {
@@ -611,13 +580,8 @@ TEST_F(MndTestStb, 04_Alter_Stb_AlterTagName) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -668,13 +632,8 @@ TEST_F(MndTestStb, 05_Alter_Stb_AlterTagBytes) {
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -734,13 +693,8 @@ TEST_F(MndTestStb, 06_Alter_Stb_AddColumn) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(3);
-    CheckInt32(3);
   }
 
   {
@@ -799,13 +753,8 @@ TEST_F(MndTestStb, 07_Alter_Stb_DropColumn) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -862,13 +811,8 @@ TEST_F(MndTestStb, 08_Alter_Stb_AlterTagBytes) {
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {

source/dnode/mnode/impl/test/topic/CMakeLists.txt

-aux_source_directory(. TOPIC_SRC)
-add_executable(mnode_test_topic ${TOPIC_SRC})
+aux_source_directory(. MNODE_TOPIC_TEST_SRC)
+add_executable(topicTest ${MNODE_TOPIC_TEST_SRC})
 target_link_libraries(
-    mnode_test_topic
+    topicTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_topic
-    COMMAND mnode_test_topic
+    NAME topicTest
+    COMMAND topicTest
 )

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

@@ -101,7 +101,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  { test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, ""); }
+  { test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, ""); }
 
   {
     int32_t  contLen = 0;
@@ -128,7 +128,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
+    test.SendShowReq(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");
@@ -145,7 +145,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     // restart
     test.Restart();
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
 
@@ -169,7 +169,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_TOPICS, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 0);
   }

source/dnode/mnode/impl/test/trans/CMakeLists.txt

-aux_source_directory(. TRANS_SRC)
-add_executable(mnode_test_trans ${TRANS_SRC})
+aux_source_directory(. MNODE_TRANS_TEST_SRC)
+add_executable(transTest ${MNODE_TRANS_TEST_SRC})
 target_link_libraries(
-    mnode_test_trans
+    transTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_trans
-    COMMAND mnode_test_trans
+    NAME transTest
+    COMMAND transTest
 )

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

@@ -26,11 +26,11 @@ class MndTestTrans : public ::testing::Test {
   }
 
   static void KillThenRestartServer() {
-    char    file[PATH_MAX] = "/tmp/mnode_test_trans/mnode/data/sdb.data";
+    char      file[PATH_MAX] = "/tmp/mnode_test_trans/mnode/data/sdb.data";
     TdFilePtr pFile = taosOpenFile(file, TD_FILE_READ);
-    int32_t size = 3 * 1024 * 1024;
-    void*   buffer = taosMemoryMalloc(size);
-    int32_t readLen = taosReadFile(pFile, buffer, size);
+    int32_t   size = 3 * 1024 * 1024;
+    void*     buffer = taosMemoryMalloc(size);
+    int32_t   readLen = taosReadFile(pFile, buffer, size);
     if (readLen < 0 || readLen == size) {
       ASSERT(1);
     }
@@ -65,18 +65,7 @@ TestServer MndTestTrans::server2;
 
 TEST_F(MndTestTrans, 00_Create_User_Crash) {
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    CHECK_META("show trans", 7);
-
-    CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "id");
-    CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-    CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_STAGE_LEN + VARSTR_HEADER_SIZE, "stage");
-    CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "db");
-    CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_TYPE_LEN + VARSTR_HEADER_SIZE, "type");
-    CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "last_exec_time");
-    CHECK_SCHEMA(6, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_ERROR_LEN - 1 + VARSTR_HEADER_SIZE, "last_error");
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -109,26 +98,13 @@ TEST_F(MndTestTrans, 01_Create_User_Crash) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
 
   KillThenRestartServer();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
 }
 
 TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
@@ -144,9 +120,7 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 
@@ -163,9 +137,7 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_QNODE_ALREADY_EXIST);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -185,8 +157,7 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     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);
   }
 
@@ -208,18 +179,8 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
   {
     // show trans
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    CHECK_META("show trans", 7);
-    test.SendShowRetrieveReq();
-
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckInt32(4);
-    CheckTimestamp();
-    CheckBinary("undoAction", TSDB_TRANS_STAGE_LEN);
-    CheckBinary("", TSDB_DB_NAME_LEN - 1);
-    CheckBinary("create-qnode", TSDB_TRANS_TYPE_LEN);
-    CheckTimestamp();
-    CheckBinary("Unable to establish connection", TSDB_TRANS_ERROR_LEN - 1);
   }
 
   // kill trans
@@ -238,8 +199,7 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
   // show trans
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -258,11 +218,9 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     ASSERT_EQ(pRsp->code, TSDB_CODE_RPC_NETWORK_UNAVAIL);
   }
 
-  uInfo("======== kill and restart server")
-  KillThenRestartServer();
+  uInfo("======== kill and restart server") KillThenRestartServer();
 
-  uInfo("======== server2 start")
-  server2.DoStart();
+  uInfo("======== server2 start") server2.DoStart();
 
   uInfo("======== server2 started")
 
@@ -286,14 +244,11 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
     ASSERT_NE(retry, retryMax);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 }
 
-
 // create db
 // partial create stb
 // drop db failed

source/dnode/mnode/impl/test/user/CMakeLists.txt

-aux_source_directory(. USER_SRC)
-add_executable(mnode_test_user ${USER_SRC})
+aux_source_directory(. MNODE_USER_TEST_SRC)
+add_executable(userTest ${MNODE_USER_TEST_SRC})
 target_link_libraries(
-    mnode_test_user
+    userTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_user
-    COMMAND mnode_test_user
+    NAME userTest
+    COMMAND userTest
 )

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

@@ -26,21 +26,8 @@ class MndTestUser : public ::testing::Test {
 Testbase MndTestUser::test;
 
 TEST_F(MndTestUser, 01_Show_User) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "privilege");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "account");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
 }
 
 TEST_F(MndTestUser, 02_Create_User) {
@@ -99,18 +86,8 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckBinary("u1", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("normal", 10);
-    CheckBinary("super", 10);
-    CheckTimestamp();
-    CheckTimestamp();
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
   }
 
   {
@@ -125,8 +102,7 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 
@@ -144,18 +120,8 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("u2", TSDB_USER_LEN);
-    CheckBinary("super", 10);
-    CheckBinary("super", 10);
-    CheckTimestamp();
-    CheckTimestamp();
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
   }
 
   {
@@ -170,8 +136,7 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -191,8 +156,7 @@ TEST_F(MndTestUser, 03_Alter_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -437,8 +401,7 @@ TEST_F(MndTestUser, 03_Alter_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -497,10 +460,7 @@ TEST_F(MndTestUser, 05_Drop_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 }
 
@@ -533,25 +493,9 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 3);
 
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   {
     SAlterUserReq alterReq = {0};
     alterReq.alterType = TSDB_ALTER_USER_PASSWD;
@@ -567,25 +511,8 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 3);
-
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   {
     SDropUserReq dropReq = {0};
     strcpy(dropReq.user, "u1");
@@ -599,37 +526,13 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
 
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   // restart
   test.Restart();
 
   taosMsleep(1000);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
 }