@@ -306,30 +306,24 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
306306{
307307LVRelState * vacrel ;
308308bool verbose ,
309- instrument ;
309+ instrument ,
310+ aggressive ,
311+ skipwithvm ,
312+ frozenxid_updated ,
313+ minmulti_updated ;
314+ TransactionId OldestXmin ,
315+ FreezeLimit ;
316+ MultiXactId MultiXactCutoff ;
317+ BlockNumber orig_rel_pages ,
318+ new_rel_pages ,
319+ new_rel_allvisible ;
310320PGRUsage ru0 ;
311321TimestampTz starttime = 0 ;
312- WalUsage walusage_start = pgWalUsage ;
313- WalUsage walusage = {0 ,0 ,0 };
314- long secs ;
315- int usecs ;
316- double read_rate ,
317- write_rate ;
318- bool aggressive ,
319- skipwithvm ;
320- bool frozenxid_updated ,
321- minmulti_updated ;
322- BlockNumber orig_rel_pages ;
323- char * * indnames = NULL ;
324- BlockNumber new_rel_pages ;
325- BlockNumber new_rel_allvisible ;
326- double new_live_tuples ;
327- ErrorContextCallback errcallback ;
328322PgStat_Counter startreadtime = 0 ;
329323PgStat_Counter startwritetime = 0 ;
330- TransactionId OldestXmin ;
331- TransactionId FreezeLimit ;
332- MultiXactId MultiXactCutoff ;
324+ WalUsage walusage_start = pgWalUsage ;
325+ ErrorContextCallback errcallback ;
326+ char * * indnames = NULL ;
333327
334328verbose = (params -> options & VACOPT_VERBOSE )!= 0 ;
335329instrument = (verbose || (IsAutoVacuumWorkerProcess ()&&
@@ -557,7 +551,6 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
557551 * relpages to.
558552 */
559553new_rel_pages = vacrel -> rel_pages ;/* After possible rel truncation */
560- new_live_tuples = vacrel -> new_live_tuples ;
561554visibilitymap_count (rel ,& new_rel_allvisible ,NULL );
562555if (new_rel_allvisible > new_rel_pages )
563556new_rel_allvisible = new_rel_pages ;
@@ -578,7 +571,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
578571/* Cannot advance relfrozenxid/relminmxid */
579572Assert (!aggressive );
580573frozenxid_updated = minmulti_updated = false;
581- vac_update_relstats (rel ,new_rel_pages ,new_live_tuples ,
574+ vac_update_relstats (rel ,new_rel_pages ,vacrel -> new_live_tuples ,
582575new_rel_allvisible ,vacrel -> nindexes > 0 ,
583576InvalidTransactionId ,InvalidMultiXactId ,
584577NULL ,NULL , false);
@@ -587,7 +580,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
587580{
588581Assert (vacrel -> scanned_pages + vacrel -> frozenskipped_pages ==
589582orig_rel_pages );
590- vac_update_relstats (rel ,new_rel_pages ,new_live_tuples ,
583+ vac_update_relstats (rel ,new_rel_pages ,vacrel -> new_live_tuples ,
591584new_rel_allvisible ,vacrel -> nindexes > 0 ,
592585FreezeLimit ,MultiXactCutoff ,
593586& frozenxid_updated ,& minmulti_updated , false);
@@ -605,7 +598,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
605598 */
606599pgstat_report_vacuum (RelationGetRelid (rel ),
607600rel -> rd_rel -> relisshared ,
608- Max (new_live_tuples ,0 ),
601+ Max (vacrel -> new_live_tuples ,0 ),
609602vacrel -> recently_dead_tuples +
610603vacrel -> missed_dead_tuples );
611604pgstat_progress_end_command ();
@@ -618,6 +611,11 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
618611TimestampDifferenceExceeds (starttime ,endtime ,
619612params -> log_min_duration ))
620613{
614+ long secs ;
615+ int usecs ;
616+ WalUsage walusage ;
617+ double read_rate ,
618+ write_rate ;
621619StringInfoData buf ;
622620char * msgfmt ;
623621int32 diff ;
@@ -674,7 +672,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
674672vacrel -> num_index_scans );
675673appendStringInfo (& buf ,_ ("pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n" ),
676674vacrel -> removed_pages ,
677- vacrel -> rel_pages ,
675+ new_rel_pages ,
678676vacrel -> scanned_pages ,
679677orig_rel_pages == 0 ?100.0 :
680678100.0 * vacrel -> scanned_pages /orig_rel_pages );