From 684f1d11e2215e93ff9e5c6454c30770f42938bf Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 16 Dec 2021 10:39:24 +0800 Subject: [PATCH] fix coredump --- source/dnode/vnode/impl/CMakeLists.txt | 2 +- .../dnode/vnode/impl/test/vnodeApiTests.cpp | 36 +++++++++++++++++-- source/dnode/vnode/tq/src/tq.c | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/source/dnode/vnode/impl/CMakeLists.txt b/source/dnode/vnode/impl/CMakeLists.txt index 3623516624..6972605afd 100644 --- a/source/dnode/vnode/impl/CMakeLists.txt +++ b/source/dnode/vnode/impl/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries( # test if(${BUILD_TEST}) - #add_subdirectory(test) + add_subdirectory(test) endif(${BUILD_TEST}) \ No newline at end of file diff --git a/source/dnode/vnode/impl/test/vnodeApiTests.cpp b/source/dnode/vnode/impl/test/vnodeApiTests.cpp index e32937b505..a876a25fba 100644 --- a/source/dnode/vnode/impl/test/vnodeApiTests.cpp +++ b/source/dnode/vnode/impl/test/vnodeApiTests.cpp @@ -139,7 +139,7 @@ static void vtClearMsgBatch(SArray *pMsgArr) { taosArrayClear(pMsgArr); } -TEST(vnodeApiTest, vnode_simple_create_table_test) { +TEST(vnodeApiTest, DISABLED_vnode_simple_create_table_test) { tb_uid_t suid = 1638166374163; SRpcMsg *pMsg; SArray * pMsgArr = NULL; @@ -192,12 +192,44 @@ TEST(vnodeApiTest, vnode_simple_create_table_test) { TEST(vnodeApiTest, vnode_simple_insert_test) { const char *vname = "vnode2"; + char tbname[128]; + tb_uid_t suid = 1638166374163; + SRpcMsg * pMsg; + SArray * pMsgArr; + int rcode; + SVnode * pVnode; + + pMsgArr = (SArray *)taosArrayInit(0, sizeof(pMsg)); + vnodeDestroy(vname); GTEST_ASSERT_GE(vnodeInit(2), 0); - SVnode *pVnode = vnodeOpen(vname, NULL); + // Open a vnode + pVnode = vnodeOpen(vname, NULL); + GTEST_ASSERT_NE(pVnode, nullptr); + // 1. CREATE A SUPER TABLE + sprintf(tbname, "st"); + vtBuildCreateStbReq(suid, tbname, &pMsg); + taosArrayPush(pMsgArr, &pMsg); + rcode = vnodeProcessWMsgs(pVnode, pMsgArr); + GTEST_ASSERT_EQ(rcode, 0); + vtClearMsgBatch(pMsgArr); + + // 2. CREATE A CHILD TABLE + sprintf(tbname, "t0"); + vtBuildCreateCtbReq(suid, tbname, &pMsg); + taosArrayPush(pMsgArr, &pMsg); + rcode = vnodeProcessWMsgs(pVnode, pMsgArr); + GTEST_ASSERT_EQ(rcode, 0); + vtClearMsgBatch(pMsgArr); + + // 3. WRITE A LOT OF TIME-SERIES DATA + + // Close the vnode vnodeClose(pVnode); vnodeClear(); + + taosArrayDestroy(pMsgArr); } \ No newline at end of file diff --git a/source/dnode/vnode/tq/src/tq.c b/source/dnode/vnode/tq/src/tq.c index 5888141c58..249ffd7ae3 100644 --- a/source/dnode/vnode/tq/src/tq.c +++ b/source/dnode/vnode/tq/src/tq.c @@ -50,7 +50,7 @@ STQ* tqOpen(const char* path, STqCfg* tqConfig, TqLogReader* tqLogReader, SMemAl pTq->tqConfig = tqConfig; pTq->tqLogReader = tqLogReader; pTq->tqMemRef.pAlloctorFactory = allocFac; - pTq->tqMemRef.pAllocator = allocFac->create(allocFac); + // pTq->tqMemRef.pAllocator = allocFac->create(allocFac); if(pTq->tqMemRef.pAllocator == NULL) { //TODO }