Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
52bbbe59
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
52bbbe59
编写于
6月 17, 2022
作者:
X
Xiaoyu Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: a problem of super table order by
上级
2df98609
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
3 deletion
+9
-3
source/libs/parser/test/mockCatalogService.cpp
source/libs/parser/test/mockCatalogService.cpp
+1
-1
source/libs/planner/src/planSpliter.c
source/libs/planner/src/planSpliter.c
+4
-2
source/libs/planner/test/planOrderByTest.cpp
source/libs/planner/test/planOrderByTest.cpp
+4
-0
未找到文件。
source/libs/parser/test/mockCatalogService.cpp
浏览文件 @
52bbbe59
...
...
@@ -285,7 +285,7 @@ class MockCatalogServiceImpl {
}
void
createSmaIndex
(
const
SMCreateSmaReq
*
pReq
)
{
STableIndexInfo
info
;
STableIndexInfo
info
=
{
0
}
;
info
.
intervalUnit
=
pReq
->
intervalUnit
;
info
.
slidingUnit
=
pReq
->
slidingUnit
;
info
.
interval
=
pReq
->
interval
;
...
...
source/libs/planner/src/planSpliter.c
浏览文件 @
52bbbe59
...
...
@@ -537,10 +537,12 @@ static int32_t stbSplCreateMergeKeys(SNodeList* pSortKeys, SNodeList* pTargets,
SNode
*
pNode
=
NULL
;
FOREACH
(
pNode
,
pSortKeys
)
{
SOrderByExprNode
*
pSortKey
=
(
SOrderByExprNode
*
)
pNode
;
SExprNode
*
pSortExpr
=
(
SExprNode
*
)
pSortKey
->
pExpr
;
SNode
*
pTarget
=
NULL
;
bool
found
=
false
;
FOREACH
(
pTarget
,
pTargets
)
{
if
(
0
==
strcmp
(((
SExprNode
*
)
pSortKey
->
pExpr
)
->
aliasName
,
((
SColumnNode
*
)
pTarget
)
->
colName
))
{
if
((
QUERY_NODE_COLUMN
==
nodeType
(
pSortExpr
)
&&
nodesEqualNode
((
SNode
*
)
pSortExpr
,
pTarget
))
||
(
0
==
strcmp
(
pSortExpr
->
aliasName
,
((
SColumnNode
*
)
pTarget
)
->
colName
)))
{
code
=
nodesListMakeStrictAppend
(
&
pMergeKeys
,
stbSplCreateOrderByExpr
(
pSortKey
,
pTarget
));
if
(
TSDB_CODE_SUCCESS
!=
code
)
{
break
;
...
...
@@ -549,7 +551,7 @@ static int32_t stbSplCreateMergeKeys(SNodeList* pSortKeys, SNodeList* pTargets,
}
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
!
found
)
{
SNode
*
pCol
=
stbSplCreateColumnNode
(
(
SExprNode
*
)
pSortKey
->
p
Expr
);
SNode
*
pCol
=
stbSplCreateColumnNode
(
pSort
Expr
);
code
=
nodesListMakeStrictAppend
(
&
pMergeKeys
,
stbSplCreateOrderByExpr
(
pSortKey
,
pCol
));
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
nodesListStrictAppend
(
pTargets
,
pCol
);
...
...
source/libs/planner/test/planOrderByTest.cpp
浏览文件 @
52bbbe59
...
...
@@ -28,6 +28,8 @@ TEST_F(PlanOrderByTest, basic) {
// ORDER BY key is not in the projection list
run
(
"SELECT c1 FROM t1 ORDER BY c2"
);
run
(
"SELECT c1 AS a FROM t1 ORDER BY a"
);
run
(
"SELECT c1 + 10 AS a FROM t1 ORDER BY a"
);
}
...
...
@@ -59,4 +61,6 @@ TEST_F(PlanOrderByTest, stable) {
run
(
"SELECT c2 FROM st1 ORDER BY c1"
);
run
(
"SELECT c2 FROM st1 PARTITION BY c2 ORDER BY c1"
);
run
(
"SELECT c1 AS a FROM st1 ORDER BY a"
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录