From 086b2d58c28979ead07ed98a60350d255121d498 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 28 Nov 2022 16:41:35 +0800 Subject: [PATCH] refact more code --- source/dnode/vnode/src/tsdb/tsdbUtil.c | 147 ------------------------- 1 file changed, 147 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c index 120e9193b8..8770981022 100644 --- a/source/dnode/vnode/src/tsdb/tsdbUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c @@ -1073,153 +1073,6 @@ _exit: return code; } -// static int32_t tBlockDataAppendTPRow(SBlockData *pBlockData, STSRow *pRow, STSchema *pTSchema) { -// int32_t code = 0; - -// int32_t iTColumn = 1; -// STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; -// void *pBitmap = pRow->statis ? tdGetBitmapAddrTp(pRow, pTSchema->flen) : NULL; - -// for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) { -// SColData *pColData = &((SColData *)pBlockData->aColData->pData)[iColData]; - -// while (pTColumn && pTColumn->colId < pColData->cid) { -// iTColumn++; -// pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; -// } - -// if (pTColumn == NULL || pTColumn->colId > pColData->cid) { -// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else { -// ASSERT(pTColumn->type == pColData->type); - -// SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type}; - -// if (pRow->statis) { -// TDRowValT vt = TD_VTYPE_MAX; -// tdGetBitmapValTypeII(pBitmap, iTColumn - 1, &vt); - -// if (vt == TD_VTYPE_NORM) { -// cv.flag = CV_FLAG_VALUE; - -// if (IS_VAR_DATA_TYPE(pTColumn->type)) { -// void *pData = (char *)pRow + *(int32_t *)(pRow->data + pTColumn->offset); -// cv.value.nData = varDataLen(pData); -// cv.value.pData = varDataVal(pData); -// } else { -// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pTColumn->bytes); -// } - -// code = tColDataAppendValue(pColData, &cv); -// if (code) goto _exit; -// } else if (vt == TD_VTYPE_NONE) { -// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else if (vt == TD_VTYPE_NULL) { -// code = tColDataAppendValue(pColData, &COL_VAL_NULL(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else { -// ASSERT(0); -// } -// } else { -// cv.flag = CV_FLAG_VALUE; - -// if (IS_VAR_DATA_TYPE(pTColumn->type)) { -// void *pData = (char *)pRow + *(int32_t *)(pRow->data + pTColumn->offset); -// cv.value.nData = varDataLen(pData); -// cv.value.pData = varDataVal(pData); -// } else { -// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pTColumn->bytes); -// } - -// code = tColDataAppendValue(pColData, &cv); -// if (code) goto _exit; -// } - -// iTColumn++; -// pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; -// } -// } - -// _exit: -// return code; -// } - -// static int32_t tBlockDataAppendKVRow(SBlockData *pBlockData, STSRow *pRow, STSchema *pTSchema) { -// int32_t code = 0; - -// col_id_t kvIter = 0; -// col_id_t nKvCols = tdRowGetNCols(pRow) - 1; -// void *pColIdx = TD_ROW_COL_IDX(pRow); -// void *pBitmap = tdGetBitmapAddrKv(pRow, tdRowGetNCols(pRow)); -// int32_t iTColumn = 1; -// STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; - -// for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) { -// SColData *pColData = &((SColData *)pBlockData->aColData->pData)[iColData]; - -// while (pTColumn && pTColumn->colId < pColData->cid) { -// iTColumn++; -// pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; -// } - -// if (pTColumn == NULL || pTColumn->colId > pColData->cid) { -// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else { -// ASSERT(pTColumn->type == pColData->type); - -// SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type}; -// TDRowValT vt = TD_VTYPE_NONE; // default is NONE -// SKvRowIdx *pKvIdx = NULL; - -// while (kvIter < nKvCols) { -// pKvIdx = (SKvRowIdx *)POINTER_SHIFT(pColIdx, kvIter * sizeof(SKvRowIdx)); -// if (pKvIdx->colId == pTColumn->colId) { -// tdGetBitmapValTypeII(pBitmap, kvIter, &vt); -// ++kvIter; -// break; -// } else if (pKvIdx->colId > pTColumn->colId) { -// vt = TD_VTYPE_NONE; -// break; -// } else { -// ++kvIter; -// } -// } - -// if (vt == TD_VTYPE_NORM) { -// cv.flag = CV_FLAG_VALUE; - -// void *pData = POINTER_SHIFT(pRow, pKvIdx->offset); -// if (IS_VAR_DATA_TYPE(pTColumn->type)) { -// cv.value.nData = varDataLen(pData); -// cv.value.pData = varDataVal(pData); -// } else { -// memcpy(&cv.value.val, pData, pTColumn->bytes); -// } - -// code = tColDataAppendValue(pColData, &cv); -// if (code) goto _exit; -// } else if (vt == TD_VTYPE_NONE) { -// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else if (vt == TD_VTYPE_NULL) { -// code = tColDataAppendValue(pColData, &COL_VAL_NULL(pColData->cid, pColData->type)); -// if (code) goto _exit; -// } else { -// ASSERT(0); -// } - -// iTColumn++; -// pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; -// } -// } - -// _exit: -// return code; -// } - int32_t tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTSchema, int64_t uid) { int32_t code = 0;