Commita349b86

committed

Move heaprel struct field next to index rel field.

Commit61b313e added a heaprel struct member to IndexVacuumInfo, butplaced it last. Move the heaprel struct member next to the index structmember to improve the code's readability.Author: Peter Geoghegan <pg@bowt.ie>Discussion:https://postgr.es/m/CAH2-WznG=TV6S9d3VA=y0vBHbXwnLs9_LLdiML=aNJuHeriwxg@mail.gmail.com

1 parente7e7da2 commita349b86Copy full SHA for a349b86

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2711,13 +2711,13 @@ lazy_vacuum_one_index(Relation indrel, IndexBulkDeleteResult *istat,`
`2711`	`2711`	`LVSavedErrInfosaved_err_info;`
`2712`	`2712`
`2713`	`2713`	`ivinfo.index=indrel;`
	`2714`	`+ivinfo.heaprel=vacrel->rel;`
`2714`	`2715`	`ivinfo.analyze_only= false;`
`2715`	`2716`	`ivinfo.report_progress= false;`
`2716`	`2717`	`ivinfo.estimated_count= true;`
`2717`	`2718`	`ivinfo.message_level=DEBUG2;`
`2718`	`2719`	`ivinfo.num_heap_tuples=reltuples;`
`2719`	`2720`	`ivinfo.strategy=vacrel->bstrategy;`
`2720`		`-ivinfo.heaprel=vacrel->rel;`
`2721`	`2721`
`2722`	`2722`	`/*`
`2723`	`2723`	`* Update error traceback information.`
`@@ -2760,14 +2760,14 @@ lazy_cleanup_one_index(Relation indrel, IndexBulkDeleteResult *istat,`
`2760`	`2760`	`LVSavedErrInfosaved_err_info;`
`2761`	`2761`
`2762`	`2762`	`ivinfo.index=indrel;`
	`2763`	`+ivinfo.heaprel=vacrel->rel;`
`2763`	`2764`	`ivinfo.analyze_only= false;`
`2764`	`2765`	`ivinfo.report_progress= false;`
`2765`	`2766`	`ivinfo.estimated_count=estimated_count;`
`2766`	`2767`	`ivinfo.message_level=DEBUG2;`
`2767`	`2768`
`2768`	`2769`	`ivinfo.num_heap_tuples=reltuples;`
`2769`	`2770`	`ivinfo.strategy=vacrel->bstrategy;`
`2770`		`-ivinfo.heaprel=vacrel->rel;`
`2771`	`2771`
`2772`	`2772`	`/*`
`2773`	`2773`	`* Update error traceback information.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3358,13 +3358,13 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)`
`3358`	`3358`	`* Scan the index and gather up all the TIDs into a tuplesort object.`
`3359`	`3359`	`*/`
`3360`	`3360`	`ivinfo.index=indexRelation;`
	`3361`	`+ivinfo.heaprel=heapRelation;`
`3361`	`3362`	`ivinfo.analyze_only= false;`
`3362`	`3363`	`ivinfo.report_progress= true;`
`3363`	`3364`	`ivinfo.estimated_count= true;`
`3364`	`3365`	`ivinfo.message_level=DEBUG2;`
`3365`	`3366`	`ivinfo.num_heap_tuples=heapRelation->rd_rel->reltuples;`
`3366`	`3367`	`ivinfo.strategy=NULL;`
`3367`		`-ivinfo.heaprel=heapRelation;`
`3368`	`3368`
`3369`	`3369`	`/*`
`3370`	`3370`	`* Encode TIDs as int8 values for the sort, rather than directly sorting`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -707,12 +707,12 @@ do_analyze_rel(Relation onerel, VacuumParams *params,`
`707`	`707`	`IndexVacuumInfoivinfo;`
`708`	`708`
`709`	`709`	`ivinfo.index=Irel[ind];`
	`710`	`+ivinfo.heaprel=onerel;`
`710`	`711`	`ivinfo.analyze_only= true;`
`711`	`712`	`ivinfo.estimated_count= true;`
`712`	`713`	`ivinfo.message_level=elevel;`
`713`	`714`	`ivinfo.num_heap_tuples=onerel->rd_rel->reltuples;`
`714`	`715`	`ivinfo.strategy=vac_strategy;`
`715`		`-ivinfo.heaprel=onerel;`
`716`	`716`
`717`	`717`	`stats=index_vacuum_cleanup(&ivinfo,NULL);`
`718`	`718`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -836,13 +836,13 @@ parallel_vacuum_process_one_index(ParallelVacuumState *pvs, Relation indrel,`
`836`	`836`	`istat=&(indstats->istat);`
`837`	`837`
`838`	`838`	`ivinfo.index=indrel;`
	`839`	`+ivinfo.heaprel=pvs->heaprel;`
`839`	`840`	`ivinfo.analyze_only= false;`
`840`	`841`	`ivinfo.report_progress= false;`
`841`	`842`	`ivinfo.message_level=DEBUG2;`
`842`	`843`	`ivinfo.estimated_count=pvs->shared->estimated_count;`
`843`	`844`	`ivinfo.num_heap_tuples=pvs->shared->reltuples;`
`844`	`845`	`ivinfo.strategy=pvs->bstrategy;`
`845`		`-ivinfo.heaprel=pvs->heaprel;`
`846`	`846`
`847`	`847`	`/* Update error traceback information */`
`848`	`848`	`pvs->indname=pstrdup(RelationGetRelationName(indrel));`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ typedef struct IndexBuildResult`
`44`	`44`	`typedefstructIndexVacuumInfo`
`45`	`45`	`{`
`46`	`46`	`Relationindex;/* the index being vacuumed */`
	`47`	`+Relationheaprel;/* the heap relation the index belongs to */`
`47`	`48`	`boolanalyze_only;/* ANALYZE (without any actual vacuum) */`
`48`	`49`	`boolreport_progress;/* emit progress.h status reports */`
`49`	`50`	`boolestimated_count;/* num_heap_tuples is an estimate */`
`50`	`51`	`intmessage_level;/* ereport level for progress messages */`
`51`	`52`	`doublenum_heap_tuples;/* tuples remaining in heap */`
`52`	`53`	`BufferAccessStrategystrategy;/* access strategy for reads */`
`53`		`-Relationheaprel;/* the heap relation the index belongs to */`
`54`	`54`	`}IndexVacuumInfo;`
`55`	`55`
`56`	`56`	`/*`

Comments

(0)