Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5d483095
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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,发现更多精彩内容 >>
未验证
提交
5d483095
编写于
5月 08, 2023
作者:
D
dapan1121
提交者:
GitHub
5月 08, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21187 from taosdata/szhou/fix-ts23905-ts23865
fix: forbid some stream computing
上级
443932c1
2f45a3df
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
1 deletion
+38
-1
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+34
-1
source/libs/parser/test/parInitialCTest.cpp
source/libs/parser/test/parInitialCTest.cpp
+4
-0
未找到文件。
source/libs/parser/src/parTranslater.c
浏览文件 @
5d483095
...
@@ -6118,17 +6118,50 @@ static bool isEventWindowQuery(SSelectStmt* pSelect) {
...
@@ -6118,17 +6118,50 @@ static bool isEventWindowQuery(SSelectStmt* pSelect) {
return
NULL
!=
pSelect
->
pWindow
&&
QUERY_NODE_EVENT_WINDOW
==
nodeType
(
pSelect
->
pWindow
);
return
NULL
!=
pSelect
->
pWindow
&&
QUERY_NODE_EVENT_WINDOW
==
nodeType
(
pSelect
->
pWindow
);
}
}
static
bool
hasJsonTypeProjection
(
SSelectStmt
*
pSelect
)
{
SNode
*
pProj
=
NULL
;
FOREACH
(
pProj
,
pSelect
->
pProjectionList
)
{
if
(
TSDB_DATA_TYPE_JSON
==
((
SExprNode
*
)
pProj
)
->
resType
.
type
)
{
return
true
;
}
}
return
false
;
}
static
EDealRes
hasColumnOrPseudoColumn
(
SNode
*
pNode
,
void
*
pContext
)
{
if
(
QUERY_NODE_COLUMN
==
nodeType
(
pNode
))
{
*
(
bool
*
)
pContext
=
true
;
return
DEAL_RES_END
;
}
if
(
QUERY_NODE_FUNCTION
==
nodeType
(
pNode
)
&&
fmIsPseudoColumnFunc
(((
SFunctionNode
*
)
pNode
)
->
funcId
))
{
*
(
bool
*
)
pContext
=
true
;
return
DEAL_RES_END
;
}
return
DEAL_RES_CONTINUE
;
}
static
int32_t
subtableExprHasColumnOrPseudoColumn
(
SNode
*
pNode
)
{
bool
hasColumn
=
false
;
nodesWalkExprPostOrder
(
pNode
,
hasColumnOrPseudoColumn
,
&
hasColumn
);
return
hasColumn
;
}
static
int32_t
checkStreamQuery
(
STranslateContext
*
pCxt
,
SCreateStreamStmt
*
pStmt
)
{
static
int32_t
checkStreamQuery
(
STranslateContext
*
pCxt
,
SCreateStreamStmt
*
pStmt
)
{
SSelectStmt
*
pSelect
=
(
SSelectStmt
*
)
pStmt
->
pQuery
;
SSelectStmt
*
pSelect
=
(
SSelectStmt
*
)
pStmt
->
pQuery
;
if
(
TSDB_DATA_TYPE_TIMESTAMP
!=
((
SExprNode
*
)
nodesListGetNode
(
pSelect
->
pProjectionList
,
0
))
->
resType
.
type
||
if
(
TSDB_DATA_TYPE_TIMESTAMP
!=
((
SExprNode
*
)
nodesListGetNode
(
pSelect
->
pProjectionList
,
0
))
->
resType
.
type
||
!
pSelect
->
isTimeLineResult
||
crossTableWithoutAggOper
(
pSelect
)
||
NULL
!=
pSelect
->
pOrderByList
||
!
pSelect
->
isTimeLineResult
||
crossTableWithoutAggOper
(
pSelect
)
||
NULL
!=
pSelect
->
pOrderByList
||
crossTableWithUdaf
(
pSelect
)
||
isEventWindowQuery
(
pSelect
))
{
crossTableWithUdaf
(
pSelect
)
||
isEventWindowQuery
(
pSelect
)
||
hasJsonTypeProjection
(
pSelect
)
)
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
"Unsupported stream query"
);
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
"Unsupported stream query"
);
}
}
if
(
NULL
!=
pSelect
->
pSubtable
&&
TSDB_DATA_TYPE_VARCHAR
!=
((
SExprNode
*
)
pSelect
->
pSubtable
)
->
resType
.
type
)
{
if
(
NULL
!=
pSelect
->
pSubtable
&&
TSDB_DATA_TYPE_VARCHAR
!=
((
SExprNode
*
)
pSelect
->
pSubtable
)
->
resType
.
type
)
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
"SUBTABLE expression must be of VARCHAR type"
);
"SUBTABLE expression must be of VARCHAR type"
);
}
}
if
(
NULL
!=
pSelect
->
pSubtable
&&
0
==
LIST_LENGTH
(
pSelect
->
pPartitionByList
)
&&
subtableExprHasColumnOrPseudoColumn
(
pSelect
->
pSubtable
))
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
"SUBTABLE expression must not has column when no partition by clause"
);
}
if
(
NULL
==
pSelect
->
pWindow
&&
STREAM_TRIGGER_AT_ONCE
!=
pStmt
->
pOptions
->
triggerType
)
{
if
(
NULL
==
pSelect
->
pWindow
&&
STREAM_TRIGGER_AT_ONCE
!=
pStmt
->
pOptions
->
triggerType
)
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
,
"The trigger mode of non window query can only be AT_ONCE"
);
"The trigger mode of non window query can only be AT_ONCE"
);
...
...
source/libs/parser/test/parInitialCTest.cpp
浏览文件 @
5d483095
...
@@ -920,6 +920,10 @@ TEST_F(ParserInitialCTest, createStreamSemanticCheck) {
...
@@ -920,6 +920,10 @@ TEST_F(ParserInitialCTest, createStreamSemanticCheck) {
run
(
"CREATE STREAM s1 INTO st1 AS SELECT PERCENTILE(c1, 30) FROM t1 INTERVAL(10S)"
,
run
(
"CREATE STREAM s1 INTO st1 AS SELECT PERCENTILE(c1, 30) FROM t1 INTERVAL(10S)"
,
TSDB_CODE_PAR_STREAM_NOT_ALLOWED_FUNC
);
TSDB_CODE_PAR_STREAM_NOT_ALLOWED_FUNC
);
run
(
"CREATE STREAM s2 INTO st1 AS SELECT ts, to_json('{c1:1}') FROM st1 PARTITION BY TBNAME"
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
);
run
(
"CREATE STREAM s3 INTO st3 TAGS(tname VARCHAR(10), id INT) SUBTABLE(CONCAT('new-', tbname)) "
"AS SELECT _WSTART wstart, COUNT(*) cnt FROM st1 INTERVAL(10S)"
,
TSDB_CODE_PAR_INVALID_STREAM_QUERY
);
}
}
/*
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录