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

fix(tsdb): add null check.

This commit is contained in:
Haojun Liao 2023-12-08 18:55:20 +08:00
parent 67d967e22f
commit da636ab527
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/vnode/src/tsdb/tsdbReadUtil.c
View File

@ -862,16 +862,20 @@ static bool overlapWithTimeWindow(STimeWindow* p1, STimeWindow* pQueryWindow, ST
SIterInfo* pIMemIter = &pBlockScanInfo->iiter; SIterInfo* pIMemIter = &pBlockScanInfo->iiter;
// overlap with mem data // overlap with mem data
if (pMemIter->hasVal) {
STbData* pTbData = pMemIter->iter->pTbData; STbData* pTbData = pMemIter->iter->pTbData;
if ((pMemIter->hasVal) && overlapHelper(p1, pTbData->minKey, pTbData->maxKey)) { if (overlapHelper(p1, pTbData->minKey, pTbData->maxKey)) {
return true; return true;
} }
}
// overlap with imem data // overlap with imem data
if (pIMemIter->hasVal) {
STbData* pITbData = pIMemIter->iter->pTbData; STbData* pITbData = pIMemIter->iter->pTbData;
if ((pIMemIter->hasVal) && overlapHelper(p1, pITbData->minKey, pITbData->maxKey)) { if (overlapHelper(p1, pITbData->minKey, pITbData->maxKey)) {
return true; return true;
} }
}
// overlap with data file block // overlap with data file block
STimeWindow* pFileWin = &pBlockScanInfo->filesetWindow; STimeWindow* pFileWin = &pBlockScanInfo->filesetWindow;