aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/access/heap/vacuumlazy.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index edda82abd01..af322c1f15c 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -462,23 +462,6 @@ heap_vacuum_rel(Relation onerel, VacuumParams *params,
if (params->options & VACOPT_DISABLE_PAGE_SKIPPING)
aggressive = true;
- /*
- * Normally the relfrozenxid for an anti-wraparound vacuum will be old
- * enough to force an aggressive vacuum. However, a concurrent vacuum
- * might have already done this work that the relfrozenxid in relcache has
- * been updated. If that happens this vacuum is redundant, so skip it.
- */
- if (params->is_wraparound && !aggressive)
- {
- ereport(DEBUG1,
- (errmsg("skipping redundant vacuum to prevent wraparound of table \"%s.%s.%s\"",
- get_database_name(MyDatabaseId),
- get_namespace_name(RelationGetNamespace(onerel)),
- RelationGetRelationName(onerel))));
- pgstat_progress_end_command();
- return;
- }
-
vacrelstats = (LVRelStats *) palloc0(sizeof(LVRelStats));
vacrelstats->relnamespace = get_namespace_name(RelationGetNamespace(onerel));
@@ -639,9 +622,10 @@ heap_vacuum_rel(Relation onerel, VacuumParams *params,
initStringInfo(&buf);
if (params->is_wraparound)
{
- /* an anti-wraparound vacuum has to be aggressive */
- Assert(aggressive);
- msgfmt = _("automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n");
+ if (aggressive)
+ msgfmt = _("automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n");
+ else
+ msgfmt = _("automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n");
}
else
{