Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5367f25b
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看板
提交
5367f25b
编写于
4月 19, 2023
作者:
X
Xiaoyu Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: the having clause can be used after the partition by clause or window clause
上级
7cf9919a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
2 deletion
+18
-2
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+3
-2
source/libs/planner/src/planLogicCreater.c
source/libs/planner/src/planLogicCreater.c
+15
-0
未找到文件。
source/libs/parser/src/parTranslater.c
浏览文件 @
5367f25b
...
@@ -3035,12 +3035,13 @@ static int32_t translateSelectList(STranslateContext* pCxt, SSelectStmt* pSelect
...
@@ -3035,12 +3035,13 @@ static int32_t translateSelectList(STranslateContext* pCxt, SSelectStmt* pSelect
}
}
static
int32_t
translateHaving
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
static
int32_t
translateHaving
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
if
(
NULL
==
pSelect
->
pGroupByList
&&
NULL
!=
pSelect
->
pHaving
)
{
if
(
NULL
==
pSelect
->
pGroupByList
&&
NULL
==
pSelect
->
pPartitionByList
&&
NULL
==
pSelect
->
pWindow
&&
NULL
!=
pSelect
->
pHaving
)
{
return
generateSyntaxErrMsg
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION
);
return
generateSyntaxErrMsg
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION
);
}
}
pCxt
->
currClause
=
SQL_CLAUSE_HAVING
;
pCxt
->
currClause
=
SQL_CLAUSE_HAVING
;
int32_t
code
=
translateExpr
(
pCxt
,
&
pSelect
->
pHaving
);
int32_t
code
=
translateExpr
(
pCxt
,
&
pSelect
->
pHaving
);
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
&&
(
NULL
!=
pSelect
->
pGroupByList
||
NULL
!=
pSelect
->
pWindow
)
)
{
code
=
checkExprForGroupBy
(
pCxt
,
&
pSelect
->
pHaving
);
code
=
checkExprForGroupBy
(
pCxt
,
&
pSelect
->
pHaving
);
}
}
return
code
;
return
code
;
...
...
source/libs/planner/src/planLogicCreater.c
浏览文件 @
5367f25b
...
@@ -740,6 +740,13 @@ static int32_t createWindowLogicNodeFinalize(SLogicPlanContext* pCxt, SSelectStm
...
@@ -740,6 +740,13 @@ static int32_t createWindowLogicNodeFinalize(SLogicPlanContext* pCxt, SSelectStm
code
=
createColumnByRewriteExprs
(
pWindow
->
pFuncs
,
&
pWindow
->
node
.
pTargets
);
code
=
createColumnByRewriteExprs
(
pWindow
->
pFuncs
,
&
pWindow
->
node
.
pTargets
);
}
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
NULL
!=
pSelect
->
pHaving
)
{
pWindow
->
node
.
pConditions
=
nodesCloneNode
(
pSelect
->
pHaving
);
if
(
NULL
==
pWindow
->
node
.
pConditions
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
}
}
pSelect
->
hasAggFuncs
=
false
;
pSelect
->
hasAggFuncs
=
false
;
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
...
@@ -1132,6 +1139,14 @@ static int32_t createPartitionLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pS
...
@@ -1132,6 +1139,14 @@ static int32_t createPartitionLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pS
}
}
}
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
NULL
!=
pSelect
->
pHaving
&&
!
pSelect
->
hasAggFuncs
&&
NULL
==
pSelect
->
pGroupByList
&&
NULL
==
pSelect
->
pWindow
)
{
pPartition
->
node
.
pConditions
=
nodesCloneNode
(
pSelect
->
pHaving
);
if
(
NULL
==
pPartition
->
node
.
pConditions
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
}
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
*
pLogicNode
=
(
SLogicNode
*
)
pPartition
;
*
pLogicNode
=
(
SLogicNode
*
)
pPartition
;
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录