From 1d98b32721c5de8caa474044ecf6bd5cb54a61d2 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Tue, 30 Jul 2024 10:47:46 +0800 Subject: [PATCH] fix:[TD-31097]process return value --- include/common/tmsg.h | 2 +- source/common/src/tmsg.c | 5 ++--- source/libs/executor/src/executor.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 782b9a072d..4eb64785df 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -3641,7 +3641,7 @@ int32_t tEncodeSTqOffsetVal(SEncoder* pEncoder, const STqOffsetVal* pOffsetVal); int32_t tDecodeSTqOffsetVal(SDecoder* pDecoder, STqOffsetVal* pOffsetVal); void tFormatOffset(char* buf, int32_t maxLen, const STqOffsetVal* pVal); bool tOffsetEqual(const STqOffsetVal* pLeft, const STqOffsetVal* pRight); -int32_t tOffsetCopy(STqOffsetVal* pLeft, const STqOffsetVal* pRight); +void tOffsetCopy(STqOffsetVal* pLeft, const STqOffsetVal* pRight); void tOffsetDestroy(void* pVal); typedef struct { diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 9e663d495c..4015701a29 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -9238,18 +9238,17 @@ bool tOffsetEqual(const STqOffsetVal *pLeft, const STqOffsetVal *pRight) { return false; } -int32_t tOffsetCopy(STqOffsetVal *pLeft, const STqOffsetVal *pRight) { +void tOffsetCopy(STqOffsetVal *pLeft, const STqOffsetVal *pRight) { tOffsetDestroy(pLeft); *pLeft = *pRight; if (IS_VAR_DATA_TYPE(pRight->primaryKey.type)) { pLeft->primaryKey.pData = taosMemoryMalloc(pRight->primaryKey.nData); if (pLeft->primaryKey.pData == NULL) { uError("failed to allocate memory for offset"); - return terrno; + return; } (void)memcpy(pLeft->primaryKey.pData, pRight->primaryKey.pData, pRight->primaryKey.nData); } - return 0; } void tOffsetDestroy(void *param) { diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index 75c335a6a8..3ee08d8fb0 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -1437,7 +1437,7 @@ int32_t qStreamPrepareScan(qTaskInfo_t tinfo, STqOffsetVal* pOffset, int8_t subT } end: - (void) tOffsetCopy(&pTaskInfo->streamInfo.currentOffset, pOffset); + tOffsetCopy(&pTaskInfo->streamInfo.currentOffset, pOffset); return 0; }