提交 57d6c271 编写于 作者: H Haojun Liao

refactor:do some internal refactor.

上级 e6ab7e5c
...@@ -3120,8 +3120,8 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S ...@@ -3120,8 +3120,8 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S
} }
SColVal cv = {0}; SColVal cv = {0};
int32_t numOfInputCols = taosArrayGetSize(pBlockData->aIdx); int32_t numOfInputCols = pBlockData->aIdx->size;
int32_t numOfOutputCols = blockDataGetNumOfCols(pResBlock); int32_t numOfOutputCols = pResBlock->pDataBlock->size;
while (i < numOfOutputCols && j < numOfInputCols) { while (i < numOfOutputCols && j < numOfInputCols) {
SColumnInfoData* pCol = TARRAY_GET_ELEM(pResBlock->pDataBlock, i); SColumnInfoData* pCol = TARRAY_GET_ELEM(pResBlock->pDataBlock, i);
......
...@@ -1050,7 +1050,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) { ...@@ -1050,7 +1050,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) {
} }
// get value // get value
// SValue value;
if (IS_VAR_DATA_TYPE(pColData->type)) { if (IS_VAR_DATA_TYPE(pColData->type)) {
if (iVal + 1 < pColData->nVal) { if (iVal + 1 < pColData->nVal) {
pColVal->value.nData = pColData->aOffset[iVal + 1] - pColData->aOffset[iVal]; pColVal->value.nData = pColData->aOffset[iVal + 1] - pColData->aOffset[iVal];
...@@ -1065,8 +1064,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) { ...@@ -1065,8 +1064,6 @@ int32_t tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal) {
pColVal->cid = pColData->cid; pColVal->cid = pColData->cid;
pColVal->type = pColData->type; pColVal->type = pColData->type;
// pColVal->value = value;
// *pColVal = COL_VAL_VALUE(pColData->cid, pColData->type, value);
_exit: _exit:
return code; return code;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册