Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5200a481
T
TDengine
项目概览
taosdata
/
TDengine
11 个月 前同步成功
通知
1178
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,体验更适合开发者的 AI 搜索 >>
提交
5200a481
编写于
7月 19, 2022
作者:
J
jiacy-jcy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: update
上级
bc1af6de
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
8 deletion
+13
-8
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+3
-1
source/libs/stream/inc/streamInc.h
source/libs/stream/inc/streamInc.h
+1
-1
source/libs/stream/src/streamData.c
source/libs/stream/src/streamData.c
+6
-5
source/libs/stream/src/streamExec.c
source/libs/stream/src/streamExec.c
+3
-1
未找到文件。
source/libs/executor/src/scanoperator.c
浏览文件 @
5200a481
...
...
@@ -1431,9 +1431,11 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
}
if
(
pBlockInfo
->
rows
>
0
)
{
break
;
}
else
{
pInfo
->
tqReader
->
pMsg
=
NULL
;
return
NULL
;
}
/*blockDataCleanup(pInfo->pRes);*/
pInfo
->
tqReader
->
pMsg
=
NULL
;
}
// record the scan action.
...
...
source/libs/stream/inc/streamInc.h
浏览文件 @
5200a481
...
...
@@ -44,7 +44,7 @@ int32_t streamBroadcastToChildren(SStreamTask* pTask, const SSDataBlock* pBlock)
int32_t
tEncodeStreamRetrieveReq
(
SEncoder
*
pEncoder
,
const
SStreamRetrieveReq
*
pReq
);
int32_t
streamAppendQueueItem
(
SStreamQueueItem
*
dst
,
SStreamQueueItem
*
elem
);
SStreamQueueItem
*
streamAppendQueueItem
(
SStreamQueueItem
*
dst
,
SStreamQueueItem
*
elem
);
void
streamFreeQitem
(
SStreamQueueItem
*
data
);
#ifdef __cplusplus
...
...
source/libs/stream/src/streamData.c
浏览文件 @
5200a481
...
...
@@ -83,6 +83,7 @@ SStreamMergedSubmit* streamMergedSubmitNew() {
pMerged
->
reqs
=
taosArrayInit
(
0
,
sizeof
(
void
*
));
pMerged
->
dataRefs
=
taosArrayInit
(
0
,
sizeof
(
int32_t
*
));
if
(
pMerged
->
dataRefs
==
NULL
||
pMerged
->
reqs
==
NULL
)
goto
FAIL
;
pMerged
->
type
=
STREAM_INPUT__MERGED_SUBMIT
;
return
pMerged
;
FAIL:
if
(
pMerged
->
reqs
)
taosArrayDestroy
(
pMerged
->
reqs
);
...
...
@@ -121,7 +122,7 @@ void streamDataSubmitRefDec(SStreamDataSubmit* pDataSubmit) {
}
}
int32_t
streamAppendQueueItem
(
SStreamQueueItem
*
dst
,
SStreamQueueItem
*
elem
)
{
SStreamQueueItem
*
streamAppendQueueItem
(
SStreamQueueItem
*
dst
,
SStreamQueueItem
*
elem
)
{
ASSERT
(
elem
);
if
(
dst
->
type
==
STREAM_INPUT__DATA_BLOCK
&&
elem
->
type
==
STREAM_INPUT__DATA_BLOCK
)
{
SStreamDataBlock
*
pBlock
=
(
SStreamDataBlock
*
)
dst
;
...
...
@@ -129,13 +130,13 @@ int32_t streamAppendQueueItem(SStreamQueueItem* dst, SStreamQueueItem* elem) {
taosArrayAddAll
(
pBlock
->
blocks
,
pBlockSrc
->
blocks
);
taosArrayDestroy
(
pBlockSrc
->
blocks
);
taosFreeQitem
(
elem
);
return
0
;
return
dst
;
}
else
if
(
dst
->
type
==
STREAM_INPUT__MERGED_SUBMIT
&&
elem
->
type
==
STREAM_INPUT__DATA_SUBMIT
)
{
SStreamMergedSubmit
*
pMerged
=
(
SStreamMergedSubmit
*
)
dst
;
SStreamDataSubmit
*
pBlockSrc
=
(
SStreamDataSubmit
*
)
elem
;
streamMergeSubmit
(
pMerged
,
pBlockSrc
);
taosFreeQitem
(
elem
);
return
0
;
return
dst
;
}
else
if
(
dst
->
type
==
STREAM_INPUT__DATA_SUBMIT
&&
elem
->
type
==
STREAM_INPUT__DATA_SUBMIT
)
{
SStreamMergedSubmit
*
pMerged
=
streamMergedSubmitNew
();
ASSERT
(
pMerged
);
...
...
@@ -143,9 +144,9 @@ int32_t streamAppendQueueItem(SStreamQueueItem* dst, SStreamQueueItem* elem) {
streamMergeSubmit
(
pMerged
,
(
SStreamDataSubmit
*
)
elem
);
taosFreeQitem
(
dst
);
taosFreeQitem
(
elem
);
return
0
;
return
(
SStreamQueueItem
*
)
pMerged
;
}
else
{
return
-
1
;
return
NULL
;
}
}
...
...
source/libs/stream/src/streamExec.c
浏览文件 @
5200a481
...
...
@@ -162,11 +162,13 @@ static SArray* streamExecForQall(SStreamTask* pTask, SArray* pRes) {
/*streamUpdateVer(pTask, (SStreamDataBlock*)qItem);*/
/*}*/
}
else
{
if
(
streamAppendQueueItem
(
data
,
qItem
)
<
0
)
{
void
*
newRet
;
if
((
newRet
=
streamAppendQueueItem
(
data
,
qItem
))
==
NULL
)
{
streamQueueProcessFail
(
pTask
->
inputQueue
);
break
;
}
else
{
cnt
++
;
data
=
newRet
;
/*streamUpdateVer(pTask, (SStreamDataBlock*)qItem);*/
streamQueueProcessSuccess
(
pTask
->
inputQueue
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录