From 819b4c6190d85b5a87610750aff51bb0058e48f1 Mon Sep 17 00:00:00 2001 From: hjxilinx Date: Sat, 29 Feb 2020 11:59:33 +0800 Subject: [PATCH] fix bugs founded in regression test(reverse scan failed). --- src/system/detail/src/vnodeQueryImpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c index 722266db2c..fbdbbb078a 100644 --- a/src/system/detail/src/vnodeQueryImpl.c +++ b/src/system/detail/src/vnodeQueryImpl.c @@ -399,7 +399,6 @@ static void doCloseQueryFiles(SQueryFilesInfo *pVnodeFileInfo) { assert(pVnodeFileInfo->current < pVnodeFileInfo->numOfFiles && pVnodeFileInfo->current >= 0); pVnodeFileInfo->headerFileSize = -1; - doCloseQueryFileInfoFD(pVnodeFileInfo); } @@ -458,11 +457,12 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim SHeaderFileInfo *pHeadeFileInfo = &pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex]; 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), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pHeadeFileInfo->fileID); - return pQuery->numOfBlocks; } -- GitLab