xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: do some internal refactor.

This commit is contained in:
Haojun Liao 2022-09-08 14:08:07 +08:00
parent 1bfb09185c
commit e6ab7e5c86
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/src/tdataformat.c
View File

@ -104,7 +104,6 @@ int32_t tGetValue(uint8_t *p, SValue *pValue, int8_t type) {
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
pValue->i64 = *(int64_t*)p; pValue->i64 = *(int64_t*)p;
n += sizeof(int64_t); n += sizeof(int64_t);
// n += tGetI64(p, &pValue->i64);
break; break;
case TSDB_DATA_TYPE_FLOAT: case TSDB_DATA_TYPE_FLOAT:
n += tGetFloat(p, &pValue->f); 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: case TSDB_DATA_TYPE_UBIGINT:
pValue->u64 = *(uint64_t*)p; pValue->u64 = *(uint64_t*)p;
n += sizeof(uint64_t); n += sizeof(uint64_t);
// n += tGetU64(p, &pValue->u64);
break; break;
default: default:
ASSERT(0); ASSERT(0);

2
source/dnode/vnode/src/tsdb/tsdbRead.c
View File

@ -3124,7 +3124,7 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S
int32_t numOfOutputCols = blockDataGetNumOfCols(pResBlock); int32_t numOfOutputCols = blockDataGetNumOfCols(pResBlock);
while (i < numOfOutputCols && j < numOfInputCols) { while (i < numOfOutputCols && j < numOfInputCols) {
SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, i); SColumnInfoData* pCol = TARRAY_GET_ELEM(pResBlock->pDataBlock, i);
SColData* pData = tBlockDataGetColDataByIdx(pBlockData, j); SColData* pData = tBlockDataGetColDataByIdx(pBlockData, j);
if (pData->cid < pCol->info.colId) { if (pData->cid < pCol->info.colId) {