xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more

This commit is contained in:
Hongze Cheng 2021-12-20 17:11:50 +08:00
parent e74766790a
commit 920361bb36
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/vnode/impl/src/vnodeWrite.c
View File

@ -49,13 +49,7 @@ int vnodeProcessWMsgs(SVnode *pVnode, SArray *pMsgs) {
walFsync(pVnode->pWal, false); walFsync(pVnode->pWal, false);
// Apply each request now // TODO: Integrate RAFT module here
for (int i = 0; i < taosArrayGetSize(pMsgs); i++) {
pMsg = *(SRpcMsg **)taosArrayGet(pMsgs, i);
// TODO: Now we just need a
vnodeApplyWMsg(pVnode, pMsg, NULL);
}
return 0; return 0;
} }

30
source/dnode/vnode/impl/test/vnodeApiTests.cpp
View File

@ -166,6 +166,21 @@ static void vtClearMsgBatch(SArray *pMsgArr) {
taosArrayClear(pMsgArr); taosArrayClear(pMsgArr);
} }
static void vtProcessAndApplyReqs(SVnode *pVnode, SArray *pMsgArr) {
int rcode;
SRpcMsg *pReq;
SRpcMsg *pRsp;
rcode = vnodeProcessWMsgs(pVnode, pMsgArr);
GTEST_ASSERT_EQ(rcode, 0);
for (size_t i = 0; i < taosArrayGetSize(pMsgArr); i++) {
pReq = *(SRpcMsg **)taosArrayGet(pMsgArr, i);
rcode = vnodeApplyWMsg(pVnode, pReq, NULL);
GTEST_ASSERT_EQ(rcode, 0);
}
}
TEST(vnodeApiTest, vnode_simple_create_table_test) { TEST(vnodeApiTest, vnode_simple_create_table_test) {
tb_uid_t suid = 1638166374163; tb_uid_t suid = 1638166374163;
SRpcMsg *pMsg; SRpcMsg *pMsg;
@ -189,8 +204,7 @@ TEST(vnodeApiTest, vnode_simple_create_table_test) {
sprintf(tbname, "st"); sprintf(tbname, "st");
vtBuildCreateStbReq(suid, tbname, &pMsg); vtBuildCreateStbReq(suid, tbname, &pMsg);
taosArrayPush(pMsgArr, &pMsg); taosArrayPush(pMsgArr, &pMsg);
rcode = vnodeProcessWMsgs(pVnode, pMsgArr); vtProcessAndApplyReqs(pVnode, pMsgArr);
ASSERT_EQ(rcode, 0);
vtClearMsgBatch(pMsgArr); vtClearMsgBatch(pMsgArr);
// CREATE A LOT OF CHILD TABLES // CREATE A LOT OF CHILD TABLES
@ -203,8 +217,7 @@ TEST(vnodeApiTest, vnode_simple_create_table_test) {
} }
// Process request batch // Process request batch
rcode = vnodeProcessWMsgs(pVnode, pMsgArr); vtProcessAndApplyReqs(pVnode, pMsgArr);
ASSERT_EQ(rcode, 0);
// Clear request batch // Clear request batch
vtClearMsgBatch(pMsgArr); vtClearMsgBatch(pMsgArr);
@ -242,16 +255,14 @@ TEST(vnodeApiTest, vnode_simple_insert_test) {
sprintf(tbname, "st"); sprintf(tbname, "st");
vtBuildCreateStbReq(suid, tbname, &pMsg); vtBuildCreateStbReq(suid, tbname, &pMsg);
taosArrayPush(pMsgArr, &pMsg); taosArrayPush(pMsgArr, &pMsg);
rcode = vnodeProcessWMsgs(pVnode, pMsgArr); vtProcessAndApplyReqs(pVnode, pMsgArr);
GTEST_ASSERT_EQ(rcode, 0);
vtClearMsgBatch(pMsgArr); vtClearMsgBatch(pMsgArr);
// 2. CREATE A CHILD TABLE // 2. CREATE A CHILD TABLE
sprintf(tbname, "t0"); sprintf(tbname, "t0");
vtBuildCreateCtbReq(suid, tbname, &pMsg); vtBuildCreateCtbReq(suid, tbname, &pMsg);
taosArrayPush(pMsgArr, &pMsg); taosArrayPush(pMsgArr, &pMsg);
rcode = vnodeProcessWMsgs(pVnode, pMsgArr); vtProcessAndApplyReqs(pVnode, pMsgArr);
GTEST_ASSERT_EQ(rcode, 0);
vtClearMsgBatch(pMsgArr); vtClearMsgBatch(pMsgArr);
// 3. WRITE A LOT OF TIME-SERIES DATA // 3. WRITE A LOT OF TIME-SERIES DATA
@ -260,8 +271,7 @@ TEST(vnodeApiTest, vnode_simple_insert_test) {
vtBuildSubmitReq(&pMsg); vtBuildSubmitReq(&pMsg);
taosArrayPush(pMsgArr, &pMsg); taosArrayPush(pMsgArr, &pMsg);
} }
rcode = vnodeProcessWMsgs(pVnode, pMsgArr); vtProcessAndApplyReqs(pVnode, pMsgArr);
GTEST_ASSERT_EQ(rcode, 0);
vtClearMsgBatch(pMsgArr); vtClearMsgBatch(pMsgArr);
} }