Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
30a935cd
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
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看板
提交
30a935cd
编写于
12月 06, 2021
作者:
A
Alex Duan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TS-780]<fix> check top bottom function has ts column and fixed case
上级
3628bfde
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
11 addition
and
5 deletion
+11
-5
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+3
-2
tests/script/general/parser/nestquery.sim
tests/script/general/parser/nestquery.sim
+8
-3
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
30a935cd
...
@@ -8685,7 +8685,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
...
@@ -8685,7 +8685,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
const
char
*
msg4
=
"interval query not supported, since the result of sub query not include valid timestamp column"
;
const
char
*
msg4
=
"interval query not supported, since the result of sub query not include valid timestamp column"
;
const
char
*
msg5
=
"only tag query not compatible with normal column filter"
;
const
char
*
msg5
=
"only tag query not compatible with normal column filter"
;
const
char
*
msg6
=
"not support stddev/percentile/interp in the outer query yet"
;
const
char
*
msg6
=
"not support stddev/percentile/interp in the outer query yet"
;
const
char
*
msg7
=
"derivative/twa/rate/irate/diff requires timestamp column exists in subquery"
;
const
char
*
msg7
=
"derivative/twa/rate/irate/diff
/top/bottom
requires timestamp column exists in subquery"
;
const
char
*
msg8
=
"condition missing for join query"
;
const
char
*
msg8
=
"condition missing for join query"
;
const
char
*
msg9
=
"not support 3 level select"
;
const
char
*
msg9
=
"not support 3 level select"
;
...
@@ -8769,7 +8769,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
...
@@ -8769,7 +8769,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
SExprInfo
*
pExpr
=
tscExprGet
(
pQueryInfo
,
i
);
SExprInfo
*
pExpr
=
tscExprGet
(
pQueryInfo
,
i
);
int32_t
f
=
pExpr
->
base
.
functionId
;
int32_t
f
=
pExpr
->
base
.
functionId
;
if
(
f
==
TSDB_FUNC_DERIVATIVE
||
f
==
TSDB_FUNC_TWA
||
f
==
TSDB_FUNC_IRATE
||
f
==
TSDB_FUNC_RATE
||
f
==
TSDB_FUNC_DIFF
)
{
if
(
f
==
TSDB_FUNC_DERIVATIVE
||
f
==
TSDB_FUNC_TWA
||
f
==
TSDB_FUNC_IRATE
||
f
==
TSDB_FUNC_RATE
||
f
==
TSDB_FUNC_DIFF
||
f
==
TSDB_FUNC_TOP
||
f
==
TSDB_FUNC_BOTTOM
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg7
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg7
);
}
}
}
}
...
...
tests/script/general/parser/nestquery.sim
浏览文件 @
30a935cd
...
@@ -330,9 +330,9 @@ if $data12 != 71680.000000000 then
...
@@ -330,9 +330,9 @@ if $data12 != 71680.000000000 then
return -1
return -1
endi
endi
sql select top(x, 20) from (select c1 x from nest_tb0);
sql select top(x, 20) from (select
ts,
c1 x from nest_tb0);
sql select bottom(x, 20) from (select c1 x from nest_tb0)
sql select bottom(x, 20) from (select
ts,
c1 x from nest_tb0)
print ===================> group by + having
print ===================> group by + having
...
@@ -407,12 +407,17 @@ if $data03 != @20-09-15 00:00:00.000@ then
...
@@ -407,12 +407,17 @@ if $data03 != @20-09-15 00:00:00.000@ then
return -1
return -1
endi
endi
sql_error select diff(val) from (select c1 val from nest_tb0);
sql select diff(val) from (select ts,c1 val from nest_tb0);
sql select diff(val) from (select ts,c1 val from nest_tb0);
if $rows != 9999 then
if $rows != 9999 then
return -1
return -1
endi
endi
if $data00 != @70-01-01 08:00:00.000@ then
print data00 = $data00
print data00 = $data01
if $data00 != @20-09-15 00:01:00.000@ then
return -1
return -1
endi
endi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录