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

fix #742

This commit is contained in:
Jeff Tao 2019-11-18 21:36:53 +08:00
parent dbb888c117
commit d731fc0dbf
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/detail/src/vnodeImport.c
View File

@ -479,7 +479,7 @@ int vnodeImportToFile(SImportInfo *pImport) {
slot = (slot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks; slot = (slot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
} }
// last slot, the uncommitted slots shall be shifted // last slot, the uncommitted slots shall be shifted, a cache block may have empty rows
SCacheBlock *pCacheBlock = pInfo->cacheBlocks[slot]; SCacheBlock *pCacheBlock = pInfo->cacheBlocks[slot];
int points = pCacheBlock->numOfPoints - pInfo->commitPoint; int points = pCacheBlock->numOfPoints - pInfo->commitPoint;
if (points > 0) { if (points > 0) {
@ -568,7 +568,7 @@ int vnodeImportToCache(SImportInfo *pImport, char *payload, int rows) {
} }
} }
// copy the overwritten data into buffer // copy the overwritten data into buffer, merge cache blocks
tpoints = rows; tpoints = rows;
pos = pImport->pos; pos = pImport->pos;
slot = pImport->slot; slot = pImport->slot;
@ -603,6 +603,19 @@ int vnodeImportToCache(SImportInfo *pImport, char *payload, int rows) {
pos = 0; pos = 0;
tpoints -= points; tpoints -= points;
if (tpoints == 0) {
// free the rest of cache blocks, since cache blocks are merged
int currentSlot = slot;
while (slot != pInfo->currentSlot) {
slot = (slot + 1) % pInfo->maxBlocks;
pCacheBlock = pInfo->cacheBlocks[slot];
vnodeFreeCacheBlock(pCacheBlock);
}
pInfo->currentSlot = currentSlot;
slot = currentSlot; // make sure to exit from the while loop
}
if (slot == pInfo->currentSlot) break; if (slot == pInfo->currentSlot) break;
slot = (slot + 1) % pInfo->maxBlocks; slot = (slot + 1) % pInfo->maxBlocks;
} }