Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
6298f17c
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
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看板
提交
6298f17c
编写于
7月 11, 2023
作者:
L
liuyao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
delete invalid code
上级
503d7540
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
0 addition
and
27 deletion
+0
-27
include/libs/executor/executor.h
include/libs/executor/executor.h
+0
-3
source/libs/executor/inc/querytask.h
source/libs/executor/inc/querytask.h
+0
-2
source/libs/executor/src/executor.c
source/libs/executor/src/executor.c
+0
-6
source/libs/executor/src/timewindowoperator.c
source/libs/executor/src/timewindowoperator.c
+0
-14
source/libs/stream/src/streamExec.c
source/libs/stream/src/streamExec.c
+0
-2
未找到文件。
include/libs/executor/executor.h
浏览文件 @
6298f17c
...
...
@@ -99,9 +99,6 @@ void qSetTaskId(qTaskInfo_t tinfo, uint64_t taskId, uint64_t queryId);
int32_t
qSetStreamOpOpen
(
qTaskInfo_t
tinfo
);
// todo refactor
void
qGetCheckpointVersion
(
qTaskInfo_t
tinfo
,
int64_t
*
dataVer
,
int64_t
*
ckId
);
/**
* Set multiple input data blocks for the stream scan.
* @param tinfo
...
...
source/libs/executor/inc/querytask.h
浏览文件 @
6298f17c
...
...
@@ -69,8 +69,6 @@ typedef struct {
SVersionRange
fillHistoryVer
;
STimeWindow
fillHistoryWindow
;
SStreamState
*
pState
;
int64_t
dataVersion
;
int64_t
checkPointId
;
}
SStreamTaskInfo
;
struct
SExecTaskInfo
{
...
...
source/libs/executor/src/executor.c
浏览文件 @
6298f17c
...
...
@@ -223,12 +223,6 @@ int32_t qSetStreamOpOpen(qTaskInfo_t tinfo) {
return
code
;
}
void
qGetCheckpointVersion
(
qTaskInfo_t
tinfo
,
int64_t
*
dataVer
,
int64_t
*
ckId
)
{
SExecTaskInfo
*
pTaskInfo
=
tinfo
;
*
dataVer
=
pTaskInfo
->
streamInfo
.
dataVersion
;
*
ckId
=
pTaskInfo
->
streamInfo
.
checkPointId
;
}
int32_t
qSetMultiStreamInput
(
qTaskInfo_t
tinfo
,
const
void
*
pBlocks
,
size_t
numOfBlocks
,
int32_t
type
)
{
if
(
tinfo
==
NULL
)
{
return
TSDB_CODE_APP_ERROR
;
...
...
source/libs/executor/src/timewindowoperator.c
浏览文件 @
6298f17c
...
...
@@ -2318,11 +2318,6 @@ static int32_t getNextQualifiedFinalWindow(SInterval* pInterval, STimeWindow* pN
return
startPos
;
}
static
void
setStreamDataVersion
(
SExecTaskInfo
*
pTaskInfo
,
int64_t
version
,
int64_t
ckId
)
{
pTaskInfo
->
streamInfo
.
dataVersion
=
version
;
pTaskInfo
->
streamInfo
.
checkPointId
=
ckId
;
}
static
void
doStreamIntervalAggImpl
(
SOperatorInfo
*
pOperatorInfo
,
SSDataBlock
*
pSDataBlock
,
uint64_t
groupId
,
SSHashObj
*
pUpdatedMap
)
{
SStreamIntervalOperatorInfo
*
pInfo
=
(
SStreamIntervalOperatorInfo
*
)
pOperatorInfo
->
info
;
...
...
@@ -2823,7 +2818,6 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
doStreamIntervalSaveCheckpoint
(
pOperator
);
pAPI
->
stateStore
.
streamStateCommit
(
pInfo
->
pState
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
pState
->
checkPointId
);
copyDataBlock
(
pInfo
->
pCheckpointRes
,
pBlock
);
pOperator
->
status
=
OP_RES_TO_RETURN
;
qDebug
(
"===stream===return data:%s. recv datablock num:%"
PRIu64
,
...
...
@@ -3086,7 +3080,6 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
if
(
res
==
TSDB_CODE_SUCCESS
)
{
doStreamIntervalDecodeOpState
(
buff
,
pOperator
);
taosMemoryFree
(
buff
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
pState
->
checkPointId
);
}
return
pOperator
;
...
...
@@ -3953,7 +3946,6 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
doStreamSessionSaveCheckpoint
(
pOperator
);
pAggSup
->
stateStore
.
streamStateCommit
(
pAggSup
->
pState
);
setStreamDataVersion
(
pOperator
->
pTaskInfo
,
pInfo
->
dataVersion
,
pAggSup
->
pState
->
checkPointId
);
copyDataBlock
(
pInfo
->
pCheckpointRes
,
pBlock
);
continue
;
}
else
{
...
...
@@ -4154,7 +4146,6 @@ SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPh
if
(
res
==
TSDB_CODE_SUCCESS
)
{
doStreamSessionDecodeOpState
(
buff
,
pOperator
);
taosMemoryFree
(
buff
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
streamAggSup
.
pState
->
checkPointId
);
}
setOperatorInfo
(
pOperator
,
"StreamSessionWindowAggOperator"
,
QUERY_NODE_PHYSICAL_PLAN_STREAM_SESSION
,
true
,
...
...
@@ -4256,7 +4247,6 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
doStreamSessionSaveCheckpoint
(
pOperator
);
pAggSup
->
stateStore
.
streamStateCommit
(
pAggSup
->
pState
);
setStreamDataVersion
(
pOperator
->
pTaskInfo
,
pInfo
->
dataVersion
,
pAggSup
->
pState
->
checkPointId
);
pOperator
->
status
=
OP_RES_TO_RETURN
;
continue
;
}
else
{
...
...
@@ -4681,7 +4671,6 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) {
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
doStreamSessionSaveCheckpoint
(
pOperator
);
pInfo
->
streamAggSup
.
stateStore
.
streamStateCommit
(
pInfo
->
streamAggSup
.
pState
);
setStreamDataVersion
(
pOperator
->
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
streamAggSup
.
pState
->
checkPointId
);
copyDataBlock
(
pInfo
->
pCheckpointRes
,
pBlock
);
continue
;
}
else
{
...
...
@@ -4878,7 +4867,6 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys
if
(
res
==
TSDB_CODE_SUCCESS
)
{
doStreamStateDecodeOpState
(
buff
,
pOperator
);
taosMemoryFree
(
buff
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
streamAggSup
.
pState
->
checkPointId
);
}
setOperatorInfo
(
pOperator
,
"StreamStateAggOperator"
,
QUERY_NODE_PHYSICAL_PLAN_STREAM_STATE
,
true
,
OP_NOT_OPENED
,
...
...
@@ -5548,7 +5536,6 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
}
else
if
(
pBlock
->
info
.
type
==
STREAM_CHECKPOINT
)
{
doStreamIntervalSaveCheckpoint
(
pOperator
);
pAPI
->
stateStore
.
streamStateCommit
(
pInfo
->
pState
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
pState
->
checkPointId
);
pInfo
->
reCkBlock
=
true
;
copyDataBlock
(
pInfo
->
pCheckpointRes
,
pBlock
);
qDebug
(
"===stream===return data:single interval. recv datablock num:%"
PRIu64
,
pInfo
->
numOfDatapack
);
...
...
@@ -5735,7 +5722,6 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhys
if
(
res
==
TSDB_CODE_SUCCESS
)
{
doStreamIntervalDecodeOpState
(
buff
,
pOperator
);
taosMemoryFree
(
buff
);
setStreamDataVersion
(
pTaskInfo
,
pInfo
->
dataVersion
,
pInfo
->
pState
->
checkPointId
);
}
initIntervalDownStream
(
downstream
,
pPhyNode
->
type
,
pInfo
);
...
...
source/libs/stream/src/streamExec.c
浏览文件 @
6298f17c
...
...
@@ -18,8 +18,6 @@
// maximum allowed processed block batches. One block may include several submit blocks
#define MAX_STREAM_RESULT_DUMP_THRESHOLD 100
static
int32_t
updateCheckPointInfo
(
SStreamTask
*
pTask
,
int64_t
checkpointId
);
bool
streamTaskShouldStop
(
const
SStreamStatus
*
pStatus
)
{
int32_t
status
=
atomic_load_8
((
int8_t
*
)
&
pStatus
->
taskStatus
);
return
(
status
==
TASK_STATUS__STOP
)
||
(
status
==
TASK_STATUS__DROPPING
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录