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 2024-03-20 23:03:48 +08:00
parent 81f0ff341c
commit 1d77cde433
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -2815,10 +2815,10 @@ static void buildCleanBlockFromDataFiles(STsdbReader* pReader, STableBlockScanIn
pKey->numOfPKs = pReader->numOfPks; pKey->numOfPKs = pReader->numOfPks;
// todo opt allocation, and handle varchar primary key // todo opt allocation, and handle varchar primary key
pKey->pks[0].val = asc ? pBlockInfo->lastPrimaryKey.val : pBlockInfo->firstPrimaryKey.val; pKey->pks[0].val = asc ? pBlockInfo->lastPk.val : pBlockInfo->firstPk.val;
pInfo->pks[0].val = pBlockInfo->firstPrimaryKey.val; pInfo->pks[0].val = pBlockInfo->firstPk.val;
pInfo->pks[1].val = pBlockInfo->lastPrimaryKey.val; pInfo->pks[1].val = pBlockInfo->lastPk.val;
tsdbDebug("%p uid:%" PRIu64 tsdbDebug("%p uid:%" PRIu64
" clean file block retrieved from file, global index:%d, " " clean file block retrieved from file, global index:%d, "

12
source/dnode/vnode/src/tsdb/tsdbReadUtil.c
View File

@ -380,19 +380,19 @@ static void recordToBlockInfo(SFileDataBlockInfo* pBlockInfo, SBrinRecord* recor
if (pFirstKey->numOfPKs > 0) { if (pFirstKey->numOfPKs > 0) {
if (IS_NUMERIC_TYPE(pFirstKey->pks[0].type)) { if (IS_NUMERIC_TYPE(pFirstKey->pks[0].type)) {
pBlockInfo->firstPrimaryKey.val = pFirstKey->pks[0].val; pBlockInfo->firstPk.val = pFirstKey->pks[0].val;
pBlockInfo->lastPrimaryKey.val = record->lastKey.key.pks[0].val; pBlockInfo->lastPk.val = record->lastKey.key.pks[0].val;
pBlockInfo->firstPKLen = 0; pBlockInfo->firstPKLen = 0;
pBlockInfo->lastPKLen = 0; pBlockInfo->lastPKLen = 0;
} else { // todo handle memory alloc error, opt memory alloc perf } else { // todo handle memory alloc error, opt memory alloc perf
pBlockInfo->firstPKLen = pFirstKey->pks[0].nData; pBlockInfo->firstPKLen = pFirstKey->pks[0].nData;
pBlockInfo->firstPrimaryKey.pData = taosMemoryCalloc(1, pBlockInfo->firstPKLen); pBlockInfo->firstPk.pData = taosMemoryCalloc(1, pBlockInfo->firstPKLen);
memcpy(pBlockInfo->firstPrimaryKey.pData, pFirstKey->pks[0].pData, pBlockInfo->firstPKLen); memcpy(pBlockInfo->firstPk.pData, pFirstKey->pks[0].pData, pBlockInfo->firstPKLen);
pBlockInfo->lastPKLen = record->lastKey.key.pks[0].nData; pBlockInfo->lastPKLen = record->lastKey.key.pks[0].nData;
pBlockInfo->lastPrimaryKey.pData = taosMemoryCalloc(1, pBlockInfo->lastPKLen); pBlockInfo->lastPk.pData = taosMemoryCalloc(1, pBlockInfo->lastPKLen);
memcpy(pBlockInfo->lastPrimaryKey.pData, record->lastKey.key.pks[0].pData, pBlockInfo->lastPKLen); memcpy(pBlockInfo->lastPk.pData, record->lastKey.key.pks[0].pData, pBlockInfo->lastPKLen);
} }
} }
} }

4
source/dnode/vnode/src/tsdb/tsdbReadUtil.h
View File

@ -189,13 +189,13 @@ typedef struct SFileDataBlockInfo {
union { union {
int64_t val; int64_t val;
uint8_t* pData; uint8_t* pData;
} firstPrimaryKey; } firstPk;
int64_t lastKey; int64_t lastKey;
union { union {
int64_t val; int64_t val;
uint8_t* pData; uint8_t* pData;
} lastPrimaryKey; } lastPk;
int32_t firstPKLen; int32_t firstPKLen;
int32_t lastPKLen; int32_t lastPKLen;