Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5940bbfb
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
5940bbfb
编写于
7月 10, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(stream): set correct datablock.
上级
e1134423
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
4 deletion
+8
-4
source/libs/executor/src/executor.c
source/libs/executor/src/executor.c
+2
-1
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+3
-1
source/libs/stream/src/streamTask.c
source/libs/stream/src/streamTask.c
+3
-2
未找到文件。
source/libs/executor/src/executor.c
浏览文件 @
5940bbfb
...
@@ -166,7 +166,8 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu
...
@@ -166,7 +166,8 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu
pInfo
->
blockType
=
STREAM_INPUT__DATA_BLOCK
;
pInfo
->
blockType
=
STREAM_INPUT__DATA_BLOCK
;
}
else
if
(
type
==
STREAM_INPUT__CHECKPOINT
)
{
}
else
if
(
type
==
STREAM_INPUT__CHECKPOINT
)
{
taosArrayPush
(
pInfo
->
pBlockLists
,
input
);
SPackedData
tmp
=
{.
pDataBlock
=
input
};
taosArrayPush
(
pInfo
->
pBlockLists
,
&
tmp
);
pInfo
->
blockType
=
STREAM_INPUT__CHECKPOINT
;
pInfo
->
blockType
=
STREAM_INPUT__CHECKPOINT
;
}
else
{
}
else
{
ASSERT
(
0
);
ASSERT
(
0
);
...
...
source/libs/executor/src/scanoperator.c
浏览文件 @
5940bbfb
...
@@ -2179,7 +2179,9 @@ FETCH_NEXT_BLOCK:
...
@@ -2179,7 +2179,9 @@ FETCH_NEXT_BLOCK:
int32_t
current
=
pInfo
->
validBlockIndex
++
;
int32_t
current
=
pInfo
->
validBlockIndex
++
;
qDebug
(
"process %d/%d input data blocks, %s"
,
current
,
(
int32_t
)
total
,
id
);
qDebug
(
"process %d/%d input data blocks, %s"
,
current
,
(
int32_t
)
total
,
id
);
SSDataBlock
*
pBlock
=
taosArrayGet
(
pInfo
->
pBlockLists
,
current
);
SPackedData
*
pData
=
taosArrayGet
(
pInfo
->
pBlockLists
,
current
);
SSDataBlock
*
pBlock
=
pData
->
pDataBlock
;
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
streamScanOperatorSaveCheckpoint
(
pInfo
);
streamScanOperatorSaveCheckpoint
(
pInfo
);
pAPI
->
stateStore
.
streamStateCommit
(
pInfo
->
pState
);
pAPI
->
stateStore
.
streamStateCommit
(
pInfo
->
pState
);
...
...
source/libs/stream/src/streamTask.c
浏览文件 @
5940bbfb
...
@@ -235,14 +235,15 @@ void tFreeStreamTask(SStreamTask* pTask) {
...
@@ -235,14 +235,15 @@ void tFreeStreamTask(SStreamTask* pTask) {
if
(
pTask
->
outputType
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
if
(
pTask
->
outputType
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
taosArrayDestroy
(
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
);
taosArrayDestroy
(
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
);
taosArrayDestroy
(
pTask
->
checkReqIds
);
pTask
->
checkReqIds
=
taosArrayDestroy
(
pTask
->
checkReqIds
);
pTask
->
checkReqIds
=
NULL
;
}
}
if
(
pTask
->
pState
)
{
if
(
pTask
->
pState
)
{
streamStateClose
(
pTask
->
pState
,
status
==
TASK_STATUS__DROPPING
);
streamStateClose
(
pTask
->
pState
,
status
==
TASK_STATUS__DROPPING
);
}
}
pTask
->
pRpcMsgList
=
taosArrayDestroy
(
pTask
->
pRpcMsgList
);
if
(
pTask
->
id
.
idStr
!=
NULL
)
{
if
(
pTask
->
id
.
idStr
!=
NULL
)
{
taosMemoryFree
((
void
*
)
pTask
->
id
.
idStr
);
taosMemoryFree
((
void
*
)
pTask
->
id
.
idStr
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录