change repeat_scan to pre_scan

This commit is contained in:
Ganlin Zhao 2023-02-22 10:22:10 +08:00
parent fea9126453
commit 9102c7a42a
3 changed files with 4 additions and 3 deletions

View File

@ -76,7 +76,7 @@ enum {
enum { enum {
MAIN_SCAN = 0x0u, MAIN_SCAN = 0x0u,
REVERSE_SCAN = 0x1u, // todo remove it REVERSE_SCAN = 0x1u, // todo remove it
REPEAT_SCAN = 0x2u, // repeat scan belongs to the master scan PRE_SCAN = 0x2u, // pre-scan belongs to the main scan and occurs before main scan
}; };
typedef struct SPoint1 { typedef struct SPoint1 {

View File

@ -538,7 +538,7 @@ bool functionNeedToExecute(SqlFunctionCtx* pCtx) {
return false; return false;
} }
if (pCtx->scanFlag == REPEAT_SCAN) { if (pCtx->scanFlag == PRE_SCAN) {
return fmIsRepeatScanFunc(pCtx->functionId); return fmIsRepeatScanFunc(pCtx->functionId);
} }

View File

@ -880,10 +880,11 @@ SOperatorInfo* createTableScanOperatorInfo(STableScanPhysiNode* pTableScanNode,
pInfo->scanInfo = (SScanInfo){.numOfAsc = pTableScanNode->scanSeq[0], .numOfDesc = pTableScanNode->scanSeq[1]}; pInfo->scanInfo = (SScanInfo){.numOfAsc = pTableScanNode->scanSeq[0], .numOfDesc = pTableScanNode->scanSeq[1]};
if (pInfo->scanInfo.numOfAsc > 1) { if (pInfo->scanInfo.numOfAsc > 1) {
pInfo->base.scanFlag = REPEAT_SCAN; pInfo->base.scanFlag = PRE_SCAN;
} else { } else {
pInfo->base.scanFlag = MAIN_SCAN; pInfo->base.scanFlag = MAIN_SCAN;
} }
pInfo->base.pdInfo.interval = extractIntervalInfo(pTableScanNode); pInfo->base.pdInfo.interval = extractIntervalInfo(pTableScanNode);
pInfo->base.readHandle = *readHandle; pInfo->base.readHandle = *readHandle;
pInfo->base.dataBlockLoadFlag = pTableScanNode->dataRequired; pInfo->base.dataBlockLoadFlag = pTableScanNode->dataRequired;