Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
728112ed
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看板
提交
728112ed
编写于
7月 26, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(stream): set correct upstream epinfo.
上级
1c1bf63e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
7 deletion
+3
-7
include/libs/stream/tstream.h
include/libs/stream/tstream.h
+0
-1
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+1
-3
source/libs/stream/src/streamRecover.c
source/libs/stream/src/streamRecover.c
+2
-2
source/libs/stream/src/streamTask.c
source/libs/stream/src/streamTask.c
+0
-1
未找到文件。
include/libs/stream/tstream.h
浏览文件 @
728112ed
...
@@ -309,7 +309,6 @@ struct SStreamTask {
...
@@ -309,7 +309,6 @@ struct SStreamTask {
SHistDataRange
dataRange
;
SHistDataRange
dataRange
;
SStreamId
historyTaskId
;
SStreamId
historyTaskId
;
SStreamId
streamTaskId
;
SStreamId
streamTaskId
;
SArray
*
pUpstreamEpInfoList
;
// SArray<SStreamChildEpInfo*>, // children info
int32_t
nextCheckId
;
int32_t
nextCheckId
;
SArray
*
checkpointInfo
;
// SArray<SStreamCheckpointInfo>
SArray
*
checkpointInfo
;
// SArray<SStreamCheckpointInfo>
int64_t
initTs
;
int64_t
initTs
;
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
728112ed
...
@@ -937,10 +937,8 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int64_t ver) {
...
@@ -937,10 +937,8 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int64_t ver) {
streamSetupScheduleTrigger
(
pTask
);
streamSetupScheduleTrigger
(
pTask
);
SCheckpointInfo
*
pChkInfo
=
&
pTask
->
chkInfo
;
SCheckpointInfo
*
pChkInfo
=
&
pTask
->
chkInfo
;
taosThreadMutexInit
(
&
pTask
->
lock
,
NULL
);
// checkpoint ver is the kept version, handled data should be the next version.
if
(
pTask
->
chkInfo
.
checkpointId
!=
0
)
{
if
(
pTask
->
chkInfo
.
checkpointId
!=
0
)
{
// checkpoint ver is the kept version, handled data should be the next version.
pTask
->
chkInfo
.
currentVer
=
pTask
->
chkInfo
.
checkpointVer
+
1
;
pTask
->
chkInfo
.
currentVer
=
pTask
->
chkInfo
.
checkpointVer
+
1
;
tqInfo
(
"s-task:%s restore from the checkpointId:%"
PRId64
" ver:%"
PRId64
" currentVer:%"
PRId64
,
pTask
->
id
.
idStr
,
tqInfo
(
"s-task:%s restore from the checkpointId:%"
PRId64
" ver:%"
PRId64
" currentVer:%"
PRId64
,
pTask
->
id
.
idStr
,
pChkInfo
->
checkpointId
,
pChkInfo
->
checkpointVer
,
pChkInfo
->
currentVer
);
pChkInfo
->
checkpointId
,
pChkInfo
->
checkpointVer
,
pChkInfo
->
currentVer
);
...
...
source/libs/stream/src/streamRecover.c
浏览文件 @
728112ed
...
@@ -395,7 +395,7 @@ int32_t streamDispatchTransferStateMsg(SStreamTask* pTask) {
...
@@ -395,7 +395,7 @@ int32_t streamDispatchTransferStateMsg(SStreamTask* pTask) {
// agg
// agg
int32_t
streamTaskScanHistoryPrepare
(
SStreamTask
*
pTask
)
{
int32_t
streamTaskScanHistoryPrepare
(
SStreamTask
*
pTask
)
{
pTask
->
numOfWaitingUpstream
=
taosArrayGetSize
(
pTask
->
pUpstream
Ep
InfoList
);
pTask
->
numOfWaitingUpstream
=
taosArrayGetSize
(
pTask
->
pUpstreamInfoList
);
qDebug
(
"s-task:%s level:%d task wait for %d upstream tasks complete scan-history procedure, status:%s"
,
qDebug
(
"s-task:%s level:%d task wait for %d upstream tasks complete scan-history procedure, status:%s"
,
pTask
->
id
.
idStr
,
pTask
->
info
.
taskLevel
,
pTask
->
numOfWaitingUpstream
,
pTask
->
id
.
idStr
,
pTask
->
info
.
taskLevel
,
pTask
->
numOfWaitingUpstream
,
streamGetTaskStatusStr
(
pTask
->
status
.
taskStatus
));
streamGetTaskStatusStr
(
pTask
->
status
.
taskStatus
));
...
@@ -426,7 +426,7 @@ int32_t streamProcessScanHistoryFinishReq(SStreamTask* pTask, SStreamScanHistory
...
@@ -426,7 +426,7 @@ int32_t streamProcessScanHistoryFinishReq(SStreamTask* pTask, SStreamScanHistory
ASSERT
(
left
>=
0
);
ASSERT
(
left
>=
0
);
if
(
left
==
0
)
{
if
(
left
==
0
)
{
int32_t
numOfTasks
=
taosArrayGetSize
(
pTask
->
pUpstream
Ep
InfoList
);
int32_t
numOfTasks
=
taosArrayGetSize
(
pTask
->
pUpstreamInfoList
);
qDebug
(
qDebug
(
"s-task:%s all %d upstream tasks finish scan-history data, set param for agg task for stream data and send "
"s-task:%s all %d upstream tasks finish scan-history data, set param for agg task for stream data and send "
"rsp to all upstream tasks"
,
"rsp to all upstream tasks"
,
...
...
source/libs/stream/src/streamTask.c
浏览文件 @
728112ed
...
@@ -270,7 +270,6 @@ void tFreeStreamTask(SStreamTask* pTask) {
...
@@ -270,7 +270,6 @@ void tFreeStreamTask(SStreamTask* pTask) {
walCloseReader
(
pTask
->
exec
.
pWalReader
);
walCloseReader
(
pTask
->
exec
.
pWalReader
);
}
}
taosArrayDestroyP
(
pTask
->
pUpstreamEpInfoList
,
taosMemoryFree
);
if
(
pTask
->
outputInfo
.
type
==
TASK_OUTPUT__TABLE
)
{
if
(
pTask
->
outputInfo
.
type
==
TASK_OUTPUT__TABLE
)
{
tDeleteSchemaWrapper
(
pTask
->
tbSink
.
pSchemaWrapper
);
tDeleteSchemaWrapper
(
pTask
->
tbSink
.
pSchemaWrapper
);
taosMemoryFree
(
pTask
->
tbSink
.
pTSchema
);
taosMemoryFree
(
pTask
->
tbSink
.
pTSchema
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录