Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
47791dfe
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1181
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47791dfe
编写于
5月 06, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: group by validation issue
上级
997be0a3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
4 deletion
+25
-4
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+12
-4
source/libs/parser/test/parSelectTest.cpp
source/libs/parser/test/parSelectTest.cpp
+13
-0
未找到文件。
source/libs/parser/src/parTranslater.c
浏览文件 @
47791dfe
...
...
@@ -2289,20 +2289,22 @@ static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect)
return
TSDB_CODE_SUCCESS
;
}
static
int32_t
check
Partition
GroupBy
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
static
int32_t
check
Having
GroupBy
(
STranslateContext
*
pCxt
,
SSelectStmt
*
pSelect
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
if
(
NULL
==
pSelect
->
pGroupByList
&&
NULL
==
pSelect
->
pPartitionByList
&&
NULL
==
pSelect
->
pWindow
)
{
if
(
NULL
==
getGroupByList
(
pCxt
)
&&
NULL
==
pSelect
->
pPartitionByList
&&
NULL
==
pSelect
->
pWindow
)
{
return
code
;
}
if
(
NULL
!=
pSelect
->
pHaving
)
{
code
=
checkExprForGroupBy
(
pCxt
,
&
pSelect
->
pHaving
);
}
/*
if (TSDB_CODE_SUCCESS == code && NULL != pSelect->pProjectionList) {
code = checkExprListForGroupBy(pCxt, pSelect, pSelect->pProjectionList);
}
if (TSDB_CODE_SUCCESS == code && NULL != pSelect->pOrderByList) {
code = checkExprListForGroupBy(pCxt, pSelect, pSelect->pOrderByList);
}
*/
return
code
;
}
...
...
@@ -2918,6 +2920,9 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
pCxt
->
currClause
=
SQL_CLAUSE_ORDER_BY
;
code
=
translateExprList
(
pCxt
,
pSelect
->
pOrderByList
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
checkExprListForGroupBy
(
pCxt
,
pSelect
,
pSelect
->
pOrderByList
);
}
return
code
;
}
...
...
@@ -3036,6 +3041,9 @@ static int32_t translateSelectList(STranslateContext* pCxt, SSelectStmt* pSelect
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
translateProjectionList
(
pCxt
,
pSelect
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
checkExprListForGroupBy
(
pCxt
,
pSelect
,
pSelect
->
pProjectionList
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
translateFillValues
(
pCxt
,
pSelect
);
}
...
...
@@ -3635,10 +3643,10 @@ static int32_t translateSelectFrom(STranslateContext* pCxt, SSelectStmt* pSelect
code
=
translateSelectList
(
pCxt
,
pSelect
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
translateOrder
By
(
pCxt
,
pSelect
);
code
=
checkHavingGroup
By
(
pCxt
,
pSelect
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
checkPartitionGroup
By
(
pCxt
,
pSelect
);
code
=
translateOrder
By
(
pCxt
,
pSelect
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
checkAggColCoexist
(
pCxt
,
pSelect
);
...
...
source/libs/parser/test/parSelectTest.cpp
浏览文件 @
47791dfe
...
...
@@ -239,6 +239,19 @@ TEST_F(ParserSelectTest, groupBySemanticCheck) {
run
(
"SELECT COUNT(*) cnt, c2 FROM t1 WHERE c1 > 0 GROUP BY c1"
,
TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION
);
}
TEST_F
(
ParserSelectTest
,
havingCheck
)
{
useDb
(
"root"
,
"test"
);
run
(
"select tbname,count(*) from st1 partition by tbname having c1>0"
,
TSDB_CODE_PAR_INVALID_OPTR_USAGE
);
run
(
"select tbname,count(*) from st1 group by tbname having c1>0"
,
TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION
);
run
(
"select max(c1) from st1 group by tbname having c1>0"
);
run
(
"select max(c1) from st1 partition by tbname having c1>0"
);
}
TEST_F
(
ParserSelectTest
,
orderBy
)
{
useDb
(
"root"
,
"test"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录