From 6298f17c45921aaaf8c34b71eb2b4d95d8da0170 Mon Sep 17 00:00:00 2001 From: liuyao <54liuyao@163.com> Date: Tue, 11 Jul 2023 19:21:27 +0800 Subject: [PATCH] delete invalid code --- include/libs/executor/executor.h | 3 --- source/libs/executor/inc/querytask.h | 2 -- source/libs/executor/src/executor.c | 6 ------ source/libs/executor/src/timewindowoperator.c | 14 -------------- source/libs/stream/src/streamExec.c | 2 -- 5 files changed, 27 deletions(-) diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h index 3bef15f3a7..fe98007109 100644 --- a/include/libs/executor/executor.h +++ b/include/libs/executor/executor.h @@ -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 diff --git a/source/libs/executor/inc/querytask.h b/source/libs/executor/inc/querytask.h index cdf37bcc6b..0d7c3925af 100644 --- a/source/libs/executor/inc/querytask.h +++ b/source/libs/executor/inc/querytask.h @@ -69,8 +69,6 @@ typedef struct { SVersionRange fillHistoryVer; STimeWindow fillHistoryWindow; SStreamState* pState; - int64_t dataVersion; - int64_t checkPointId; } SStreamTaskInfo; struct SExecTaskInfo { diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index 531be3ea62..f3d4882f00 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -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; diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index fd04bdac04..7d90c7e644 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -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); diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index d4b6f0927d..73e4c00627 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -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);