Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
97c44e7c
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
97c44e7c
编写于
7月 19, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: do some internal refactor.
上级
40411fcd
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
70 addition
and
71 deletion
+70
-71
include/libs/stream/tstream.h
include/libs/stream/tstream.h
+5
-7
source/dnode/mnode/impl/src/mndScheduler.c
source/dnode/mnode/impl/src/mndScheduler.c
+4
-4
source/dnode/snode/src/snode.c
source/dnode/snode/src/snode.c
+3
-3
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+5
-5
source/libs/stream/src/stream.c
source/libs/stream/src/stream.c
+9
-8
source/libs/stream/src/streamDispatch.c
source/libs/stream/src/streamDispatch.c
+16
-16
source/libs/stream/src/streamExec.c
source/libs/stream/src/streamExec.c
+1
-1
source/libs/stream/src/streamRecover.c
source/libs/stream/src/streamRecover.c
+10
-10
source/libs/stream/src/streamTask.c
source/libs/stream/src/streamTask.c
+17
-17
未找到文件。
include/libs/stream/tstream.h
浏览文件 @
97c44e7c
...
...
@@ -296,15 +296,15 @@ typedef struct SDispatchMsgInfo {
}
SDispatchMsgInfo
;
typedef
struct
{
int8_t
outputT
ype
;
int8_t
outputS
tatus
;
SStreamQueue
*
outputQ
ueue
;
}
S
S
TaskOutputInfo
;
int8_t
t
ype
;
int8_t
s
tatus
;
SStreamQueue
*
q
ueue
;
}
STaskOutputInfo
;
struct
SStreamTask
{
SStreamId
id
;
SSTaskBasicInfo
info
;
int8_t
outputType
;
STaskOutputInfo
outputInfo
;
SDispatchMsgInfo
msgInfo
;
SStreamStatus
status
;
SCheckpointInfo
chkInfo
;
...
...
@@ -326,9 +326,7 @@ struct SStreamTask {
};
int8_t
inputStatus
;
int8_t
outputStatus
;
SStreamQueue
*
inputQueue
;
SStreamQueue
*
outputQueue
;
// trigger
int8_t
triggerStatus
;
...
...
source/dnode/mnode/impl/src/mndScheduler.c
浏览文件 @
97c44e7c
...
...
@@ -87,10 +87,10 @@ END:
int32_t
mndSetSinkTaskInfo
(
SStreamObj
*
pStream
,
SStreamTask
*
pTask
)
{
if
(
pStream
->
smaId
!=
0
)
{
pTask
->
output
T
ype
=
TASK_OUTPUT__SMA
;
pTask
->
output
Info
.
t
ype
=
TASK_OUTPUT__SMA
;
pTask
->
smaSink
.
smaId
=
pStream
->
smaId
;
}
else
{
pTask
->
output
T
ype
=
TASK_OUTPUT__TABLE
;
pTask
->
output
Info
.
t
ype
=
TASK_OUTPUT__TABLE
;
pTask
->
tbSink
.
stbUid
=
pStream
->
targetStbUid
;
memcpy
(
pTask
->
tbSink
.
stbFullName
,
pStream
->
targetSTbName
,
TSDB_TABLE_FNAME_LEN
);
pTask
->
tbSink
.
pSchemaWrapper
=
tCloneSSchemaWrapper
(
&
pStream
->
outputSchema
);
...
...
@@ -110,7 +110,7 @@ int32_t mndAddDispatcherForInternalTask(SMnode* pMnode, SStreamObj* pStream, SAr
SDbObj
*
pDb
=
mndAcquireDb
(
pMnode
,
pStream
->
targetDb
);
if
(
pDb
!=
NULL
&&
pDb
->
cfg
.
numOfVgroups
>
1
)
{
isShuffle
=
true
;
pTask
->
output
T
ype
=
TASK_OUTPUT__SHUFFLE_DISPATCH
;
pTask
->
output
Info
.
t
ype
=
TASK_OUTPUT__SHUFFLE_DISPATCH
;
pTask
->
msgInfo
.
msgType
=
TDMT_STREAM_TASK_DISPATCH
;
if
(
mndExtractDbInfo
(
pMnode
,
pDb
,
&
pTask
->
shuffleDispatcher
.
dbInfo
,
NULL
)
<
0
)
{
return
-
1
;
...
...
@@ -291,7 +291,7 @@ void setFixedDownstreamEpInfo(SStreamTask* pDstTask, const SStreamTask* pTask) {
pDispatcher
->
nodeId
=
pTask
->
info
.
nodeId
;
pDispatcher
->
epSet
=
pTask
->
info
.
epSet
;
pDstTask
->
output
T
ype
=
TASK_OUTPUT__FIXED_DISPATCH
;
pDstTask
->
output
Info
.
t
ype
=
TASK_OUTPUT__FIXED_DISPATCH
;
pDstTask
->
msgInfo
.
msgType
=
TDMT_STREAM_TASK_DISPATCH
;
}
...
...
source/dnode/snode/src/snode.c
浏览文件 @
97c44e7c
...
...
@@ -66,14 +66,14 @@ int32_t sndExpandTask(SSnode *pSnode, SStreamTask *pTask, int64_t ver) {
pTask
->
status
.
schedStatus
=
TASK_SCHED_STATUS__INACTIVE
;
pTask
->
inputQueue
=
streamQueueOpen
(
512
<<
10
);
pTask
->
output
Q
ueue
=
streamQueueOpen
(
512
<<
10
);
pTask
->
output
Info
.
q
ueue
=
streamQueueOpen
(
512
<<
10
);
if
(
pTask
->
inputQueue
==
NULL
||
pTask
->
output
Q
ueue
==
NULL
)
{
if
(
pTask
->
inputQueue
==
NULL
||
pTask
->
output
Info
.
q
ueue
==
NULL
)
{
return
-
1
;
}
pTask
->
inputStatus
=
TASK_INPUT_STATUS__NORMAL
;
pTask
->
output
S
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
pTask
->
output
Info
.
s
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
pTask
->
pMsgCb
=
&
pSnode
->
msgCb
;
pTask
->
chkInfo
.
version
=
ver
;
pTask
->
pMeta
=
pSnode
->
pMeta
;
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
97c44e7c
...
...
@@ -811,14 +811,14 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int64_t ver) {
pTask
->
refCnt
=
1
;
pTask
->
status
.
schedStatus
=
TASK_SCHED_STATUS__INACTIVE
;
pTask
->
inputQueue
=
streamQueueOpen
(
512
<<
10
);
pTask
->
output
Q
ueue
=
streamQueueOpen
(
512
<<
10
);
pTask
->
output
Info
.
q
ueue
=
streamQueueOpen
(
512
<<
10
);
if
(
pTask
->
inputQueue
==
NULL
||
pTask
->
output
Q
ueue
==
NULL
)
{
if
(
pTask
->
inputQueue
==
NULL
||
pTask
->
output
Info
.
q
ueue
==
NULL
)
{
return
-
1
;
}
pTask
->
inputStatus
=
TASK_INPUT_STATUS__NORMAL
;
pTask
->
output
S
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
pTask
->
output
Info
.
s
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
pTask
->
pMsgCb
=
&
pTq
->
pVnode
->
msgCb
;
pTask
->
pMeta
=
pTq
->
pStreamMeta
;
...
...
@@ -885,10 +885,10 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int64_t ver) {
}
// sink
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SMA
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SMA
)
{
pTask
->
smaSink
.
vnode
=
pTq
->
pVnode
;
pTask
->
smaSink
.
smaSink
=
smaHandleRes
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__TABLE
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__TABLE
)
{
pTask
->
tbSink
.
vnode
=
pTq
->
pVnode
;
pTask
->
tbSink
.
tbSinkFunc
=
tqSinkToTablePipeline
;
...
...
source/libs/stream/src/stream.c
浏览文件 @
97c44e7c
...
...
@@ -216,15 +216,16 @@ int32_t streamTaskEnqueueRetrieve(SStreamTask* pTask, SStreamRetrieveReq* pReq,
// todo add log
int32_t
streamTaskOutputResultBlock
(
SStreamTask
*
pTask
,
SStreamDataBlock
*
pBlock
)
{
int32_t
code
=
0
;
if
(
pTask
->
outputType
==
TASK_OUTPUT__TABLE
)
{
int32_t
type
=
pTask
->
outputInfo
.
type
;
if
(
type
==
TASK_OUTPUT__TABLE
)
{
pTask
->
tbSink
.
tbSinkFunc
(
pTask
,
pTask
->
tbSink
.
vnode
,
0
,
pBlock
->
blocks
);
destroyStreamDataBlock
(
pBlock
);
}
else
if
(
pTask
->
outputT
ype
==
TASK_OUTPUT__SMA
)
{
}
else
if
(
t
ype
==
TASK_OUTPUT__SMA
)
{
pTask
->
smaSink
.
smaSink
(
pTask
->
smaSink
.
vnode
,
pTask
->
smaSink
.
smaId
,
pBlock
->
blocks
);
destroyStreamDataBlock
(
pBlock
);
}
else
{
ASSERT
(
pTask
->
outputType
==
TASK_OUTPUT__FIXED_DISPATCH
||
pTask
->
outputT
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
);
code
=
taosWriteQitem
(
pTask
->
output
Q
ueue
->
queue
,
pBlock
);
ASSERT
(
type
==
TASK_OUTPUT__FIXED_DISPATCH
||
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
);
code
=
taosWriteQitem
(
pTask
->
output
Info
.
q
ueue
->
queue
,
pBlock
);
if
(
code
!=
0
)
{
// todo failed to add it into the output queue, free it.
return
code
;
}
...
...
@@ -274,7 +275,7 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp, i
qDebug
(
"s-task:%s receive dispatch rsp, output status:%d code:%d"
,
pTask
->
id
.
idStr
,
pRsp
->
inputStatus
,
code
);
// there are other dispatch message not response yet
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
int32_t
leftRsp
=
atomic_sub_fetch_32
(
&
pTask
->
shuffleDispatcher
.
waitingRspCnt
,
1
);
qDebug
(
"s-task:%s is shuffle, left waiting rsp %d"
,
pTask
->
id
.
idStr
,
leftRsp
);
if
(
leftRsp
>
0
)
{
...
...
@@ -283,9 +284,9 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp, i
}
pTask
->
msgInfo
.
retryCount
=
0
;
ASSERT
(
pTask
->
output
S
tatus
==
TASK_OUTPUT_STATUS__WAIT
);
ASSERT
(
pTask
->
output
Info
.
s
tatus
==
TASK_OUTPUT_STATUS__WAIT
);
qDebug
(
"s-task:%s output status is set to:%d"
,
pTask
->
id
.
idStr
,
pTask
->
output
S
tatus
);
qDebug
(
"s-task:%s output status is set to:%d"
,
pTask
->
id
.
idStr
,
pTask
->
output
Info
.
s
tatus
);
// the input queue of the (down stream) task that receive the output data is full,
// so the TASK_INPUT_STATUS_BLOCKED is rsp
...
...
@@ -309,7 +310,7 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp, i
}
// now ready for next data output
atomic_store_8
(
&
pTask
->
output
S
tatus
,
TASK_OUTPUT_STATUS__NORMAL
);
atomic_store_8
(
&
pTask
->
output
Info
.
s
tatus
,
TASK_OUTPUT_STATUS__NORMAL
);
// otherwise, continue dispatch the first block to down stream task in pipeline
streamDispatchStreamBlock
(
pTask
);
...
...
source/libs/stream/src/streamDispatch.c
浏览文件 @
97c44e7c
...
...
@@ -437,7 +437,7 @@ int32_t streamDispatchAllBlocks(SStreamTask* pTask, const SStreamDataBlock* pDat
int32_t
numOfBlocks
=
taosArrayGetSize
(
pData
->
blocks
);
ASSERT
(
numOfBlocks
!=
0
);
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
SStreamDispatchReq
req
=
{
0
};
int32_t
downstreamTaskId
=
pTask
->
fixedEpDispatcher
.
taskId
;
...
...
@@ -467,7 +467,7 @@ int32_t streamDispatchAllBlocks(SStreamTask* pTask, const SStreamDataBlock* pDat
taosArrayDestroyP
(
req
.
data
,
taosMemoryFree
);
taosArrayDestroy
(
req
.
dataLen
);
return
code
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
int32_t
rspCnt
=
atomic_load_32
(
&
pTask
->
shuffleDispatcher
.
waitingRspCnt
);
ASSERT
(
rspCnt
==
0
);
...
...
@@ -545,7 +545,7 @@ int32_t streamDispatchAllBlocks(SStreamTask* pTask, const SStreamDataBlock* pDat
static
void
doRetryDispatchData
(
void
*
param
,
void
*
tmrId
)
{
SStreamTask
*
pTask
=
param
;
ASSERT
(
pTask
->
output
S
tatus
==
TASK_OUTPUT_STATUS__WAIT
);
ASSERT
(
pTask
->
output
Info
.
s
tatus
==
TASK_OUTPUT_STATUS__WAIT
);
int32_t
code
=
streamDispatchAllBlocks
(
pTask
,
pTask
->
msgInfo
.
pData
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
...
@@ -561,29 +561,29 @@ void streamRetryDispatchStreamBlock(SStreamTask* pTask, int64_t waitDuration) {
}
int32_t
streamDispatchStreamBlock
(
SStreamTask
*
pTask
)
{
ASSERT
((
pTask
->
outputType
==
TASK_OUTPUT__FIXED_DISPATCH
||
pTask
->
outputType
==
TASK_OUTPUT__SHUFFLE_DISPATCH
));
STaskOutputInfo
*
pInfo
=
&
pTask
->
outputInfo
;
ASSERT
((
pInfo
->
type
==
TASK_OUTPUT__FIXED_DISPATCH
||
pInfo
->
type
==
TASK_OUTPUT__SHUFFLE_DISPATCH
));
int32_t
numOfElems
=
taosQueueItemSize
(
p
Task
->
outputQ
ueue
->
queue
);
int32_t
numOfElems
=
taosQueueItemSize
(
p
Info
->
q
ueue
->
queue
);
if
(
numOfElems
>
0
)
{
qDebug
(
"s-task:%s try to dispatch intermediate result block to downstream, elem in outputQ:%d"
,
pTask
->
id
.
idStr
,
numOfElems
);
}
// to make sure only one dispatch is running
int8_t
old
=
atomic_val_compare_exchange_8
(
&
pTask
->
outputStatus
,
TASK_OUTPUT_STATUS__NORMAL
,
TASK_OUTPUT_STATUS__WAIT
);
int8_t
old
=
atomic_val_compare_exchange_8
(
&
pInfo
->
status
,
TASK_OUTPUT_STATUS__NORMAL
,
TASK_OUTPUT_STATUS__WAIT
);
if
(
old
!=
TASK_OUTPUT_STATUS__NORMAL
)
{
qDebug
(
"s-task:%s wait for dispatch rsp, not dispatch now, output status:%d"
,
pTask
->
id
.
idStr
,
old
);
return
0
;
}
ASSERT
(
pTask
->
msgInfo
.
pData
==
NULL
);
qDebug
(
"s-task:%s start to dispatch msg, set output status:%d"
,
pTask
->
id
.
idStr
,
p
Task
->
outputS
tatus
);
qDebug
(
"s-task:%s start to dispatch msg, set output status:%d"
,
pTask
->
id
.
idStr
,
p
Info
->
s
tatus
);
SStreamDataBlock
*
pBlock
=
streamQueueNextItem
(
p
Task
->
outputQ
ueue
);
SStreamDataBlock
*
pBlock
=
streamQueueNextItem
(
p
Info
->
q
ueue
);
if
(
pBlock
==
NULL
)
{
atomic_store_8
(
&
p
Task
->
outputS
tatus
,
TASK_OUTPUT_STATUS__NORMAL
);
qDebug
(
"s-task:%s not dispatch since no elems in outputQ, output status:%d"
,
pTask
->
id
.
idStr
,
p
Task
->
outputS
tatus
);
atomic_store_8
(
&
p
Info
->
s
tatus
,
TASK_OUTPUT_STATUS__NORMAL
);
qDebug
(
"s-task:%s not dispatch since no elems in outputQ, output status:%d"
,
pTask
->
id
.
idStr
,
p
Info
->
s
tatus
);
return
0
;
}
...
...
@@ -599,19 +599,19 @@ int32_t streamDispatchStreamBlock(SStreamTask* pTask) {
}
qDebug
(
"s-task:%s failed to dispatch msg to downstream, code:%s, output status:%d, retry cnt:%d"
,
pTask
->
id
.
idStr
,
tstrerror
(
terrno
),
p
Task
->
outputS
tatus
,
retryCount
);
tstrerror
(
terrno
),
p
Info
->
s
tatus
,
retryCount
);
// todo deal with only partially success dispatch case
atomic_store_32
(
&
pTask
->
shuffleDispatcher
.
waitingRspCnt
,
0
);
if
(
terrno
==
TSDB_CODE_APP_IS_STOPPING
)
{
// in case of this error, do not retry anymore
if
(
terrno
==
TSDB_CODE_APP_IS_STOPPING
)
{
// in case of this error, do not retry anymore
destroyStreamDataBlock
(
pTask
->
msgInfo
.
pData
);
pTask
->
msgInfo
.
pData
=
NULL
;
return
code
;
}
if
(
++
retryCount
>
MAX_CONTINUE_RETRY_COUNT
)
{
// add to timer to retry
qDebug
(
"s-task:%s failed to dispatch msg to downstream for %d times, code:%s, add timer to retry in %dms"
,
pTask
->
id
.
idStr
,
retryCount
,
tstrerror
(
terrno
),
DISPATCH_RETRY_INTERVAL_MS
);
if
(
++
retryCount
>
MAX_CONTINUE_RETRY_COUNT
)
{
// add to timer to retry
qDebug
(
"s-task:%s failed to dispatch msg to downstream for %d times, code:%s, add timer to retry in %dms"
,
pTask
->
id
.
idStr
,
retryCount
,
tstrerror
(
terrno
),
DISPATCH_RETRY_INTERVAL_MS
);
streamRetryDispatchStreamBlock
(
pTask
,
DISPATCH_RETRY_INTERVAL_MS
);
break
;
}
...
...
source/libs/stream/src/streamExec.c
浏览文件 @
97c44e7c
...
...
@@ -561,7 +561,7 @@ bool streamTaskIsIdle(const SStreamTask* pTask) {
}
// blocked by downstream task
if
(
pTask
->
output
S
tatus
==
TASK_OUTPUT_STATUS__BLOCKED
)
{
if
(
pTask
->
output
Info
.
s
tatus
==
TASK_OUTPUT_STATUS__BLOCKED
)
{
return
false
;
}
...
...
source/libs/stream/src/streamRecover.c
浏览文件 @
97c44e7c
...
...
@@ -96,7 +96,7 @@ int32_t streamTaskCheckDownstreamTasks(SStreamTask* pTask) {
};
// serialize
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
req
.
reqId
=
tGenIdPI64
();
req
.
downstreamNodeId
=
pTask
->
fixedEpDispatcher
.
nodeId
;
req
.
downstreamTaskId
=
pTask
->
fixedEpDispatcher
.
taskId
;
...
...
@@ -108,7 +108,7 @@ int32_t streamTaskCheckDownstreamTasks(SStreamTask* pTask) {
pWindow
->
skey
,
pWindow
->
ekey
,
req
.
reqId
);
streamDispatchCheckMsg
(
pTask
,
&
req
,
pTask
->
fixedEpDispatcher
.
nodeId
,
&
pTask
->
fixedEpDispatcher
.
epSet
);
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
SArray
*
vgInfo
=
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
;
int32_t
numOfVgs
=
taosArrayGetSize
(
vgInfo
);
...
...
@@ -153,9 +153,9 @@ int32_t streamRecheckDownstream(SStreamTask* pTask, const SStreamTaskCheckRsp* p
qDebug
(
"s-task:%s (vgId:%d) check downstream task:0x%x (vgId:%d) (recheck)"
,
pTask
->
id
.
idStr
,
pTask
->
info
.
nodeId
,
req
.
downstreamTaskId
,
req
.
downstreamNodeId
);
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
streamDispatchCheckMsg
(
pTask
,
&
req
,
pRsp
->
downstreamNodeId
,
&
pTask
->
fixedEpDispatcher
.
epSet
);
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
SArray
*
vgInfo
=
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
;
int32_t
numOfVgs
=
taosArrayGetSize
(
vgInfo
);
...
...
@@ -179,7 +179,7 @@ int32_t streamProcessCheckRsp(SStreamTask* pTask, const SStreamTaskCheckRsp* pRs
const
char
*
id
=
pTask
->
id
.
idStr
;
if
(
pRsp
->
status
==
1
)
{
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
bool
found
=
false
;
int32_t
numOfReqs
=
taosArrayGetSize
(
pTask
->
checkReqIds
);
...
...
@@ -218,7 +218,7 @@ int32_t streamProcessCheckRsp(SStreamTask* pTask, const SStreamTaskCheckRsp* pRs
pRsp
->
upstreamNodeId
,
pRsp
->
downstreamTaskId
,
pRsp
->
downstreamNodeId
,
pRsp
->
status
,
total
,
left
);
}
}
else
{
ASSERT
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
);
ASSERT
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
);
if
(
pRsp
->
reqId
!=
pTask
->
checkReqId
)
{
return
-
1
;
}
...
...
@@ -296,10 +296,10 @@ int32_t streamDispatchScanHistoryFinishMsg(SStreamTask* pTask) {
SStreamScanHistoryFinishReq
req
=
{
.
streamId
=
pTask
->
id
.
streamId
,
.
childId
=
pTask
->
info
.
selfChildId
};
// serialize
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
req
.
taskId
=
pTask
->
fixedEpDispatcher
.
taskId
;
streamDoDispatchScanHistoryFinishMsg
(
pTask
,
&
req
,
pTask
->
fixedEpDispatcher
.
nodeId
,
&
pTask
->
fixedEpDispatcher
.
epSet
);
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
SArray
*
vgInfo
=
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
;
int32_t
numOfVgs
=
taosArrayGetSize
(
vgInfo
);
...
...
@@ -362,10 +362,10 @@ int32_t streamDispatchTransferStateMsg(SStreamTask* pTask) {
SStreamTransferReq
req
=
{
.
streamId
=
pTask
->
id
.
streamId
,
.
childId
=
pTask
->
info
.
selfChildId
};
// serialize
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
req
.
taskId
=
pTask
->
fixedEpDispatcher
.
taskId
;
doDispatchTransferMsg
(
pTask
,
&
req
,
pTask
->
fixedEpDispatcher
.
nodeId
,
&
pTask
->
fixedEpDispatcher
.
epSet
);
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
SArray
*
vgInfo
=
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
;
int32_t
numOfVgs
=
taosArrayGetSize
(
vgInfo
);
...
...
source/libs/stream/src/streamTask.c
浏览文件 @
97c44e7c
...
...
@@ -44,7 +44,7 @@ SStreamTask* tNewStreamTask(int64_t streamId, int8_t taskLevel, int8_t fillHisto
pTask
->
status
.
schedStatus
=
TASK_SCHED_STATUS__INACTIVE
;
pTask
->
status
.
taskStatus
=
TASK_STATUS__SCAN_HISTORY
;
pTask
->
inputStatus
=
TASK_INPUT_STATUS__NORMAL
;
pTask
->
output
S
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
pTask
->
output
Info
.
s
tatus
=
TASK_OUTPUT_STATUS__NORMAL
;
addToTaskset
(
pTaskList
,
pTask
);
return
pTask
;
...
...
@@ -74,7 +74,7 @@ int32_t tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask) {
if
(
tEncodeI32
(
pEncoder
,
pTask
->
id
.
taskId
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
pEncoder
,
pTask
->
info
.
totalLevel
)
<
0
)
return
-
1
;
if
(
tEncodeI8
(
pEncoder
,
pTask
->
info
.
taskLevel
)
<
0
)
return
-
1
;
if
(
tEncodeI8
(
pEncoder
,
pTask
->
output
T
ype
)
<
0
)
return
-
1
;
if
(
tEncodeI8
(
pEncoder
,
pTask
->
output
Info
.
t
ype
)
<
0
)
return
-
1
;
if
(
tEncodeI16
(
pEncoder
,
pTask
->
msgInfo
.
msgType
)
<
0
)
return
-
1
;
if
(
tEncodeI8
(
pEncoder
,
pTask
->
status
.
taskStatus
)
<
0
)
return
-
1
;
...
...
@@ -109,19 +109,19 @@ int32_t tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask) {
if
(
tEncodeCStr
(
pEncoder
,
pTask
->
exec
.
qmsg
)
<
0
)
return
-
1
;
}
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__TABLE
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__TABLE
)
{
if
(
tEncodeI64
(
pEncoder
,
pTask
->
tbSink
.
stbUid
)
<
0
)
return
-
1
;
if
(
tEncodeCStr
(
pEncoder
,
pTask
->
tbSink
.
stbFullName
)
<
0
)
return
-
1
;
if
(
tEncodeSSchemaWrapper
(
pEncoder
,
pTask
->
tbSink
.
pSchemaWrapper
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SMA
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SMA
)
{
if
(
tEncodeI64
(
pEncoder
,
pTask
->
smaSink
.
smaId
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FETCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FETCH
)
{
if
(
tEncodeI8
(
pEncoder
,
pTask
->
fetchSink
.
reserved
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
tEncodeI32
(
pEncoder
,
pTask
->
fixedEpDispatcher
.
taskId
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
pEncoder
,
pTask
->
fixedEpDispatcher
.
nodeId
)
<
0
)
return
-
1
;
if
(
tEncodeSEpSet
(
pEncoder
,
&
pTask
->
fixedEpDispatcher
.
epSet
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
if
(
tSerializeSUseDbRspImp
(
pEncoder
,
&
pTask
->
shuffleDispatcher
.
dbInfo
)
<
0
)
return
-
1
;
if
(
tEncodeCStr
(
pEncoder
,
pTask
->
shuffleDispatcher
.
stbFullName
)
<
0
)
return
-
1
;
}
...
...
@@ -137,7 +137,7 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
if
(
tDecodeI32
(
pDecoder
,
&
pTask
->
id
.
taskId
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
pDecoder
,
&
pTask
->
info
.
totalLevel
)
<
0
)
return
-
1
;
if
(
tDecodeI8
(
pDecoder
,
&
pTask
->
info
.
taskLevel
)
<
0
)
return
-
1
;
if
(
tDecodeI8
(
pDecoder
,
&
pTask
->
output
T
ype
)
<
0
)
return
-
1
;
if
(
tDecodeI8
(
pDecoder
,
&
pTask
->
output
Info
.
t
ype
)
<
0
)
return
-
1
;
if
(
tDecodeI16
(
pDecoder
,
&
pTask
->
msgInfo
.
msgType
)
<
0
)
return
-
1
;
if
(
tDecodeI8
(
pDecoder
,
&
pTask
->
status
.
taskStatus
)
<
0
)
return
-
1
;
...
...
@@ -179,21 +179,21 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
if
(
tDecodeCStrAlloc
(
pDecoder
,
&
pTask
->
exec
.
qmsg
)
<
0
)
return
-
1
;
}
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__TABLE
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__TABLE
)
{
if
(
tDecodeI64
(
pDecoder
,
&
pTask
->
tbSink
.
stbUid
)
<
0
)
return
-
1
;
if
(
tDecodeCStrTo
(
pDecoder
,
pTask
->
tbSink
.
stbFullName
)
<
0
)
return
-
1
;
pTask
->
tbSink
.
pSchemaWrapper
=
taosMemoryCalloc
(
1
,
sizeof
(
SSchemaWrapper
));
if
(
pTask
->
tbSink
.
pSchemaWrapper
==
NULL
)
return
-
1
;
if
(
tDecodeSSchemaWrapper
(
pDecoder
,
pTask
->
tbSink
.
pSchemaWrapper
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SMA
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SMA
)
{
if
(
tDecodeI64
(
pDecoder
,
&
pTask
->
smaSink
.
smaId
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FETCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FETCH
)
{
if
(
tDecodeI8
(
pDecoder
,
&
pTask
->
fetchSink
.
reserved
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__FIXED_DISPATCH
)
{
if
(
tDecodeI32
(
pDecoder
,
&
pTask
->
fixedEpDispatcher
.
taskId
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
pDecoder
,
&
pTask
->
fixedEpDispatcher
.
nodeId
)
<
0
)
return
-
1
;
if
(
tDecodeSEpSet
(
pDecoder
,
&
pTask
->
fixedEpDispatcher
.
epSet
)
<
0
)
return
-
1
;
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
if
(
tDeserializeSUseDbRspImp
(
pDecoder
,
&
pTask
->
shuffleDispatcher
.
dbInfo
)
<
0
)
return
-
1
;
if
(
tDecodeCStrTo
(
pDecoder
,
pTask
->
shuffleDispatcher
.
stbFullName
)
<
0
)
return
-
1
;
}
...
...
@@ -211,8 +211,8 @@ void tFreeStreamTask(SStreamTask* pTask) {
streamQueueClose
(
pTask
->
inputQueue
);
}
if
(
pTask
->
output
Q
ueue
)
{
streamQueueClose
(
pTask
->
output
Q
ueue
);
if
(
pTask
->
output
Info
.
q
ueue
)
{
streamQueueClose
(
pTask
->
output
Info
.
q
ueue
);
}
if
(
pTask
->
exec
.
qmsg
)
{
...
...
@@ -229,11 +229,11 @@ void tFreeStreamTask(SStreamTask* pTask) {
}
taosArrayDestroyP
(
pTask
->
pUpstreamEpInfoList
,
taosMemoryFree
);
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__TABLE
)
{
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__TABLE
)
{
tDeleteSchemaWrapper
(
pTask
->
tbSink
.
pSchemaWrapper
);
taosMemoryFree
(
pTask
->
tbSink
.
pTSchema
);
tSimpleHashCleanup
(
pTask
->
tbSink
.
pTblInfo
);
}
else
if
(
pTask
->
output
T
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
}
else
if
(
pTask
->
output
Info
.
t
ype
==
TASK_OUTPUT__SHUFFLE_DISPATCH
)
{
taosArrayDestroy
(
pTask
->
shuffleDispatcher
.
dbInfo
.
pVgroupInfos
);
taosArrayDestroy
(
pTask
->
checkReqIds
);
pTask
->
checkReqIds
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录