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

Merge pull request #743 from taosdata/hotfix/#742 

fix #742
This commit is contained in:
hzcheng 2019-11-19 10:59:37 +08:00 committed by GitHub
parent 1f2465982a 1f953a0f63
commit a7b8c71ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/detail/src/vnodeCache.c
View File

@ -172,6 +172,7 @@ int vnodeFreeCacheBlock(SCacheBlock *pCacheBlock) {
SCachePool *pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool; SCachePool *pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
if (pCacheBlock->notFree) { if (pCacheBlock->notFree) {
pPool->notFreeSlots--; pPool->notFreeSlots--;
pInfo->unCommittedBlocks--;
dTrace("vid:%d sid:%d id:%s, cache block is not free, slot:%d, index:%d notFreeSlots:%d", dTrace("vid:%d sid:%d id:%s, cache block is not free, slot:%d, index:%d notFreeSlots:%d",
pObj->vnode, pObj->sid, pObj->meterId, pCacheBlock->slot, pCacheBlock->index, pPool->notFreeSlots); pObj->vnode, pObj->sid, pObj->meterId, pCacheBlock->slot, pCacheBlock->index, pPool->notFreeSlots);
} }

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;
} }