From 57d6c27171a6e2d6fb1470f846f0e67be94f70d6 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 8 Sep 2022 14:11:34 +0800 Subject: [PATCH] refactor:do some internal refactor. --- source/dnode/vnode/src/tsdb/tsdbRead.c | 4 ++-- source/dnode/vnode/src/tsdb/tsdbUtil.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 3637492099..2e1a5196f9 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -3120,8 +3120,8 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S } SColVal cv = {0}; - int32_t numOfInputCols = taosArrayGetSize(pBlockData->aIdx); - int32_t numOfOutputCols = blockDataGetNumOfCols(pResBlock); + int32_t numOfInputCols = pBlockData->aIdx->size; + int32_t numOfOutputCols = pResBlock->pDataBlock->size; while (i < numOfOutputCols && j < numOfInputCols) { SColumnInfoData* pCol = TARRAY_GET_ELEM(pResBlock->pDataBlock, i); diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c index 1f619bc77a..1005185113 100644 --- a/source/dnode/vnode/src/tsdb/tsdbUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c @@ -1050,7 +1050,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) { } // get value -// SValue value; if (IS_VAR_DATA_TYPE(pColData->type)) { if (iVal + 1 < pColData->nVal) { pColVal->value.nData = pColData->aOffset[iVal + 1] - pColData->aOffset[iVal]; @@ -1065,8 +1064,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) { pColVal->cid = pColData->cid; pColVal->type = pColData->type; -// pColVal->value = value; -// *pColVal = COL_VAL_VALUE(pColData->cid, pColData->type, value); _exit: return code;