From f8cab36045e53714aa82034a841b3331a3acef78 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 23 Sep 2024 14:02:29 +0800 Subject: [PATCH] enh: handle void --- include/common/tdataformat.h | 2 +- source/common/src/tdataformat.c | 36 ++++++++++++------------- source/dnode/vnode/src/tsdb/tsdbUtil2.c | 8 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h index 1179e710cd..d8a88d038d 100644 --- a/include/common/tdataformat.h +++ b/include/common/tdataformat.h @@ -116,7 +116,7 @@ typedef struct { int32_t tValueColumnInit(SValueColumn *valCol); int32_t tValueColumnDestroy(SValueColumn *valCol); -int32_t tValueColumnClear(SValueColumn *valCol); +void tValueColumnClear(SValueColumn *valCol); int32_t tValueColumnAppend(SValueColumn *valCol, const SValue *value); int32_t tValueColumnUpdate(SValueColumn *valCol, int32_t idx, const SValue *value); int32_t tValueColumnGet(SValueColumn *valCol, int32_t idx, SValue *value); diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 4b44e4af43..c3ee58d1bc 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -1704,7 +1704,7 @@ bool tTagGet(const STag *pTag, STagVal *pTagVal) { offset = pTag->idx[midx]; } - (void)tGetTagVal(p + offset, &tv, isJson); + int32_t nt = tGetTagVal(p + offset, &tv, isJson); if (isJson) { c = tTagValJsonCmprFn(pTagVal, &tv); } else { @@ -1754,7 +1754,7 @@ int32_t tTagToValArray(const STag *pTag, SArray **ppArray) { } else { offset = pTag->idx[iTag]; } - (void)tGetTagVal(p + offset, &tv, pTag->flags & TD_TAG_JSON); + int32_t nt = tGetTagVal(p + offset, &tv, pTag->flags & TD_TAG_JSON); if (taosArrayPush(*ppArray, &tv) == NULL) { code = terrno; goto _err; @@ -1784,7 +1784,7 @@ void tTagSetCid(const STag *pTag, int16_t iTag, int16_t cid) { offset = pTag->idx[iTag]; } - (void)tPutI16v(p + offset, cid); + int32_t nt = tPutI16v(p + offset, cid); } // STSchema ======================================== @@ -3352,16 +3352,16 @@ static int32_t tColDataCopyRowSingleCol(SColData *pFromColData, int32_t iFromRow SET_BIT1(pToColData->pBitMap, iToRow, GET_BIT1(pFromColData->pBitMap, iFromRow)); } break; case HAS_VALUE: { - (void)tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow); + TAOS_CHECK_RETURN(tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow)); } break; case (HAS_VALUE | HAS_NONE): case (HAS_VALUE | HAS_NULL): { SET_BIT1(pToColData->pBitMap, iToRow, GET_BIT1(pFromColData->pBitMap, iFromRow)); - (void)tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow); + TAOS_CHECK_RETURN(tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow)); } break; case (HAS_VALUE | HAS_NULL | HAS_NONE): { SET_BIT2(pToColData->pBitMap, iToRow, GET_BIT2(pFromColData->pBitMap, iFromRow)); - (void)tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow); + TAOS_CHECK_RETURN(tColDataCopyRowCell(pFromColData, iFromRow, pToColData, iToRow)); } break; default: return -1; @@ -3434,24 +3434,24 @@ static int32_t tColDataMergeSortMerge(SColData *aColData, int32_t start, int32_t tColDataArrGetRowKey(aColData, nColData, j, &keyj); while (i <= mid && j <= end) { if (tRowKeyCompare(&keyi, &keyj) <= 0) { - (void)tColDataCopyRowAppend(aColData, i++, aDstColData, nColData); + TAOS_CHECK_RETURN(tColDataCopyRowAppend(aColData, i++, aDstColData, nColData)); tColDataArrGetRowKey(aColData, nColData, i, &keyi); } else { - (void)tColDataCopyRowAppend(aColData, j++, aDstColData, nColData); + TAOS_CHECK_RETURN(tColDataCopyRowAppend(aColData, j++, aDstColData, nColData)); tColDataArrGetRowKey(aColData, nColData, j, &keyj); } } while (i <= mid) { - (void)tColDataCopyRowAppend(aColData, i++, aDstColData, nColData); + TAOS_CHECK_RETURN(tColDataCopyRowAppend(aColData, i++, aDstColData, nColData)); } while (j <= end) { - (void)tColDataCopyRowAppend(aColData, j++, aDstColData, nColData); + TAOS_CHECK_RETURN(tColDataCopyRowAppend(aColData, j++, aDstColData, nColData)); } for (i = start, k = 0; i <= end; ++i, ++k) { - (void)tColDataCopyRow(aDstColData, k, aColData, i, nColData); + TAOS_CHECK_RETURN(tColDataCopyRow(aDstColData, k, aColData, i, nColData)); } if (aDstColData) { @@ -3600,7 +3600,7 @@ int32_t tColDataSortMerge(SArray **arr) { // sort ------- if (doSort) { - (void)tColDataSort(aColData, nColData); + TAOS_CHECK_RETURN(tColDataSort(aColData, nColData)); } if (doMerge != 1) { @@ -4171,12 +4171,12 @@ int32_t tValueColumnDestroy(SValueColumn *valCol) { return 0; } -int32_t tValueColumnClear(SValueColumn *valCol) { +void tValueColumnClear(SValueColumn *valCol) { valCol->type = TSDB_DATA_TYPE_NULL; valCol->numOfValues = 0; tBufferClear(&valCol->data); tBufferClear(&valCol->offsets); - return 0; + return; } int32_t tValueColumnAppend(SValueColumn *valCol, const SValue *value) { @@ -4247,17 +4247,17 @@ int32_t tValueColumnGet(SValueColumn *valCol, int32_t idx, SValue *value) { int32_t offset, nextOffset; SBufferReader reader = BUFFER_READER_INITIALIZER(idx * sizeof(offset), &valCol->offsets); - (void)tBufferGetI32(&reader, &offset); + TAOS_CHECK_RETURN(tBufferGetI32(&reader, &offset)); if (idx == valCol->numOfValues - 1) { nextOffset = tBufferGetSize(&valCol->data); } else { - (void)tBufferGetI32(&reader, &nextOffset); + TAOS_CHECK_RETURN(tBufferGetI32(&reader, &nextOffset)); } value->nData = nextOffset - offset; value->pData = (uint8_t *)tBufferGetDataAt(&valCol->data, offset); } else { SBufferReader reader = BUFFER_READER_INITIALIZER(idx * tDataTypes[value->type].bytes, &valCol->data); - (void)tBufferGet(&reader, tDataTypes[value->type].bytes, &value->val); + TAOS_CHECK_RETURN(tBufferGet(&reader, tDataTypes[value->type].bytes, &value->val)); } return 0; } @@ -4309,7 +4309,7 @@ int32_t tValueColumnDecompress(void *input, const SValueColumnCompressInfo *info SBuffer *assist) { int32_t code; - (void)tValueColumnClear(valCol); + tValueColumnClear(valCol); valCol->type = info->type; // offset if (IS_VAR_DATA_TYPE(valCol->type)) { diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil2.c b/source/dnode/vnode/src/tsdb/tsdbUtil2.c index 4bccf7df13..cc9f8ce3ad 100644 --- a/source/dnode/vnode/src/tsdb/tsdbUtil2.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil2.c @@ -108,8 +108,8 @@ int32_t tStatisBlockClear(STbStatisBlock *statisBlock) { TAOS_UNUSED(tBufferClear(&statisBlock->buffers[i])); } for (int32_t i = 0; i < TD_MAX_PK_COLS; ++i) { - TAOS_UNUSED(tValueColumnClear(&statisBlock->firstKeyPKs[i])); - TAOS_UNUSED(tValueColumnClear(&statisBlock->lastKeyPKs[i])); + tValueColumnClear(&statisBlock->firstKeyPKs[i]); + tValueColumnClear(&statisBlock->lastKeyPKs[i]); } return 0; } @@ -267,8 +267,8 @@ void tBrinBlockClear(SBrinBlock *brinBlock) { TAOS_UNUSED(tBufferClear(&brinBlock->buffers[i])); } for (int32_t i = 0; i < TD_MAX_PK_COLS; ++i) { - TAOS_UNUSED(tValueColumnClear(&brinBlock->firstKeyPKs[i])); - TAOS_UNUSED(tValueColumnClear(&brinBlock->lastKeyPKs[i])); + tValueColumnClear(&brinBlock->firstKeyPKs[i]); + tValueColumnClear(&brinBlock->lastKeyPKs[i]); } }