diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 61b77af09b..c2fa06b674 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -227,7 +227,7 @@ typedef struct LVRelState /* Working state for heap scanning and vacuuming */ LVRelScanState *scan_state; - /* New estimated total # of tuples and total # of live tuples */ + /* New estimated total # of tuples and total # of live tuples */ double new_rel_tuples; double new_live_tuples; /* Statistics output by index AMs */ @@ -321,7 +321,6 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, BufferAccessStrategy bstrategy) { LVRelState *vacrel; - LVRelScanState *scan_state; bool verbose, instrument, skipwithvm, @@ -433,23 +432,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, } /* Initialize page counters explicitly (be tidy) */ - scan_state = palloc(sizeof(LVRelScanState)); - scan_state->scanned_pages = 0; - scan_state->removed_pages = 0; - scan_state->new_frozen_tuple_pages = 0; - scan_state->lpdead_item_pages = 0; - scan_state->missed_dead_pages = 0; - scan_state->nonempty_pages = 0; - scan_state->tuples_deleted = 0; - scan_state->tuples_frozen = 0; - scan_state->lpdead_items = 0; - scan_state->live_tuples = 0; - scan_state->recently_dead_tuples = 0; - scan_state->missed_dead_tuples = 0; - scan_state->vm_new_visible_pages = 0; - scan_state->vm_new_visible_frozen_pages = 0; - scan_state->vm_new_frozen_pages = 0; - vacrel->scan_state = scan_state; + vacrel->scan_state = palloc0(sizeof(LVRelScanState)); /* dead_items_alloc allocates vacrel->dead_items later on */ /* Allocate/initialize output statistics state */ @@ -1122,9 +1105,9 @@ lazy_scan_heap(LVRelState *vacrel) * * vacrel is an in/out parameter here. Vacuum options and information about * the relation are read. vacrel->scan_state->skippedallvis is set if we skip - * a block that's all-visible but not all-frozen, to ensure that we don't update - * relfrozenxid in that case. vacrel also holds information about the next - * unskippable block, as bookkeeping for this function. + * a block that's all-visible but not all-frozen, to ensure that we don't + * update relfrozenxid in that case. vacrel also holds information about the + * next unskippable block, as bookkeeping for this function. */ static bool heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c index 50dd3d7d14..11282e98a1 100644 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@ -201,7 +201,7 @@ struct ParallelVacuumState bool *will_parallel_vacuum; /* How many time index vacuuming or cleaning up is executed? */ - int num_index_scans; + int num_parallel_index_scans; /* * The number of indexes that support parallel index bulk-deletion and @@ -231,7 +231,7 @@ static void parallel_vacuum_process_safe_indexes(ParallelVacuumState *pvs); static void parallel_vacuum_process_unsafe_indexes(ParallelVacuumState *pvs); static void parallel_vacuum_process_one_index(ParallelVacuumState *pvs, Relation indrel, PVIndStats *indstats); -static bool parallel_vacuum_index_is_parallel_safe(Relation indrel, int num_index_scans, +static bool parallel_vacuum_index_is_parallel_safe(Relation indrel, int num_parallel_index_scans, bool vacuum); static void parallel_vacuum_error_callback(void *arg); @@ -631,7 +631,7 @@ parallel_vacuum_process_all_indexes(ParallelVacuumState *pvs, bool vacuum) nworkers = pvs->nindexes_parallel_cleanup; /* Add conditionally parallel-aware indexes if in the first time call */ - if (pvs->num_index_scans == 0) + if (pvs->num_parallel_index_scans == 0) nworkers += pvs->nindexes_parallel_condcleanup; } @@ -659,7 +659,7 @@ parallel_vacuum_process_all_indexes(ParallelVacuumState *pvs, bool vacuum) indstats->parallel_workers_can_process = (pvs->will_parallel_vacuum[i] && parallel_vacuum_index_is_parallel_safe(pvs->indrels[i], - pvs->num_index_scans, + pvs->num_parallel_index_scans, vacuum)); } @@ -670,7 +670,7 @@ parallel_vacuum_process_all_indexes(ParallelVacuumState *pvs, bool vacuum) if (nworkers > 0) { /* Reinitialize parallel context to relaunch parallel workers */ - if (pvs->num_index_scans > 0) + if (pvs->num_parallel_index_scans > 0) ReinitializeParallelDSM(pvs->pcxt); /* @@ -766,7 +766,7 @@ parallel_vacuum_process_all_indexes(ParallelVacuumState *pvs, bool vacuum) } /* Increment the counter */ - pvs->num_index_scans++; + pvs->num_parallel_index_scans++; } /* @@ -951,7 +951,8 @@ parallel_vacuum_process_one_index(ParallelVacuumState *pvs, Relation indrel, * parallel index vacuum or parallel index cleanup. */ static bool -parallel_vacuum_index_is_parallel_safe(Relation indrel, int num_index_scans, +parallel_vacuum_index_is_parallel_safe(Relation indrel, + int num_parallel_index_scans, bool vacuum) { uint8 vacoptions; @@ -975,7 +976,7 @@ parallel_vacuum_index_is_parallel_safe(Relation indrel, int num_index_scans, * VACUUM_OPTION_PARALLEL_COND_CLEANUP to know when indexes support * parallel cleanup conditionally. */ - if (num_index_scans > 0 && + if (num_parallel_index_scans > 0 && ((vacoptions & VACUUM_OPTION_PARALLEL_COND_CLEANUP) != 0)) return false;