Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
dab01b31
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
dab01b31
编写于
3月 30, 2023
作者:
X
Xiaoyu Wang
提交者:
GitHub
3月 30, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20685 from taosdata/fix/main_bugfix_wxy
fix: error in determining whether last(t.*) is a selection function
上级
0d3ac6c3
10979f6f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
5 deletion
+17
-5
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+4
-2
source/libs/planner/src/planPhysiCreater.c
source/libs/planner/src/planPhysiCreater.c
+11
-2
source/libs/planner/src/planSpliter.c
source/libs/planner/src/planSpliter.c
+2
-1
未找到文件。
source/libs/parser/src/parTranslater.c
浏览文件 @
dab01b31
...
...
@@ -1634,13 +1634,15 @@ static bool isTableStar(SNode* pNode) {
(
0
==
strcmp
(((
SColumnNode
*
)
pNode
)
->
colName
,
"*"
));
}
static
bool
isStarParam
(
SNode
*
pNode
)
{
return
isStar
(
pNode
)
||
isTableStar
(
pNode
);
}
static
int32_t
translateMultiResFunc
(
STranslateContext
*
pCxt
,
SFunctionNode
*
pFunc
)
{
if
(
!
fmIsMultiResFunc
(
pFunc
->
funcId
))
{
return
TSDB_CODE_SUCCESS
;
}
if
(
SQL_CLAUSE_SELECT
!=
pCxt
->
currClause
)
{
SNode
*
pPara
=
nodesListGetNode
(
pFunc
->
pParameterList
,
0
);
if
(
isStar
(
pPara
)
||
isTableStar
(
pPara
))
{
if
(
isStar
Param
(
pPara
))
{
return
generateSyntaxErrMsgExt
(
&
pCxt
->
msgBuf
,
TSDB_CODE_PAR_NOT_ALLOWED_FUNC
,
"%s(*) is only supported in SELECTed list"
,
pFunc
->
functionName
);
}
...
...
@@ -1654,7 +1656,7 @@ static int32_t translateMultiResFunc(STranslateContext* pCxt, SFunctionNode* pFu
static
int32_t
getMultiResFuncNum
(
SNodeList
*
pParameterList
)
{
if
(
1
==
LIST_LENGTH
(
pParameterList
))
{
return
isStar
(
nodesListGetNode
(
pParameterList
,
0
))
?
2
:
1
;
return
isStar
Param
(
nodesListGetNode
(
pParameterList
,
0
))
?
2
:
1
;
}
return
LIST_LENGTH
(
pParameterList
);
}
...
...
source/libs/planner/src/planPhysiCreater.c
浏览文件 @
dab01b31
...
...
@@ -1089,9 +1089,15 @@ static int32_t doCreateExchangePhysiNode(SPhysiPlanContext* pCxt, SExchangeLogic
pExchange
->
srcStartGroupId
=
pExchangeLogicNode
->
srcStartGroupId
;
pExchange
->
srcEndGroupId
=
pExchangeLogicNode
->
srcEndGroupId
;
pExchange
->
seqRecvData
=
pExchangeLogicNode
->
seqRecvData
;
*
pPhyNode
=
(
SPhysiNode
*
)
pExchange
;
return
TSDB_CODE_SUCCESS
;
int32_t
code
=
setConditionsSlotId
(
pCxt
,
(
const
SLogicNode
*
)
pExchangeLogicNode
,
(
SPhysiNode
*
)
pExchange
);
if
(
TSDB_CODE_SUCCESS
==
code
)
{
*
pPhyNode
=
(
SPhysiNode
*
)
pExchange
;
}
else
{
nodesDestroyNode
((
SNode
*
)
pExchange
);
}
return
code
;
}
static
int32_t
createStreamScanPhysiNodeByExchange
(
SPhysiPlanContext
*
pCxt
,
SExchangeLogicNode
*
pExchangeLogicNode
,
...
...
@@ -1119,6 +1125,9 @@ static int32_t createStreamScanPhysiNodeByExchange(SPhysiPlanContext* pCxt, SExc
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
addDataBlockSlots
(
pCxt
,
pScan
->
pScanCols
,
pScan
->
node
.
pOutputDataBlockDesc
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
code
=
setConditionsSlotId
(
pCxt
,
(
const
SLogicNode
*
)
pExchangeLogicNode
,
(
SPhysiNode
*
)
pScan
);
}
if
(
TSDB_CODE_SUCCESS
==
code
)
{
*
pPhyNode
=
(
SPhysiNode
*
)
pScan
;
...
...
source/libs/planner/src/planSpliter.c
浏览文件 @
dab01b31
...
...
@@ -1365,7 +1365,8 @@ static int32_t unAllSplCreateExchangeNode(SSplitContext* pCxt, int32_t startGrou
pExchange
->
srcEndGroupId
=
pCxt
->
groupId
-
1
;
pExchange
->
node
.
precision
=
pProject
->
node
.
precision
;
pExchange
->
node
.
pTargets
=
nodesCloneList
(
pProject
->
node
.
pTargets
);
if
(
NULL
==
pExchange
->
node
.
pTargets
)
{
pExchange
->
node
.
pConditions
=
nodesCloneNode
(
pProject
->
node
.
pConditions
);
if
(
NULL
==
pExchange
->
node
.
pTargets
||
(
NULL
!=
pProject
->
node
.
pConditions
&&
NULL
==
pExchange
->
node
.
pConditions
))
{
return
TSDB_CODE_OUT_OF_MEMORY
;
}
TSWAP
(
pExchange
->
node
.
pLimit
,
pProject
->
node
.
pLimit
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录