diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 13f4d6018b..86a2391ce1 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -104,7 +104,6 @@ int32_t tGetValue(uint8_t *p, SValue *pValue, int8_t type) { case TSDB_DATA_TYPE_BIGINT: pValue->i64 = *(int64_t*)p; n += sizeof(int64_t); -// n += tGetI64(p, &pValue->i64); break; case TSDB_DATA_TYPE_FLOAT: n += tGetFloat(p, &pValue->f); @@ -127,7 +126,6 @@ int32_t tGetValue(uint8_t *p, SValue *pValue, int8_t type) { case TSDB_DATA_TYPE_UBIGINT: pValue->u64 = *(uint64_t*)p; n += sizeof(uint64_t); -// n += tGetU64(p, &pValue->u64); break; default: ASSERT(0); diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 997f903045..3637492099 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -3124,7 +3124,7 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S int32_t numOfOutputCols = blockDataGetNumOfCols(pResBlock); while (i < numOfOutputCols && j < numOfInputCols) { - SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, i); + SColumnInfoData* pCol = TARRAY_GET_ELEM(pResBlock->pDataBlock, i); SColData* pData = tBlockDataGetColDataByIdx(pBlockData, j); if (pData->cid < pCol->info.colId) {