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

fix bug in issue #946 [tbase-1363]

This commit is contained in:
hjxilinx 2019-12-19 13:23:14 +08:00
parent 9e1db3f3db
commit a935e645f1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/detail/src/vnodeQueryImpl.c
View File

@ -1411,11 +1411,12 @@ static int32_t blockwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t
* *
* first filter the data block according to the value filter condition, then, if the top/bottom query applied, * first filter the data block according to the value filter condition, then, if the top/bottom query applied,
* invoke the filter function to decide if the data block need to be accessed or not. * invoke the filter function to decide if the data block need to be accessed or not.
* TODO handle the whole data block is NULL situation
* @param pQuery * @param pQuery
* @param pField * @param pField
* @return * @return
*/ */
static bool needToLoadDataBlock(SQuery *pQuery, SField *pField, SQLFunctionCtx *pCtx) { static bool needToLoadDataBlock(SQuery *pQuery, SField *pField, SQLFunctionCtx *pCtx, int32_t numOfTotalPoints) {
if (pField == NULL) { if (pField == NULL) {
return false; // no need to load data return false; // no need to load data
} }
@ -1433,6 +1434,11 @@ static bool needToLoadDataBlock(SQuery *pQuery, SField *pField, SQLFunctionCtx *
if (!vnodeSupportPrefilter(pFilterInfo->info.data.type)) { if (!vnodeSupportPrefilter(pFilterInfo->info.data.type)) {
continue; continue;
} }
// all points in current column are NULL, no need to check its boundary value
if (pField[colIndex].numOfNullPoints == numOfTotalPoints) {
continue;
}
if (pFilterInfo->info.data.type == TSDB_DATA_TYPE_FLOAT) { if (pFilterInfo->info.data.type == TSDB_DATA_TYPE_FLOAT) {
float minval = *(double *)(&pField[colIndex].min); float minval = *(double *)(&pField[colIndex].min);
@ -1968,6 +1974,7 @@ int32_t getNextDataFileCompInfo(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeter
break; break;
} }
// failed to mmap header file into memory will cause the retrieval of compblock info failed // failed to mmap header file into memory will cause the retrieval of compblock info failed
if (vnodeGetCompBlockInfo(pMeterObj, pRuntimeEnv, fid) > 0) { if (vnodeGetCompBlockInfo(pMeterObj, pRuntimeEnv, fid) > 0) {
break; break;
@ -6724,7 +6731,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
* filter the data block according to the value filter condition. * filter the data block according to the value filter condition.
* no need to load the data block, continue for next block * no need to load the data block, continue for next block
*/ */
if (!needToLoadDataBlock(pQuery, *pFields, pRuntimeEnv->pCtx)) { if (!needToLoadDataBlock(pQuery, *pFields, pRuntimeEnv->pCtx, pBlock->numOfPoints)) {
#if defined(_DEBUG_VIEW) #if defined(_DEBUG_VIEW)
dTrace("QInfo:%p fileId:%d, slot:%d, block discarded by per-filter, ", GET_QINFO_ADDR(pQuery), pQuery->fileId, dTrace("QInfo:%p fileId:%d, slot:%d, block discarded by per-filter, ", GET_QINFO_ADDR(pQuery), pQuery->fileId,
pQuery->slot); pQuery->slot);