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

fix(query): check the sma load status, and return if succeed.

This commit is contained in:
Haojun Liao 2022-08-09 17:21:31 +08:00
parent 41d2c92231
commit 8b86d7342d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/libs/executor/src/scanoperator.c
View File

@ -312,9 +312,13 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanInfo* pTableSca
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} else if (*status == FUNC_DATA_REQUIRED_STATIS_LOAD) { } else if (*status == FUNC_DATA_REQUIRED_STATIS_LOAD) {
pCost->loadBlockStatis += 1; pCost->loadBlockStatis += 1;
loadSMA = true; // mark the operator of load sma; loadSMA = true; // mark the operation of load sma;
bool success = doLoadBlockSMA(pTableScanInfo, pBlock, pTaskInfo); bool success = doLoadBlockSMA(pTableScanInfo, pBlock, pTaskInfo);
if (!success) { // failed to load the block sma data, data block statistics does not exist, load data block instead if (success) { // failed to load the block sma data, data block statistics does not exist, load data block instead
qDebug("%s data block SMA loaded, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo),
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
return TSDB_CODE_SUCCESS;
} else {
*status = FUNC_DATA_REQUIRED_DATA_LOAD; *status = FUNC_DATA_REQUIRED_DATA_LOAD;
} }
} }
@ -339,7 +343,7 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanInfo* pTableSca
} }
} }
// try to filter datablock according to current results // try to filter data block according to current results
doDynamicPruneDataBlock(pOperator, pBlockInfo, status); doDynamicPruneDataBlock(pOperator, pBlockInfo, status);
if (*status == FUNC_DATA_REQUIRED_NOT_LOAD) { if (*status == FUNC_DATA_REQUIRED_NOT_LOAD) {
qDebug("%s data block skipped due to dynamic prune, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo), qDebug("%s data block skipped due to dynamic prune, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo),

14
tests/script/tsim/testsuit.sim
View File

@ -1,10 +1,10 @@
run tsim/user/password.sim #run tsim/user/password.sim
run tsim/user/privilege_db.sim #run tsim/user/privilege_db.sim
run tsim/user/privilege_sysinfo.sim #run tsim/user/privilege_sysinfo.sim
run tsim/user/basic.sim #run tsim/user/basic.sim
run tsim/table/basic1.sim #run tsim/table/basic1.sim
run tsim/trans/lossdata1.sim #run tsim/trans/lossdata1.sim
run tsim/trans/create_db.sim #run tsim/trans/create_db.sim
run tsim/stable/alter_metrics.sim run tsim/stable/alter_metrics.sim
run tsim/stable/tag_modify.sim run tsim/stable/tag_modify.sim
run tsim/stable/alter_comment.sim run tsim/stable/alter_comment.sim