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

fix: fix memory leak

This commit is contained in:
slzhou 2023-12-09 19:00:23 +08:00
parent 92a695cd2f
commit 9a9264e03a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/libs/executor/src/scanoperator.c
View File

@ -3303,19 +3303,21 @@ static int32_t retrieveSourceBlock(STableMergeScanInfo* pInfo, int32_t blockId,
LRUHandle* hBlk = taosLRUCacheLookup(pSortInfo->pBlkDataCache, &blockId, sizeof(blockId)); LRUHandle* hBlk = taosLRUCacheLookup(pSortInfo->pBlkDataCache, &blockId, sizeof(blockId));
if (hBlk) { if (hBlk) {
SSDataBlock* pBlk = taosLRUCacheValue(pSortInfo->pBlkDataCache, hBlk); SSDataBlock* pBlk = taosLRUCacheValue(pSortInfo->pBlkDataCache, hBlk);
taosLRUCacheRelease(pSortInfo->pBlkDataCache, hBlk, false);
*ppBlock = pBlk; *ppBlock = pBlk;
} else { } else {
STmsSortBlockInfo* blkInfo = NULL; STmsSortBlockInfo* blkInfo = NULL;
LRUHandle* hBlkInfo = taosLRUCacheLookup(pSortInfo->pBlkInfoCache, &blockId, sizeof(blockId)); LRUHandle* hBlkInfo = taosLRUCacheLookup(pSortInfo->pBlkInfoCache, &blockId, sizeof(blockId));
if (hBlkInfo) { if (hBlkInfo) {
blkInfo = taosLRUCacheValue(pSortInfo->pBlkInfoCache, hBlkInfo); blkInfo = taosLRUCacheValue(pSortInfo->pBlkInfoCache, hBlkInfo);
taosLRUCacheRelease(pSortInfo->pBlkInfoCache, hBlkInfo, false);
} else { } else {
blkInfo = taosMemoryMalloc(sizeof(STmsSortBlockInfo)); blkInfo = taosMemoryMalloc(sizeof(STmsSortBlockInfo));
taosLSeekFile(pSortInfo->idxFile, blockId * sizeof(STmsSortBlockInfo), SEEK_SET); taosLSeekFile(pSortInfo->idxFile, blockId * sizeof(STmsSortBlockInfo), SEEK_SET);
taosReadFile(pSortInfo->idxFile, blkInfo, sizeof(STmsSortBlockInfo)); taosReadFile(pSortInfo->idxFile, blkInfo, sizeof(STmsSortBlockInfo));
ASSERT(blkInfo->blkId == blockId); ASSERT(blkInfo->blkId == blockId);
taosLRUCacheInsert(pSortInfo->pBlkInfoCache, &blockId, sizeof(blockId), blkInfo, 1, deleteBlockInfoCache, taosLRUCacheInsert(pSortInfo->pBlkInfoCache, &blockId, sizeof(blockId), blkInfo, 1, deleteBlockInfoCache,
&hBlkInfo, TAOS_LRU_PRIORITY_LOW, NULL); NULL, TAOS_LRU_PRIORITY_LOW, NULL);
} }
{ {
taosLSeekFile(pSortInfo->dataFile, blkInfo->offset, SEEK_SET); taosLSeekFile(pSortInfo->dataFile, blkInfo->offset, SEEK_SET);
@ -3328,7 +3330,7 @@ static int32_t retrieveSourceBlock(STableMergeScanInfo* pInfo, int32_t blockId,
*ppBlock = pBlock; *ppBlock = pBlock;
taosLRUCacheInsert(pSortInfo->pBlkDataCache, &blockId, sizeof(blockId), pBlock, 1, deleteBlockDataCache, taosLRUCacheInsert(pSortInfo->pBlkDataCache, &blockId, sizeof(blockId), pBlock, 1, deleteBlockDataCache,
&hBlk, TAOS_LRU_PRIORITY_LOW, NULL); NULL, TAOS_LRU_PRIORITY_LOW, NULL);
} }
} }
return 0; return 0;
@ -3511,9 +3513,9 @@ int32_t startRowIdSort(STableMergeScanInfo *pInfo) {
pSort->idxFile = taosOpenFile(pSort->idxPath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL); pSort->idxFile = taosOpenFile(pSort->idxPath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL);
taosGetTmpfilePath(tsTempDir, "tms-block-data", pSort->dataPath); taosGetTmpfilePath(tsTempDir, "tms-block-data", pSort->dataPath);
pSort->dataFile = taosOpenFile(pSort->dataPath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL); pSort->dataFile = taosOpenFile(pSort->dataPath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_READ | TD_FILE_TRUNC | TD_FILE_AUTO_DEL);
pSort->pBlkInfoCache = taosLRUCacheInit(2048, 0, 0.5); pSort->pBlkInfoCache = taosLRUCacheInit(2048, -1, 0.5);
taosLRUCacheSetStrictCapacity(pSort->pBlkInfoCache, false); taosLRUCacheSetStrictCapacity(pSort->pBlkInfoCache, false);
pSort->pBlkDataCache = taosLRUCacheInit(2048, 0, 0.5); pSort->pBlkDataCache = taosLRUCacheInit(2048, -1, 0.5);
taosLRUCacheSetStrictCapacity(pSort->pBlkInfoCache, false); taosLRUCacheSetStrictCapacity(pSort->pBlkInfoCache, false);
return 0; return 0;
} }