From b3e599733657447dcbeaa348b3bf5e72b2d132b4 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 8 Sep 2024 14:54:08 +0800 Subject: [PATCH 1/3] fix(stream): reset error code. --- include/libs/executor/executor.h | 2 ++ source/libs/executor/src/executor.c | 8 ++++++++ source/libs/stream/src/streamExec.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h index 09143dde29..ed56b7e6b2 100644 --- a/include/libs/executor/executor.h +++ b/include/libs/executor/executor.h @@ -166,6 +166,8 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds, bo int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pBlock, uint64_t* useconds); +void qResetTaskCode(qTaskInfo_t tinfo); + void qCleanExecTaskBlockBuf(qTaskInfo_t tinfo); /** diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index 62932513f4..dd6b746788 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -1633,3 +1633,11 @@ int32_t qStreamOperatorReloadState(qTaskInfo_t tInfo) { pTaskInfo->pRoot->fpSet.reloadStreamStateFn(pTaskInfo->pRoot); return 0; } + +void qResetTaskCode(qTaskInfo_t tinfo) { + SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)tinfo; + + int32_t code = pTaskInfo->code; + pTaskInfo->code = 0; + qDebug("%s reset task code to be success, prev:%s", pTaskInfo->id.taskId, tstrerror(code)); +} diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index 5bb9c993de..bf4567a273 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -244,9 +244,10 @@ static void streamScanHistoryDataImpl(SStreamTask* pTask, SArray* pRes, int32_t* SSDataBlock* output = NULL; uint64_t ts = 0; code = qExecTask(exec, &output, &ts); - if (code != TSDB_CODE_TSC_QUERY_KILLED && code != TSDB_CODE_SUCCESS) { + if (code != TSDB_CODE_TSC_QUERY_KILLED && code != TSDB_CODE_SUCCESS) { // if out of memory occurs, quit stError("s-task:%s scan-history data error occurred code:%s, continue scan-history", pTask->id.idStr, tstrerror(code)); + qResetTaskCode(exec); continue; } From 23ccbbdda5770d3b0f778db0ee4def1fccdb0b1b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 8 Sep 2024 15:10:54 +0800 Subject: [PATCH 2/3] fix(stream): fix syntax error. --- source/libs/executor/src/executor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index dd6b746788..496ce4e6fa 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -1639,5 +1639,5 @@ void qResetTaskCode(qTaskInfo_t tinfo) { int32_t code = pTaskInfo->code; pTaskInfo->code = 0; - qDebug("%s reset task code to be success, prev:%s", pTaskInfo->id.taskId, tstrerror(code)); + qDebug("0x%x reset task code to be success, prev:%s", pTaskInfo->id.taskId, tstrerror(code)); } From 199de2541085886c95942d5b0bb42b4e18f4b4ae Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 8 Sep 2024 15:17:08 +0800 Subject: [PATCH 3/3] fix(stream): fix syntax error. --- source/libs/executor/src/executor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index 496ce4e6fa..9e33a3d890 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -1639,5 +1639,5 @@ void qResetTaskCode(qTaskInfo_t tinfo) { int32_t code = pTaskInfo->code; pTaskInfo->code = 0; - qDebug("0x%x reset task code to be success, prev:%s", pTaskInfo->id.taskId, tstrerror(code)); + qDebug("0x%" PRIx64 " reset task code to be success, prev:%s", pTaskInfo->id.taskId, tstrerror(code)); }