Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
19458755
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
19458755
编写于
10月 18, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
10月 18, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17434 from taosdata/fix/3.0_bugfix_wxy
fix: plan problem with 'partition by tag group by tag' statement
上级
af070148
eaa2a344
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
6 deletion
+27
-6
source/libs/planner/src/planOptimizer.c
source/libs/planner/src/planOptimizer.c
+25
-6
source/libs/planner/test/planPartByTest.cpp
source/libs/planner/test/planPartByTest.cpp
+2
-0
未找到文件。
source/libs/planner/src/planOptimizer.c
浏览文件 @
19458755
...
...
@@ -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
&&
COLUMN_TYPE_TBNAME
!=
((
SColumnNode
*
)
pNode
)
->
colType
);
*
((
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
;
...
...
@@ -1520,11 +1520,15 @@ static bool partTagsHasIndefRowsSelectFunc(SNodeList* pFuncs) {
return
false
;
}
static
int32_t
partTagsRewriteGroupTagsToFuncs
(
SNodeList
*
pGroupTags
,
SNodeList
*
pAggFuncs
)
{
static
int32_t
partTagsRewriteGroupTagsToFuncs
(
SNodeList
*
pGroupTags
,
int32_t
start
,
SNodeList
*
pAggFuncs
)
{
bool
hasIndefRowsSelectFunc
=
partTagsHasIndefRowsSelectFunc
(
pAggFuncs
);
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
index
=
0
;
SNode
*
pNode
=
NULL
;
FOREACH
(
pNode
,
pGroupTags
)
{
if
(
index
++
<
start
)
{
continue
;
}
if
(
hasIndefRowsSelectFunc
)
{
code
=
nodesListStrictAppend
(
pAggFuncs
,
partTagsCreateWrapperFunc
(
"_select_value"
,
pNode
));
}
else
{
...
...
@@ -1559,20 +1563,35 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub
}
}
else
{
SAggLogicNode
*
pAgg
=
(
SAggLogicNode
*
)
pNode
;
int32_t
start
=
-
1
;
SNode
*
pGroupKey
=
NULL
;
FOREACH
(
pGroupKey
,
pAgg
->
pGroupKeys
)
{
code
=
nodesListMakeStrictAppend
(
&
pScan
->
pGroupTags
,
nodesCloneNode
(
nodesListGetNode
(((
SGroupingSetNode
*
)
pGroupKey
)
->
pParameterList
,
0
)));
SNode
*
pGroupExpr
=
nodesListGetNode
(((
SGroupingSetNode
*
)
pGroupKey
)
->
pParameterList
,
0
);
if
(
NULL
!=
pScan
->
pGroupTags
)
{
SNode
*
pGroupTag
=
NULL
;
FOREACH
(
pGroupTag
,
pScan
->
pGroupTags
)
{
if
(
nodesEqualNode
(
pGroupTag
,
pGroupExpr
))
{
continue
;
}
}
}
if
(
start
<
0
)
{
start
=
LIST_LENGTH
(
pScan
->
pGroupTags
);
}
code
=
nodesListMakeStrictAppend
(
&
pScan
->
pGroupTags
,
nodesCloneNode
(
pGroupExpr
));
if
(
TSDB_CODE_SUCCESS
!=
code
)
{
break
;
}
}
NODES_DESTORY_LIST
(
pAgg
->
pGroupKeys
);
code
=
partTagsRewriteGroupTagsToFuncs
(
pScan
->
pGroupTags
,
pAgg
->
pAggFuncs
);
if
(
TSDB_CODE_SUCCESS
==
code
&&
start
>=
0
)
{
code
=
partTagsRewriteGroupTagsToFuncs
(
pScan
->
pGroupTags
,
start
,
pAgg
->
pAggFuncs
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
partTagsOptRebuildTbanme
(
pScan
->
pGroupTags
);
}
pCxt
->
optimized
=
true
;
return
code
;
}
...
...
source/libs/planner/test/planPartByTest.cpp
浏览文件 @
19458755
...
...
@@ -61,6 +61,8 @@ TEST_F(PlanPartitionByTest, withGroupBy) {
run
(
"SELECT COUNT(*) FROM t1 PARTITION BY c1 GROUP BY c2"
);
run
(
"SELECT TBNAME, c1 FROM st1 PARTITION BY TBNAME GROUP BY c1"
);
run
(
"SELECT COUNT(*) FROM t1 PARTITION BY TBNAME GROUP BY TBNAME"
);
}
TEST_F
(
PlanPartitionByTest
,
withTimeLineFunc
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录