From 1517fe0ff06f6f11edac24b842220e00e5978c44 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 30 Oct 2023 16:44:10 +0800 Subject: [PATCH] fix: ut case issue --- source/libs/parser/src/parCalcConst.c | 2 +- source/libs/parser/test/mockCatalog.cpp | 3 +++ source/libs/parser/test/mockCatalogService.cpp | 17 +++++++++++++++++ source/libs/parser/test/parShowToUse.cpp | 15 --------------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c index b3671a3168..23ce3aa77d 100644 --- a/source/libs/parser/src/parCalcConst.c +++ b/source/libs/parser/src/parCalcConst.c @@ -195,7 +195,7 @@ static int32_t findAndReplaceNode(SCalcConstContext* pCxt, SNode** pRoot, SNode* nodesRewriteExprPostOrder(pRoot, doFindAndReplaceNode, pCxt); if (TSDB_CODE_SUCCESS == pCxt->code && strict && !pCxt->replaceCxt.replaced) { - parserError("target replace node not found"); + parserError("target replace node not found, %p", pTarget); return TSDB_CODE_PAR_INTERNAL_ERROR; } return pCxt->code; diff --git a/source/libs/parser/test/mockCatalog.cpp b/source/libs/parser/test/mockCatalog.cpp index fee155de15..3cabd94c95 100644 --- a/source/libs/parser/test/mockCatalog.cpp +++ b/source/libs/parser/test/mockCatalog.cpp @@ -305,6 +305,8 @@ int32_t __catalogRefreshGetTableMeta(SCatalog* pCatalog, SRequestConnInfo* pConn int32_t __catalogRemoveTableMeta(SCatalog* pCtg, SName* pTableName) { return 0; } +int32_t __catalogRemoveViewMeta(SCatalog* pCtg, SName* pTableName) { return 0; } + int32_t __catalogGetTableIndex(SCatalog* pCtg, void* pTrans, const SEpSet* pMgmtEps, const SName* pName, SArray** pRes) { return g_mockCatalogService->catalogGetTableIndex(pName, pRes); @@ -341,6 +343,7 @@ void initMetaDataEnv() { stub.set(catalogGetUdfInfo, __catalogGetUdfInfo); stub.set(catalogRefreshGetTableMeta, __catalogRefreshGetTableMeta); stub.set(catalogRemoveTableMeta, __catalogRemoveTableMeta); + stub.set(catalogRemoveViewMeta, __catalogRemoveViewMeta); stub.set(catalogGetTableIndex, __catalogGetTableIndex); stub.set(catalogGetDnodeList, __catalogGetDnodeList); stub.set(catalogRefreshGetTableCfg, __catalogRefreshGetTableCfg); diff --git a/source/libs/parser/test/mockCatalogService.cpp b/source/libs/parser/test/mockCatalogService.cpp index 254ac7d927..f1b43c535d 100644 --- a/source/libs/parser/test/mockCatalogService.cpp +++ b/source/libs/parser/test/mockCatalogService.cpp @@ -225,6 +225,9 @@ class MockCatalogServiceImpl { if (TSDB_CODE_SUCCESS == code) { code = getAllTableCfg(pCatalogReq->pTableCfg, &pMetaData->pTableCfg); } + if (TSDB_CODE_SUCCESS == code) { + code = getAllViewMeta(pCatalogReq->pView, &pMetaData->pView); + } return code; } @@ -638,6 +641,20 @@ class MockCatalogServiceImpl { return TSDB_CODE_SUCCESS; } + int32_t getAllViewMeta(SArray* pViewMetaReq, SArray** pViewMetaData) const { + if (NULL != pViewMetaReq) { + int32_t nviews = taosArrayGetSize(pViewMetaReq); + *pViewMetaData = taosArrayInit(nviews, sizeof(SMetaRes)); + for (int32_t i = 0; i < nviews; ++i) { + SMetaRes res = {0}; + res.pRes = NULL; + res.code = TSDB_CODE_PAR_TABLE_NOT_EXIST; + taosArrayPush(*pViewMetaData, &res); + } + } + return TSDB_CODE_SUCCESS; + } + int32_t getAllDnodeList(SArray** pDnodes) const { SMetaRes res = {0}; catalogGetDnodeList((SArray**)&res.pRes); diff --git a/source/libs/parser/test/parShowToUse.cpp b/source/libs/parser/test/parShowToUse.cpp index b32a86eed7..ee71950621 100644 --- a/source/libs/parser/test/parShowToUse.cpp +++ b/source/libs/parser/test/parShowToUse.cpp @@ -84,21 +84,6 @@ TEST_F(ParserShowToUseTest, showCreateTable) { run("SHOW CREATE TABLE t1"); } -TEST_F(ParserShowToUseTest, showCreateView) { - useDb("root", "test"); - - setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) { - ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_SHOW_CREATE_VIEW_STMT); - ASSERT_EQ(pQuery->execMode, QUERY_EXEC_MODE_LOCAL); - ASSERT_TRUE(pQuery->haveResultSet); - ASSERT_NE(((SShowCreateViewStmt*)pQuery->pRoot)->pDbCfg, nullptr); - ASSERT_NE(((SShowCreateViewStmt*)pQuery->pRoot)->pTableCfg, nullptr); - }); - - run("SHOW CREATE VIEW view1"); -} - - TEST_F(ParserShowToUseTest, showDatabases) { useDb("root", "test");