From ad2395adba28db8d1bbf0f87c64bf619367d48b9 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Fri, 5 Apr 2024 17:38:36 -0400 Subject: [PATCH v16 12/18] BitmapHeapScan initialize some prefetch state elsewhere These members can be initialized elsewhere. This makes the diff more straightforward for moving those members from BitmapHeapScanState to BitmapHeapScanDesc. Author: Melanie Plageman Discussion: https://postgr.es/m/CAAKRu_ZwCwWFeL_H3ia26bP2e7HiKLWt0ZmGXPVwPO6uXq0vaA%40mail.gmail.com --- src/backend/executor/nodeBitmapHeapscan.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 0b28c46d08..4f7138bbd9 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -181,13 +181,6 @@ BitmapHeapNext(BitmapHeapScanState *node) { pstate->prefetch_iterator = tbm_prepare_shared_iterate(tbm); - - /* - * We don't need the mutex here as we haven't yet woke up - * others. - */ - pstate->prefetch_pages = 0; - pstate->prefetch_target = -1; } #endif /* We have initialized the shared state so wake up others. */ @@ -228,9 +221,6 @@ BitmapHeapNext(BitmapHeapScanState *node) pstate ? pstate->prefetch_iterator : InvalidDsaPointer); - /* Only used for serial BHS */ - node->prefetch_pages = 0; - node->prefetch_target = -1; } #endif /* USE_PREFETCH */ @@ -601,6 +591,9 @@ ExecReScanBitmapHeapScan(BitmapHeapScanState *node) node->recheck = true; node->blockno = InvalidBlockNumber; node->pfblockno = InvalidBlockNumber; + /* Only used for serial BHS */ + node->prefetch_pages = 0; + node->prefetch_target = -1; ExecScanReScan(&node->ss); @@ -683,7 +676,7 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags) scanstate->exact_pages = 0; scanstate->lossy_pages = 0; scanstate->prefetch_pages = 0; - scanstate->prefetch_target = 0; + scanstate->prefetch_target = -1; scanstate->initialized = false; scanstate->pstate = NULL; scanstate->recheck = true; @@ -818,7 +811,7 @@ ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node, /* Initialize the mutex */ SpinLockInit(&pstate->mutex); pstate->prefetch_pages = 0; - pstate->prefetch_target = 0; + pstate->prefetch_target = -1; pstate->state = BM_INITIAL; ConditionVariableInit(&pstate->cv); -- 2.40.1