fix bugs founded in regression test(reverse scan failed).
This commit is contained in:
parent
e1a91107ce
commit
819b4c6190
|
@ -399,7 +399,6 @@ static void doCloseQueryFiles(SQueryFilesInfo *pVnodeFileInfo) {
|
||||||
assert(pVnodeFileInfo->current < pVnodeFileInfo->numOfFiles && pVnodeFileInfo->current >= 0);
|
assert(pVnodeFileInfo->current < pVnodeFileInfo->numOfFiles && pVnodeFileInfo->current >= 0);
|
||||||
|
|
||||||
pVnodeFileInfo->headerFileSize = -1;
|
pVnodeFileInfo->headerFileSize = -1;
|
||||||
|
|
||||||
doCloseQueryFileInfoFD(pVnodeFileInfo);
|
doCloseQueryFileInfoFD(pVnodeFileInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -459,10 +458,11 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
||||||
|
|
||||||
int64_t st = taosGetTimestampUs();
|
int64_t st = taosGetTimestampUs();
|
||||||
|
|
||||||
if (vnodeIsCompBlockInfoLoaded(pRuntimeEnv, pMeterObj, fileIndex)) {
|
// if the corresponding data/header files are already closed, re-open them here
|
||||||
|
if (vnodeIsCompBlockInfoLoaded(pRuntimeEnv, pMeterObj, fileIndex) &&
|
||||||
|
pRuntimeEnv->vnodeFileInfo.current == fileIndex) {
|
||||||
dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d compBlock info is loaded, not reload", GET_QINFO_ADDR(pQuery),
|
dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d compBlock info is loaded, not reload", GET_QINFO_ADDR(pQuery),
|
||||||
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pHeadeFileInfo->fileID);
|
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pHeadeFileInfo->fileID);
|
||||||
|
|
||||||
return pQuery->numOfBlocks;
|
return pQuery->numOfBlocks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue