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

Merge branch 'enh/tsdb_optimize' of https://github.com/taosdata/TDengine into enh/tsdb_optimize

This commit is contained in:
Hongze Cheng 2023-06-28 09:16:48 +08:00
parent b13010c490 9116a4092a
commit c3a34f5012
2 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ SSttBlockLoadInfo *tCreateOneLastBlockLoadInfo(STSchema *pSchema, int16_t *colLi
} }
pLoadInfo->aSttBlk = taosArrayInit(4, sizeof(SSttBlk)); pLoadInfo->aSttBlk = taosArrayInit(4, sizeof(SSttBlk));
pLoadInfo->pTombBlockArray = taosArrayInit(4, POINTER_BYTES);
pLoadInfo->pSchema = pSchema; pLoadInfo->pSchema = pSchema;
pLoadInfo->colIds = colList; pLoadInfo->colIds = colList;
pLoadInfo->numOfCols = numOfCols; pLoadInfo->numOfCols = numOfCols;
@ -200,7 +201,6 @@ static SBlockData *loadLastBlock(SLDataIter *pIter, const char *idStr) {
} }
code = tsdbSttFileReadBlockData(pIter->pReader, pIter->pSttBlk, pBlock); code = tsdbSttFileReadBlockData(pIter->pReader, pIter->pSttBlk, pBlock);
// code = tsdbReadSttBlock(pIter->pReader, pIter->iStt, pIter->pSttBlk, pBlock);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
goto _exit; goto _exit;
} }

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

@ -507,7 +507,7 @@ static void clearBlockScanInfo(STableBlockScanInfo* p) {
p->delSkyline = taosArrayDestroy(p->delSkyline); p->delSkyline = taosArrayDestroy(p->delSkyline);
p->pBlockList = taosArrayDestroy(p->pBlockList); p->pBlockList = taosArrayDestroy(p->pBlockList);
tMapDataClear(&p->mapData); p->pDelData = taosArrayDestroy(p->pDelData);
} }
static void destroyAllBlockScanInfo(SSHashObj* pTableMap) { static void destroyAllBlockScanInfo(SSHashObj* pTableMap) {
@ -2788,9 +2788,9 @@ static bool isValidFileBlockRow(SBlockData* pBlockData, SFileBlockDumpInfo* pDum
return true; return true;
} }
static int32_t loadTomRecordInfoFromSttFiles(SSttBlockLoadInfo* pBlockLoadInfo, uint64_t suid, static int32_t loadTomRecordInfoFromSttFiles(SArray* pLDataIterList, uint64_t suid, STableBlockScanInfo* pBlockScanInfo,
STableBlockScanInfo* pBlockScanInfo, uint64_t maxVer) { uint64_t maxVer) {
int32_t size = taosArrayGetSize(pBlockLoadInfo->pTombBlockArray); int32_t size = taosArrayGetSize(pLDataIterList);
if (size <= 0) { if (size <= 0) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -2800,32 +2800,49 @@ static int32_t loadTomRecordInfoFromSttFiles(SSttBlockLoadInfo* pBlockLoadInfo,
pBlockScanInfo->pDelData = taosArrayInit(4, sizeof(SDelData)); pBlockScanInfo->pDelData = taosArrayInit(4, sizeof(SDelData));
} }
STombRecord record = {0};
for(int32_t i = 0; i < size; ++i) { for(int32_t i = 0; i < size; ++i) {
STombBlock* pBlock = taosArrayGetP(pBlockLoadInfo->pTombBlockArray, i); SArray* pLeveledLDataIter = taosArrayGetP(pLDataIterList, i);
STombRecord record = {0}; int32_t numOfIter = taosArrayGetSize(pLeveledLDataIter);
for(int32_t j = 0; j < pBlock->suid->size; ++j) { if (numOfIter == 0) {
int32_t code = tTombBlockGet(pBlock, j, &record); continue;
if (code != TSDB_CODE_SUCCESS) { }
// todo handle error
}
if (record.suid < suid) { for (int32_t f = 0; f < numOfIter; ++f) {
continue; SLDataIter* pIter = taosArrayGetP(pLeveledLDataIter, f);
}
// todo use binary search instead here SArray* pTombBlockArray = pIter->pBlockLoadInfo->pTombBlockArray;
if (record.uid < uid) {
continue;
}
if (record.uid > uid) { int32_t numOfBlocks = taosArrayGetSize(pTombBlockArray);
break; for (int32_t k = 0; k < numOfBlocks; ++k) {
} STombBlock* pBlock = taosArrayGetP(pTombBlockArray, k);
if (record.version <= maxVer) { for (int32_t j = 0; j < pBlock->suid->size; ++j) {
SDelData delData = {.version = record.version, .sKey = record.skey, .eKey = record.ekey}; int32_t code = tTombBlockGet(pBlock, j, &record);
taosArrayPush(pBlockScanInfo->pDelData, &delData); if (code != TSDB_CODE_SUCCESS) {
// todo handle error
}
if (record.suid < suid) {
continue;
}
// todo use binary search instead here
if (record.uid < uid) {
continue;
}
if (record.uid > uid) {
break;
}
if (record.version <= maxVer) {
SDelData delData = {.version = record.version, .sKey = record.skey, .eKey = record.ekey};
taosArrayPush(pBlockScanInfo->pDelData, &delData);
}
}
} }
} }
} }
@ -2862,7 +2879,7 @@ static bool initLastBlockReader(SLastBlockReader* pLBlockReader, STableBlockScan
return false; return false;
} }
code = loadTomRecordInfoFromSttFiles(pLBlockReader->pInfo, pReader->suid, pScanInfo, pReader->verRange.maxVer); code = loadTomRecordInfoFromSttFiles(pReader->status.pLDataIterArray, pReader->suid, pScanInfo, pReader->verRange.maxVer);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return false; return false;
} }