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

fix: ut case issue

This commit is contained in:
dapan1121 2023-10-30 16:44:10 +08:00
parent 63534d29c0
commit 1517fe0ff0
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/parser/src/parCalcConst.c
View File

@ -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;

3
source/libs/parser/test/mockCatalog.cpp
View File

@ -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);

17
source/libs/parser/test/mockCatalogService.cpp
View File

@ -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);

15
source/libs/parser/test/parShowToUse.cpp
View File

@ -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");