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

[TD-225] refactor

This commit is contained in:
Haojun Liao 2021-02-06 13:59:21 +08:00
parent f55b477a96
commit 8249d5f694
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/query/inc/qExecutor.h
View File

@ -318,11 +318,11 @@ typedef struct STableScanInfo {
int32_t numOfBlockStatis; int32_t numOfBlockStatis;
int64_t numOfRows; int64_t numOfRows;
int32_t order;
bool completed; int32_t order; // scan order
int32_t times; // repeat counts
SSDataBlock block; SSDataBlock block;
int64_t elapsedTime; int64_t elapsedTime;
SSDataBlock* (*apply)(void* param); SSDataBlock* (*apply)(void* param);
} STableScanInfo; } STableScanInfo;

31
src/query/src/qExecutor.c
View File

@ -5608,25 +5608,34 @@ static SSDataBlock* doTableScan(void* param) {
} }
return pBlock; return pBlock;
// int32_t ret = loadDataBlockOnDemand(pRuntimeEnv, &pRuntimeEnv->resultRowInfo, pQueryHandle, &blockInfo, &pStatis, &pDataBlock, &status);
// if (ret != TSDB_CODE_SUCCESS) {
// break;
// }
// if (status == BLK_DATA_DISCARD) {
// pQuery->current->lastKey =
// QUERY_IS_ASC_QUERY(pQuery) ? blockInfo.window.ekey + step : blockInfo.window.skey + step;
// continue;
// }
} }
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo, &pQInfo->memRef);
if (pRuntimeEnv->pSecQueryHandle == NULL) {
longjmp(pRuntimeEnv->env, terrno);
}
pRuntimeEnv->resultRowInfo.curIndex = qstatus.windowIndex;
setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
pRuntimeEnv->scanFlag = REPEAT_SCAN;
if (pRuntimeEnv->pTsBuf) {
bool ret = tsBufNextPos(pRuntimeEnv->pTsBuf);
assert(ret);
}
qDebug("QInfo:%p start to repeat scan data blocks due to query func required, qrange:%"PRId64"-%"PRId64, pQInfo,
cond.twindow.skey, cond.twindow.ekey);
return NULL; return NULL;
} }
static UNUSED_FUNC STableScanInfo* createTableScanInfo(void* pTsdbQueryHandle) { static UNUSED_FUNC STableScanInfo* createTableScanInfo(void* pTsdbQueryHandle, int32_t repeatTime) {
STableScanInfo* pInfo = calloc(1, sizeof(STableScanInfo)); STableScanInfo* pInfo = calloc(1, sizeof(STableScanInfo));
pInfo->pQueryHandle = pTsdbQueryHandle; pInfo->pQueryHandle = pTsdbQueryHandle;
pInfo->apply = doTableScan; pInfo->apply = doTableScan;
pInfo->times = repeatTime;
return pInfo; return pInfo;
} }