database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00
Code Activity

Remove unneeded old_rel_pages VACUUM state field.

Browse Source 
The field hasn't been used since commit 3d351d91, which redefined
pg_class.reltuples to be -1 before the first VACUUM or ANALYZE.

Also rename a local variable of the same name ("old_rel_pages"). This is
used by relation truncation to represent the original relation size at
the start of the ongoing VACUUM operation.  Rename it to orig_rel_pages,
since that's a lot clearer.  (This name matches similar nearby code.)
This commit is contained in:
Peter Geoghegan
2021-08-31 14:59:52 -07:00
parent aec5cc9efd
commit 47029f775a
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/access/heap/vacuumlazy.c
View File

@ -323,12 +323,10 @@ typedef struct LVRelState
BufferAccessStrategy bstrategy; BufferAccessStrategy bstrategy;
LVParallelState *lps; LVParallelState *lps;
/* Statistics from pg_class when we start out */
BlockNumber old_rel_pages; /* previous value of pg_class.relpages */
double old_live_tuples; /* previous value of pg_class.reltuples */
/* rel's initial relfrozenxid and relminmxid */ /* rel's initial relfrozenxid and relminmxid */
TransactionId relfrozenxid; TransactionId relfrozenxid;
MultiXactId relminmxid; MultiXactId relminmxid;
double old_live_tuples; /* previous value of pg_class.reltuples */
/* VACUUM operation's cutoff for pruning */ /* VACUUM operation's cutoff for pruning */
TransactionId OldestXmin; TransactionId OldestXmin;
@ -593,10 +591,9 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
} }
vacrel->bstrategy = bstrategy; vacrel->bstrategy = bstrategy;
vacrel->old_rel_pages = rel->rd_rel->relpages;
vacrel->old_live_tuples = rel->rd_rel->reltuples;
vacrel->relfrozenxid = rel->rd_rel->relfrozenxid; vacrel->relfrozenxid = rel->rd_rel->relfrozenxid;
vacrel->relminmxid = rel->rd_rel->relminmxid; vacrel->relminmxid = rel->rd_rel->relminmxid;
vacrel->old_live_tuples = rel->rd_rel->reltuples;
/* Set cutoffs for entire VACUUM */ /* Set cutoffs for entire VACUUM */
vacrel->OldestXmin = OldestXmin; vacrel->OldestXmin = OldestXmin;
@ -3182,7 +3179,7 @@ should_attempt_truncation(LVRelState *vacrel)
static void static void
lazy_truncate_heap(LVRelState *vacrel) lazy_truncate_heap(LVRelState *vacrel)
{ {
BlockNumber old_rel_pages = vacrel->rel_pages; BlockNumber orig_rel_pages = vacrel->rel_pages;
BlockNumber new_rel_pages; BlockNumber new_rel_pages;
bool lock_waiter_detected; bool lock_waiter_detected;
int lock_retry; int lock_retry;
@ -3246,7 +3243,7 @@ lazy_truncate_heap(LVRelState *vacrel)
* the newly added pages presumably contain non-deletable tuples. * the newly added pages presumably contain non-deletable tuples.
*/ */
new_rel_pages = RelationGetNumberOfBlocks(vacrel->rel); new_rel_pages = RelationGetNumberOfBlocks(vacrel->rel);
if (new_rel_pages != old_rel_pages) if (new_rel_pages != orig_rel_pages)
{ {
/* /*
* Note: we intentionally don't update vacrel->rel_pages with the * Note: we intentionally don't update vacrel->rel_pages with the
@ -3268,7 +3265,7 @@ lazy_truncate_heap(LVRelState *vacrel)
new_rel_pages = count_nondeletable_pages(vacrel, &lock_waiter_detected); new_rel_pages = count_nondeletable_pages(vacrel, &lock_waiter_detected);
vacrel->blkno = new_rel_pages; vacrel->blkno = new_rel_pages;
if (new_rel_pages >= old_rel_pages) if (new_rel_pages >= orig_rel_pages)
{ {
/* can't do anything after all */ /* can't do anything after all */
UnlockRelation(vacrel->rel, AccessExclusiveLock); UnlockRelation(vacrel->rel, AccessExclusiveLock);
@ -3294,16 +3291,16 @@ lazy_truncate_heap(LVRelState *vacrel)
* without also touching reltuples, since the tuple count wasn't * without also touching reltuples, since the tuple count wasn't
* changed by the truncation. * changed by the truncation.
*/ */
vacrel->pages_removed += old_rel_pages - new_rel_pages; vacrel->pages_removed += orig_rel_pages - new_rel_pages;
vacrel->rel_pages = new_rel_pages; vacrel->rel_pages = new_rel_pages;
ereport(elevel, ereport(elevel,
(errmsg("\"%s\": truncated %u to %u pages", (errmsg("\"%s\": truncated %u to %u pages",
vacrel->relname, vacrel->relname,
old_rel_pages, new_rel_pages), orig_rel_pages, new_rel_pages),
errdetail_internal("%s", errdetail_internal("%s",
pg_rusage_show(&ru0)))); pg_rusage_show(&ru0))));
old_rel_pages = new_rel_pages; orig_rel_pages = new_rel_pages;
} while (new_rel_pages > vacrel->nonempty_pages && lock_waiter_detected); } while (new_rel_pages > vacrel->nonempty_pages && lock_waiter_detected);
} }