TD-10431 process create db msg

include/common/taosmsg.h

@@ -168,8 +168,8 @@ typedef enum _mgmt_table {
   TSDB_MGMT_TABLE_SCORES,
   TSDB_MGMT_TABLE_GRANTS,
   TSDB_MGMT_TABLE_VNODES,
-  TSDB_MGMT_TABLE_STREAMTABLES,
   TSDB_MGMT_TABLE_CLUSTER,
+  TSDB_MGMT_TABLE_STREAMTABLES,
   TSDB_MGMT_TABLE_TP,
   TSDB_MGMT_TABLE_FUNCTION,
   TSDB_MGMT_TABLE_MAX,

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

+
 # add_subdirectory(acct)
+# add_subdirectory(auth)
+# add_subdirectory(balance)
 # add_subdirectory(cluster)
 add_subdirectory(db)
 add_subdirectory(dnode)
+# add_subdirectory(func)
+# add_subdirectory(mnode)
 # add_subdirectory(profile)
 # add_subdirectory(show)
+# add_subdirectory(stb)
+# add_subdirectory(sync)
+# add_subdirectory(telem)
+# add_subdirectory(trans)
 add_subdirectory(user)
+# add_subdirectory(vgroup)
+
+# add_subdirectory(common)

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

@@ -27,9 +27,9 @@ class DndTestDb : public ::testing::Test {
     initLog("/tmp/dnode_test_db");
 
     const char* fqdn = "localhost";
-    const char* firstEp = "localhost:9530";
-    pServer = CreateServer("/tmp/dnode_test_db", fqdn, 9530, firstEp);
-    pClient = createClient("root", "taosdata", fqdn, 9530);
+    const char* firstEp = "localhost:9040";
+    pServer = CreateServer("/tmp/dnode_test_db", fqdn, 9040, firstEp);
+    pClient = createClient("root", "taosdata", fqdn, 9040);
     taosMsleep(300);
   }
 
@@ -134,12 +134,24 @@ class DndTestDb : public ::testing::Test {
     pos = 0;
   }
 
+  void CheckInt8(int8_t val) {
+    int8_t data = *((int8_t*)(pData + pos));
+    pos += sizeof(int8_t);
+    EXPECT_EQ(data, val);
+  }
+
   void CheckInt16(int16_t val) {
     int16_t data = *((int16_t*)(pData + pos));
     pos += sizeof(int16_t);
     EXPECT_EQ(data, val);
   }
 
+  void CheckInt32(int32_t val) {
+    int32_t data = *((int32_t*)(pData + pos));
+    pos += sizeof(int32_t);
+    EXPECT_EQ(data, val);
+  }
+
   void CheckInt64(int64_t val) {
     int64_t data = *((int64_t*)(pData + pos));
     pos += sizeof(int64_t);
@@ -170,30 +182,55 @@ SServer* DndTestDb::pServer;
 SClient* DndTestDb::pClient;
 int32_t  DndTestDb::connId;
 
-TEST_F(DndTestDb, ShowUser) {
-  SendTheCheckShowMetaMsg(TSDB_MGMT_TABLE_USER, "show users", 4);
-  CheckSchema(0, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "name");
-  CheckSchema(1, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "privilege");
-  CheckSchema(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create time");
-  CheckSchema(3, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "account");
-
-  SendThenCheckShowRetrieveMsg(1);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
+TEST_F(DndTestDb, ShowDb) {
+  SendTheCheckShowMetaMsg(TSDB_MGMT_TABLE_DB, "show databases", 16);
+  CheckSchema(0, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "name");
+  CheckSchema(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create time");
+  CheckSchema(2, TSDB_DATA_TYPE_SMALLINT, 2, "replica");
+  CheckSchema(3, TSDB_DATA_TYPE_SMALLINT, 2, "quorum");
+  CheckSchema(4, TSDB_DATA_TYPE_SMALLINT, 2, "days");
+  CheckSchema(5, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "keep0,keep1,keep2");
+  CheckSchema(6, TSDB_DATA_TYPE_INT, 4, "cache(MB)");
+  CheckSchema(7, TSDB_DATA_TYPE_INT, 4, "blocks");
+  CheckSchema(8, TSDB_DATA_TYPE_INT, 4, "minrows");
+  CheckSchema(9, TSDB_DATA_TYPE_INT, 4, "maxrows");
+  CheckSchema(10, TSDB_DATA_TYPE_TINYINT, 1, "wallevel");
+  CheckSchema(11, TSDB_DATA_TYPE_INT, 4, "fsync");
+  CheckSchema(12, TSDB_DATA_TYPE_TINYINT, 1, "comp");
+  CheckSchema(13, TSDB_DATA_TYPE_TINYINT, 1, "cachelast");
+  CheckSchema(14, TSDB_DATA_TYPE_BINARY, 3 + VARSTR_HEADER_SIZE, "precision");
+  CheckSchema(15, TSDB_DATA_TYPE_TINYINT, 1, "update");
+
+  SendThenCheckShowRetrieveMsg(0);
 }
 
-TEST_F(DndTestDb, CreateUser_01) {
+TEST_F(DndTestDb, CreateDb_01) {
   {
-    SCreateUserMsg* pReq = (SCreateUserMsg*)rpcMallocCont(sizeof(SCreateUserMsg));
-    strcpy(pReq->user, "u1");
-    strcpy(pReq->pass, "p1");
+    SCreateDbMsg* pReq = (SCreateDbMsg*)rpcMallocCont(sizeof(SCreateDbMsg));
+    strcpy(pReq->db, "d1");
+    pReq->cacheBlockSize = 16;
+    pReq->totalBlocks = 10;
+    pReq->daysPerFile = 10;
+    pReq->daysToKeep0 = 3650;
+    pReq->daysToKeep1 = 3650;
+    pReq->daysToKeep2 = 3650;
+    pReq->minRowsPerFileBlock = 100;
+    pReq->maxRowsPerFileBlock = 4096;
+    pReq->commitTime = 3600;
+    pReq->fsyncPeriod = 3000;
+    pReq->walLevel = 1;
+    pReq->precision = 0;
+    pReq->compression = 2;
+    pReq->replications = 1;
+    pReq->quorum = 1;
+    pReq->update = 0;
+    pReq->cacheLastRow = 0;
+    pReq->ignoreExist = 1;
 
     SRpcMsg rpcMsg = {0};
     rpcMsg.pCont = pReq;
     rpcMsg.contLen = sizeof(SCreateUserMsg);
-    rpcMsg.msgType = TSDB_MSG_TYPE_CREATE_USER;
+    rpcMsg.msgType = TSDB_MSG_TYPE_CREATE_DB;
 
     sendMsg(pClient, &rpcMsg);
     SRpcMsg* pMsg = pClient->pRsp;
@@ -201,38 +238,27 @@ TEST_F(DndTestDb, CreateUser_01) {
     ASSERT_EQ(pMsg->code, 0);
   }
 
-  {
-    SCreateUserMsg* pReq = (SCreateUserMsg*)rpcMallocCont(sizeof(SCreateUserMsg));
-    strcpy(pReq->user, "u2");
-    strcpy(pReq->pass, "p2");
-
-    SRpcMsg rpcMsg = {0};
-    rpcMsg.pCont = pReq;
-    rpcMsg.contLen = sizeof(SCreateUserMsg);
-    rpcMsg.msgType = TSDB_MSG_TYPE_CREATE_USER;
-
-    sendMsg(pClient, &rpcMsg);
-    SRpcMsg* pMsg = pClient->pRsp;
-    ASSERT_NE(pMsg, nullptr);
-    ASSERT_EQ(pMsg->code, 0);
-  }
-
-  SendTheCheckShowMetaMsg(TSDB_MGMT_TABLE_USER, "show users", 4);
+  SendTheCheckShowMetaMsg(TSDB_MGMT_TABLE_USER, "show databases", 6);
   SendThenCheckShowRetrieveMsg(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();
+  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
   CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
+  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
 }
 
+#if 0
 TEST_F(DndTestDb, AlterUser_01) {
   SAlterUserMsg* pReq = (SAlterUserMsg*)rpcMallocCont(sizeof(SAlterUserMsg));
   strcpy(pReq->user, "u1");
@@ -297,8 +323,8 @@ TEST_F(DndTestDb, RestartDnode) {
   uInfo("start all server");
 
   const char* fqdn = "localhost";
-  const char* firstEp = "localhost:9530";
-  pServer = startServer("/tmp/dnode_test_db", fqdn, 9530, firstEp);
+  const char* firstEp = "localhost:9040";
+  pServer = startServer("/tmp/dnode_test_db", fqdn, 9040, firstEp);
 
   uInfo("all server is running");
 
@@ -313,3 +339,5 @@ TEST_F(DndTestDb, RestartDnode) {
   CheckBinary("root", TSDB_USER_LEN);
   CheckBinary("root", TSDB_USER_LEN);
 }
+
+#endif
\ No newline at end of file

source/dnode/mgmt/impl/test/dnode/dnode.cpp

@@ -27,13 +27,13 @@ class DndTestDnode : public ::testing::Test {
     initLog("/tmp/dnode_test_dnode");
 
     const char* fqdn = "localhost";
-    const char* firstEp = "localhost:9521";
-    pServer1 = CreateServer("/tmp/dnode_test_dnode1", fqdn, 9521, firstEp);
-    pServer2 = CreateServer("/tmp/dnode_test_dnode2", fqdn, 9522, firstEp);
-    pServer3 = CreateServer("/tmp/dnode_test_dnode3", fqdn, 9523, firstEp);
-    pServer4 = CreateServer("/tmp/dnode_test_dnode4", fqdn, 9524, firstEp);
-    pServer5 = CreateServer("/tmp/dnode_test_dnode5", fqdn, 9525, firstEp);
-    pClient = createClient("root", "taosdata", fqdn, 9521);
+    const char* firstEp = "localhost:9041";
+    pServer1 = CreateServer("/tmp/dnode_test_dnode1", fqdn, 9041, firstEp);
+    pServer2 = CreateServer("/tmp/dnode_test_dnode2", fqdn, 9042, firstEp);
+    pServer3 = CreateServer("/tmp/dnode_test_dnode3", fqdn, 9043, firstEp);
+    pServer4 = CreateServer("/tmp/dnode_test_dnode4", fqdn, 9044, firstEp);
+    pServer5 = CreateServer("/tmp/dnode_test_dnode5", fqdn, 9045, firstEp);
+    pClient = createClient("root", "taosdata", fqdn, 9041);
     taosMsleep(300);
   }
 
@@ -200,7 +200,7 @@ TEST_F(DndTestDnode, ShowDnode) {
 
   SendThenCheckShowRetrieveMsg(1);
   CheckInt16(1);
-  CheckBinary("localhost:9521", TSDB_EP_LEN);
+  CheckBinary("localhost:9041", TSDB_EP_LEN);
   CheckInt16(0);
   CheckInt16(1);
   CheckBinary("ready", 10);
@@ -226,7 +226,7 @@ TEST_F(DndTestDnode, ConfigDnode_01) {
 
 TEST_F(DndTestDnode, CreateDnode_01) {
   SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(sizeof(SCreateDnodeMsg));
-  strcpy(pReq->ep, "localhost:9522");
+  strcpy(pReq->ep, "localhost:9042");
 
   SRpcMsg rpcMsg = {0};
   rpcMsg.pCont = pReq;
@@ -243,8 +243,8 @@ TEST_F(DndTestDnode, CreateDnode_01) {
   SendThenCheckShowRetrieveMsg(2);
   CheckInt16(1);
   CheckInt16(2);
-  CheckBinary("localhost:9521", TSDB_EP_LEN);
-  CheckBinary("localhost:9522", TSDB_EP_LEN);
+  CheckBinary("localhost:9041", TSDB_EP_LEN);
+  CheckBinary("localhost:9042", TSDB_EP_LEN);
   CheckInt16(0);
   CheckInt16(0);
   CheckInt16(1);
@@ -274,7 +274,7 @@ TEST_F(DndTestDnode, DropDnode_01) {
   SendTheCheckShowMetaMsg(TSDB_MGMT_TABLE_DNODE, "show dnodes", 7);
   SendThenCheckShowRetrieveMsg(1);
   CheckInt16(1);
-  CheckBinary("localhost:9521", TSDB_EP_LEN);
+  CheckBinary("localhost:9041", TSDB_EP_LEN);
   CheckInt16(0);
   CheckInt16(1);
   CheckBinary("ready", 10);
@@ -285,7 +285,7 @@ TEST_F(DndTestDnode, DropDnode_01) {
 TEST_F(DndTestDnode, CreateDnode_02) {
   {
     SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(sizeof(SCreateDnodeMsg));
-    strcpy(pReq->ep, "localhost:9523");
+    strcpy(pReq->ep, "localhost:9043");
 
     SRpcMsg rpcMsg = {0};
     rpcMsg.pCont = pReq;
@@ -300,7 +300,7 @@ TEST_F(DndTestDnode, CreateDnode_02) {
 
   {
     SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(sizeof(SCreateDnodeMsg));
-    strcpy(pReq->ep, "localhost:9524");
+    strcpy(pReq->ep, "localhost:9044");
 
     SRpcMsg rpcMsg = {0};
     rpcMsg.pCont = pReq;
@@ -315,7 +315,7 @@ TEST_F(DndTestDnode, CreateDnode_02) {
 
   {
     SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(sizeof(SCreateDnodeMsg));
-    strcpy(pReq->ep, "localhost:9525");
+    strcpy(pReq->ep, "localhost:9045");
 
     SRpcMsg rpcMsg = {0};
     rpcMsg.pCont = pReq;
@@ -335,10 +335,10 @@ TEST_F(DndTestDnode, CreateDnode_02) {
   CheckInt16(3);
   CheckInt16(4);
   CheckInt16(5);
-  CheckBinary("localhost:9521", TSDB_EP_LEN);
-  CheckBinary("localhost:9523", TSDB_EP_LEN);
-  CheckBinary("localhost:9524", TSDB_EP_LEN);
-  CheckBinary("localhost:9525", TSDB_EP_LEN);
+  CheckBinary("localhost:9041", TSDB_EP_LEN);
+  CheckBinary("localhost:9043", TSDB_EP_LEN);
+  CheckBinary("localhost:9044", TSDB_EP_LEN);
+  CheckBinary("localhost:9045", TSDB_EP_LEN);
   CheckInt16(0);
   CheckInt16(0);
   CheckInt16(0);
@@ -377,11 +377,11 @@ TEST_F(DndTestDnode, RestartDnode_01) {
   uInfo("start all server");
 
   const char* fqdn = "localhost";
-  const char* firstEp = "localhost:9521";
-  pServer1 = startServer("/tmp/dnode_test_dnode1", fqdn, 9521, firstEp);
-  pServer3 = startServer("/tmp/dnode_test_dnode3", fqdn, 9523, firstEp);
-  pServer4 = startServer("/tmp/dnode_test_dnode4", fqdn, 9524, firstEp);
-  pServer5 = startServer("/tmp/dnode_test_dnode5", fqdn, 9525, firstEp);
+  const char* firstEp = "localhost:9041";
+  pServer1 = startServer("/tmp/dnode_test_dnode1", fqdn, 9041, firstEp);
+  pServer3 = startServer("/tmp/dnode_test_dnode3", fqdn, 9043, firstEp);
+  pServer4 = startServer("/tmp/dnode_test_dnode4", fqdn, 9044, firstEp);
+  pServer5 = startServer("/tmp/dnode_test_dnode5", fqdn, 9045, firstEp);
 
   uInfo("all server is running");
 
@@ -392,10 +392,10 @@ TEST_F(DndTestDnode, RestartDnode_01) {
   CheckInt16(3);
   CheckInt16(4);
   CheckInt16(5);
-  CheckBinary("localhost:9521", TSDB_EP_LEN);
-  CheckBinary("localhost:9523", TSDB_EP_LEN);
-  CheckBinary("localhost:9524", TSDB_EP_LEN);
-  CheckBinary("localhost:9525", TSDB_EP_LEN);
+  CheckBinary("localhost:9041", TSDB_EP_LEN);
+  CheckBinary("localhost:9043", TSDB_EP_LEN);
+  CheckBinary("localhost:9044", TSDB_EP_LEN);
+  CheckBinary("localhost:9045", TSDB_EP_LEN);
   CheckInt16(0);
   CheckInt16(0);
   CheckInt16(0);

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

@@ -27,9 +27,9 @@ class DndTestUser : public ::testing::Test {
     initLog("/tmp/dnode_test_user");
 
     const char* fqdn = "localhost";
-    const char* firstEp = "localhost:9530";
-    pServer = CreateServer("/tmp/dnode_test_user", fqdn, 9530, firstEp);
-    pClient = createClient("root", "taosdata", fqdn, 9530);
+    const char* firstEp = "localhost:9140";
+    pServer = CreateServer("/tmp/dnode_test_user", fqdn, 9140, firstEp);
+    pClient = createClient("root", "taosdata", fqdn, 9140);
     taosMsleep(300);
   }
 
@@ -297,8 +297,8 @@ TEST_F(DndTestUser, RestartDnode) {
   uInfo("start all server");
 
   const char* fqdn = "localhost";
-  const char* firstEp = "localhost:9530";
-  pServer = startServer("/tmp/dnode_test_user", fqdn, 9530, firstEp);
+  const char* firstEp = "localhost:9140";
+  pServer = startServer("/tmp/dnode_test_user", fqdn, 9140, firstEp);
 
   uInfo("all server is running");
 

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

@@ -151,7 +151,8 @@ static int32_t mndDbActionDelete(SSdb *pSdb, SDbObj *pDb) {
 
 static int32_t mndDbActionUpdate(SSdb *pSdb, SDbObj *pOldDb, SDbObj *pNewDb) {
   mTrace("db:%s, perform update action", pOldDb->name);
-  memcpy(pOldDb, pNewDb, sizeof(SDbObj));
+  pOldDb->updateTime = pNewDb->createdTime;
+  memcpy(&pOldDb->cfg, &pNewDb->cfg, sizeof(SDbObj));
   return 0;
 }
 

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

@@ -296,6 +296,8 @@ char *mndShowStr(int32_t showType) {
       return "show streamtables";
     case TSDB_MGMT_TABLE_TP:
       return "show topics";
+    case TSDB_MGMT_TABLE_FUNCTION:
+      return "show functions";
     default:
       return "undefined";
   }