Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
a14b3e69
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1185
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,发现更多精彩内容 >>
未验证
提交
a14b3e69
编写于
3月 27, 2023
作者:
X
Xiaoyu Wang
提交者:
GitHub
3月 27, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20656 from taosdata/fix/main_bugfix_wxy
fix: create stream does not support event_window
上级
af53a3a2
c4791d58
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
14 deletion
+21
-14
source/libs/parser/src/parCalcConst.c
source/libs/parser/src/parCalcConst.c
+13
-10
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+8
-4
未找到文件。
source/libs/parser/src/parCalcConst.c
浏览文件 @
a14b3e69
...
...
@@ -183,16 +183,18 @@ static int32_t calcConstProject(SNode* pProject, bool dual, SNode** pNew) {
}
else
{
code
=
scalarCalculateConstants
(
pProject
,
pNew
);
}
if
(
TSDB_CODE_SUCCESS
==
code
&&
QUERY_NODE_VALUE
==
nodeType
(
*
pNew
)
&&
NULL
!=
pAssociation
)
{
if
(
TSDB_CODE_SUCCESS
==
code
)
{
strcpy
(((
SExprNode
*
)
*
pNew
)
->
aliasName
,
aliasName
);
int32_t
size
=
taosArrayGetSize
(
pAssociation
);
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
SNode
**
pCol
=
taosArrayGetP
(
pAssociation
,
i
);
nodesDestroyNode
(
*
pCol
);
*
pCol
=
nodesCloneNode
(
*
pNew
);
if
(
NULL
==
*
pCol
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
break
;
if
(
QUERY_NODE_VALUE
==
nodeType
(
*
pNew
)
&&
NULL
!=
pAssociation
)
{
int32_t
size
=
taosArrayGetSize
(
pAssociation
);
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
SNode
**
pCol
=
taosArrayGetP
(
pAssociation
,
i
);
nodesDestroyNode
(
*
pCol
);
*
pCol
=
nodesCloneNode
(
*
pNew
);
if
(
NULL
==
*
pCol
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
break
;
}
}
}
}
...
...
@@ -383,7 +385,8 @@ static int32_t calcConstSetOpProjections(SCalcConstContext* pCxt, SSetOperator*
int32_t
index
=
0
;
SNode
*
pProj
=
NULL
;
WHERE_EACH
(
pProj
,
pSetOp
->
pProjectionList
)
{
if
(
subquery
&&
notRefByOrderBy
((
SColumnNode
*
)
pProj
,
pSetOp
->
pOrderByList
)
&&
isSetUselessCol
(
pSetOp
,
index
,
(
SExprNode
*
)
pProj
))
{
if
(
subquery
&&
notRefByOrderBy
((
SColumnNode
*
)
pProj
,
pSetOp
->
pOrderByList
)
&&
isSetUselessCol
(
pSetOp
,
index
,
(
SExprNode
*
)
pProj
))
{
ERASE_NODE
(
pSetOp
->
pProjectionList
);
eraseSetOpChildProjection
(
pSetOp
,
index
);
continue
;
...
...
source/libs/parser/src/parTranslater.c
浏览文件 @
a14b3e69
...
...
@@ -1342,8 +1342,8 @@ static bool isCountNotNullValue(SFunctionNode* pFunc) {
// count(1) is rewritten as count(ts) for scannning optimization
static
int32_t
rewriteCountNotNullValue
(
STranslateContext
*
pCxt
,
SFunctionNode
*
pCount
)
{
SValueNode
*
pValue
=
(
SValueNode
*
)
nodesListGetNode
(
pCount
->
pParameterList
,
0
);
STableNode
*
pTable
=
NULL
;
int32_t
code
=
findTable
(
pCxt
,
NULL
,
&
pTable
);
STableNode
*
pTable
=
NULL
;
int32_t
code
=
findTable
(
pCxt
,
NULL
,
&
pTable
);
if
(
TSDB_CODE_SUCCESS
==
code
&&
QUERY_NODE_REAL_TABLE
==
nodeType
(
pTable
))
{
SColumnNode
*
pCol
=
(
SColumnNode
*
)
nodesMakeNode
(
QUERY_NODE_COLUMN
);
if
(
NULL
==
pCol
)
{
...
...
@@ -1424,7 +1424,7 @@ static int32_t translateAggFunc(STranslateContext* pCxt, SFunctionNode* pFunc) {
}
if
(
isCountNotNullValue
(
pFunc
))
{
return
rewriteCountNotNullValue
(
pCxt
,
pFunc
);
}
}
if
(
isCountTbname
(
pFunc
))
{
return
rewriteCountTbname
(
pCxt
,
pFunc
);
}
...
...
@@ -5923,11 +5923,15 @@ static int32_t addSubtableInfoToCreateStreamQuery(STranslateContext* pCxt, STabl
return
code
;
}
static
bool
isEventWindowQuery
(
SSelectStmt
*
pSelect
)
{
return
NULL
!=
pSelect
->
pWindow
&&
QUERY_NODE_EVENT_WINDOW
==
nodeType
(
pSelect
->
pWindow
);
}
static
int32_t
checkStreamQuery
(
STranslateContext
*
pCxt
,
SCreateStreamStmt
*
pStmt
)
{
SSelectStmt
*
pSelect
=
(
SSelectStmt
*
)
pStmt
->
pQuery
;
if
(
TSDB_DATA_TYPE_TIMESTAMP
!=
((
SExprNode
*
)
nodesListGetNode
(
pSelect
->
pProjectionList
,
0
))
->
resType
.
type
||
!
pSelect
->
isTimeLineResult
||
crossTableWithoutAggOper
(
pSelect
)
||
NULL
!=
pSelect
->
pOrderByList
||
crossTableWithUdaf
(
pSelect
))
{
crossTableWithUdaf
(
pSelect
)
||
isEventWindowQuery
(
pSelect
)
)
{
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
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录