mirror of
https://github.com/postgres/postgres.git
synced 2025-08-21 10:42:50 +03:00
Rationalize vacuuming options and parameters
We were involving the parser too much in setting up initial vacuuming parameters. This patch moves that responsibility elsewhere to simplify code, and also to make future additions easier. To do this, create a new struct VacuumParams which is filled just prior to vacuum execution, instead of at parse time; for user-invoked vacuuming this is set up in a new function ExecVacuum, while autovacuum sets it up by itself. While at it, add a new member VACOPT_SKIPTOAST to enum VacuumOption, only set by autovacuum, which is used to disable vacuuming of the toast table instead of the old do_toast parameter; this relieves the argument list of vacuum() and some callees a bit. This partially makes up for having added more arguments in an effort to avoid having autovacuum from constructing a VacuumStmt parse node. Author: Michael Paquier. Some tweaks by Álvaro Reviewed by: Robert Haas, Stephen Frost, Álvaro Herrera
This commit is contained in:
@@ -169,7 +169,7 @@ static bool heap_page_is_all_visible(Relation rel, Buffer buf,
|
||||
* and locked the relation.
|
||||
*/
|
||||
void
|
||||
lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
|
||||
lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
|
||||
BufferAccessStrategy bstrategy)
|
||||
{
|
||||
LVRelStats *vacrelstats;
|
||||
@@ -193,6 +193,8 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
|
||||
TransactionId new_frozen_xid;
|
||||
MultiXactId new_min_multi;
|
||||
|
||||
Assert(params != NULL);
|
||||
|
||||
/* measure elapsed time iff autovacuum logging requires it */
|
||||
if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
|
||||
{
|
||||
@@ -200,7 +202,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
|
||||
starttime = GetCurrentTimestamp();
|
||||
}
|
||||
|
||||
if (vacstmt->options & VACOPT_VERBOSE)
|
||||
if (options & VACOPT_VERBOSE)
|
||||
elevel = INFO;
|
||||
else
|
||||
elevel = DEBUG2;
|
||||
@@ -208,9 +210,10 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
|
||||
vac_strategy = bstrategy;
|
||||
|
||||
vacuum_set_xid_limits(onerel,
|
||||
vacstmt->freeze_min_age, vacstmt->freeze_table_age,
|
||||
vacstmt->multixact_freeze_min_age,
|
||||
vacstmt->multixact_freeze_table_age,
|
||||
params->freeze_min_age,
|
||||
params->freeze_table_age,
|
||||
params->multixact_freeze_min_age,
|
||||
params->multixact_freeze_table_age,
|
||||
&OldestXmin, &FreezeLimit, &xidFullScanLimit,
|
||||
&MultiXactCutoff, &mxactFullScanLimit);
|
||||
|
||||
|
Reference in New Issue
Block a user