From 6954d4902b756dfe265e1d5a46dc8b8db52af280 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Wed, 12 Oct 2022 14:18:03 +0800 Subject: [PATCH] fix: some problems of parser --- source/libs/parser/test/parShowToUse.cpp | 6 ------ source/libs/planner/src/planOptimizer.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/source/libs/parser/test/parShowToUse.cpp b/source/libs/parser/test/parShowToUse.cpp index 36e70dd015..fe1e14797a 100644 --- a/source/libs/parser/test/parShowToUse.cpp +++ b/source/libs/parser/test/parShowToUse.cpp @@ -130,12 +130,6 @@ TEST_F(ParserShowToUseTest, showMnodes) { run("SHOW mnodes"); } -TEST_F(ParserShowToUseTest, showModules) { - useDb("root", "test"); - - run("SHOW modules"); -} - TEST_F(ParserShowToUseTest, showQnodes) { useDb("root", "test"); diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index 927969bf9c..e6d349962e 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -124,8 +124,8 @@ static void optSetParentOrder(SLogicNode* pNode, EOrder order) { EDealRes scanPathOptHaveNormalColImpl(SNode* pNode, void* pContext) { if (QUERY_NODE_COLUMN == nodeType(pNode)) { - // *((bool*)pContext) = (COLUMN_TYPE_TAG != ((SColumnNode*)pNode)->colType); - *((bool*)pContext) = true; + *((bool*)pContext) = + (COLUMN_TYPE_TAG != ((SColumnNode*)pNode)->colType && COLUMN_TYPE_TBNAME != ((SColumnNode*)pNode)->colType); return *((bool*)pContext) ? DEAL_RES_END : DEAL_RES_IGNORE_CHILD; } return DEAL_RES_CONTINUE;