NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit47029f7

committed

Remove unneeded old_rel_pages VACUUM state field.

The field hasn't been used since commit3d351d9, which redefinedpg_class.reltuples to be -1 before the first VACUUM or ANALYZE.Also rename a local variable of the same name ("old_rel_pages"). This isused by relation truncation to represent the original relation size atthe start of the ongoing VACUUM operation. Rename it to orig_rel_pages,since that's a lot clearer. (This name matches similar nearby code.)

1 parentaec5cc9 commit47029f7Copy full SHA for 47029f7

File tree

1 file changed

-11

lines changed

src/backend/access/heap
- vacuumlazy.c

1 file changed

-11

lines changed

`‎src/backend/access/heap/vacuumlazy.c`

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -323,12 +323,10 @@ typedef struct LVRelState`
`323`	`323`	`BufferAccessStrategybstrategy;`
`324`	`324`	`LVParallelState*lps;`
`325`	`325`
`326`		`-/* Statistics from pg_class when we start out */`
`327`		`-BlockNumberold_rel_pages;/* previous value of pg_class.relpages */`
`328`		`-doubleold_live_tuples;/* previous value of pg_class.reltuples */`
`329`	`326`	`/* rel's initial relfrozenxid and relminmxid */`
`330`	`327`	`TransactionIdrelfrozenxid;`
`331`	`328`	`MultiXactIdrelminmxid;`
	`329`	`+doubleold_live_tuples;/* previous value of pg_class.reltuples */`
`332`	`330`
`333`	`331`	`/* VACUUM operation's cutoff for pruning */`
`334`	`332`	`TransactionIdOldestXmin;`
`@@ -593,10 +591,9 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,`
`593`	`591`	`}`
`594`	`592`
`595`	`593`	`vacrel->bstrategy=bstrategy;`
`596`		`-vacrel->old_rel_pages=rel->rd_rel->relpages;`
`597`		`-vacrel->old_live_tuples=rel->rd_rel->reltuples;`
`598`	`594`	`vacrel->relfrozenxid=rel->rd_rel->relfrozenxid;`
`599`	`595`	`vacrel->relminmxid=rel->rd_rel->relminmxid;`
	`596`	`+vacrel->old_live_tuples=rel->rd_rel->reltuples;`
`600`	`597`
`601`	`598`	`/* Set cutoffs for entire VACUUM */`
`602`	`599`	`vacrel->OldestXmin=OldestXmin;`
`@@ -3182,7 +3179,7 @@ should_attempt_truncation(LVRelState *vacrel)`
`3182`	`3179`	`staticvoid`
`3183`	`3180`	`lazy_truncate_heap(LVRelState*vacrel)`
`3184`	`3181`	`{`
`3185`		`-BlockNumberold_rel_pages=vacrel->rel_pages;`
	`3182`	`+BlockNumberorig_rel_pages=vacrel->rel_pages;`
`3186`	`3183`	`BlockNumbernew_rel_pages;`
`3187`	`3184`	`boollock_waiter_detected;`
`3188`	`3185`	`intlock_retry;`
`@@ -3246,7 +3243,7 @@ lazy_truncate_heap(LVRelState *vacrel)`
`3246`	`3243`	`* the newly added pages presumably contain non-deletable tuples.`
`3247`	`3244`	`*/`
`3248`	`3245`	`new_rel_pages=RelationGetNumberOfBlocks(vacrel->rel);`
`3249`		`-if (new_rel_pages!=old_rel_pages)`
	`3246`	`+if (new_rel_pages!=orig_rel_pages)`
`3250`	`3247`	`{`
`3251`	`3248`	`/*`
`3252`	`3249`	`* Note: we intentionally don't update vacrel->rel_pages with the`
`@@ -3268,7 +3265,7 @@ lazy_truncate_heap(LVRelState *vacrel)`
`3268`	`3265`	`new_rel_pages=count_nondeletable_pages(vacrel,&lock_waiter_detected);`
`3269`	`3266`	`vacrel->blkno=new_rel_pages;`
`3270`	`3267`
`3271`		`-if (new_rel_pages >=old_rel_pages)`
	`3268`	`+if (new_rel_pages >=orig_rel_pages)`
`3272`	`3269`	`{`
`3273`	`3270`	`/* can't do anything after all */`
`3274`	`3271`	`UnlockRelation(vacrel->rel,AccessExclusiveLock);`
`@@ -3294,16 +3291,16 @@ lazy_truncate_heap(LVRelState *vacrel)`
`3294`	`3291`	`* without also touching reltuples, since the tuple count wasn't`
`3295`	`3292`	`* changed by the truncation.`
`3296`	`3293`	`*/`
`3297`		`-vacrel->pages_removed+=old_rel_pages-new_rel_pages;`
	`3294`	`+vacrel->pages_removed+=orig_rel_pages-new_rel_pages;`
`3298`	`3295`	`vacrel->rel_pages=new_rel_pages;`
`3299`	`3296`
`3300`	`3297`	`ereport(elevel,`
`3301`	`3298`	`(errmsg("\"%s\": truncated %u to %u pages",`
`3302`	`3299`	`vacrel->relname,`
`3303`		`-old_rel_pages,new_rel_pages),`
	`3300`	`+orig_rel_pages,new_rel_pages),`
`3304`	`3301`	`errdetail_internal("%s",`
`3305`	`3302`	`pg_rusage_show(&ru0))));`
`3306`		`-old_rel_pages=new_rel_pages;`
	`3303`	`+orig_rel_pages=new_rel_pages;`
`3307`	`3304`	`}while (new_rel_pages>vacrel->nonempty_pages&&lock_waiter_detected);`
`3308`	`3305`	`}`
`3309`	`3306`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit47029f7

File tree

1 file changed

1 file changed

`‎src/backend/access/heap/vacuumlazy.c`

0 commit comments