agora inbox for [email protected]  

help / color / mirror / Atom feed

Re: [HACKERS] [PATCHES] fork/exec patch
793+ messages / 2 participants
[nested] [flat]

* Re: [HACKERS] [PATCHES] fork/exec patch
@ 2003-12-16 15:53  Magnus Hagander <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Magnus Hagander @ 2003-12-16 15:53 UTC (permalink / raw)
  To: Andrew Dunstan <[email protected]>; pgsql-hackers; pgsql-hackers-win32 <[email protected]>

> > If you need a response once it has actually run, then the 
> main thread 
> > needs to do signal polling now and then. This has the bad 
> sideeffect 
> > that the main thread will block completely until the signal is 
> > delivered, which might be a while.
> > 
> > I don't know what the semantics are for kill() on unix 
> there? And if 
> > it is sync, does postgresql actually need that property?
> > 
> 
> kill() should return success upon the signal being queued, as I 
> understand it - i.e. no sync.

Ok. That makes things a lot easier. THen it's just the question of how
fast we need to react.



> All this kind of answers my original question, by pointing 
> out the need 
> to poll one way or another, which is why I suggested that signal 
> emulation might be messy, and more complicated than the 
> fork/exec case.


That definitly makes it more complicated. However, IIRC the thread will
enter an "alerable state" at least for network I/O, and probably for
disk I/O. Can't seem to find a reference to this, though. If you use
queued user APCs (using QueueUserAPC()), from a separate signal-handling
thread, this should dispatch the signal handlers *fairly* fast. The
question is if "fairly fast" is good enough, or if "really fast" is
needed?

In that case, you might have to work either with poll-really-often
(ickk), or using manual thread exceptions (raelly messy).

It shouldn't need to be *too* messy, if you can live with possible
slowdowns (assuming the thread does go alertable on blocking I/O).
Possibly add a WaitForSingleObject() at some place in a loop to force it
there in some cases.



Looking some more on the os-fix2.cpp file (I read the thing as OS2 fix,
and thus ignored it), it seems they fire all signal handlers on a thread
of their own. Is the backend threadsafe enough that that is safe? If so,
that would do away with the nede to use QueueUserAPC() to make the call
execute on the main thread.



//Magnus



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread

* [PATCH v1 2/4] autovac: resolve relopts before vacuuming
@ 2025-06-23 19:42  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 793+ messages in thread

From: Nathan Bossart @ 2025-06-23 19:42 UTC (permalink / raw)

---
 src/backend/commands/vacuum.c       |  7 ++--
 src/backend/postmaster/autovacuum.c | 52 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33a33bf6b1c..0015b9ef4b0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -421,7 +421,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 	/*
 	 * Later, in vacuum_rel(), we check if a reloption override was specified.
 	 */
-	params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+	params.max_eager_freeze_failure_rate = -1.0;
 
 	/*
 	 * Create special memory context for cross-transaction storage.
@@ -2195,10 +2195,13 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams *params,
 	 * Check if the vacuum_max_eager_freeze_failure_rate table storage
 	 * parameter was specified. This overrides the GUC value.
 	 */
-	if (rel->rd_options != NULL &&
+	if (params->max_eager_freeze_failure_rate < 0 &&
+		rel->rd_options != NULL &&
 		((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate >= 0)
 		params->max_eager_freeze_failure_rate =
 			((StdRdOptions *) rel->rd_options)->vacuum_max_eager_freeze_failure_rate;
+	else
+		params->max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
 
 	/*
 	 * Set truncate option based on truncate reloption or GUC if it wasn't
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index f86c9fed853..3bedca971ff 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2758,6 +2758,9 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		int			multixact_freeze_table_age;
 		int			log_min_duration;
 		AutoVacOpts *avopts = (relopts ? &relopts->autovacuum : NULL);
+		VacOptValue index_cleanup;
+		VacOptValue truncate;
+		double		max_eager_freeze_failure_rate;
 
 		/*
 		 * Calculate the vacuum cost parameters and the freeze ages.  If there
@@ -2790,6 +2793,39 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			? avopts->multixact_freeze_table_age
 			: default_multixact_freeze_table_age;
 
+		if (relopts)
+		{
+			switch (relopts->vacuum_index_cleanup)
+			{
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO:
+					index_cleanup = VACOPTVALUE_AUTO;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_ON:
+					index_cleanup = VACOPTVALUE_ENABLED;
+					break;
+				case STDRD_OPTION_VACUUM_INDEX_CLEANUP_OFF:
+					index_cleanup = VACOPTVALUE_DISABLED;
+					break;
+			}
+		}
+		else
+			index_cleanup = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_truncate_set)
+		{
+			if (relopts->vacuum_truncate)
+				truncate = VACOPTVALUE_ENABLED;
+			else
+				truncate = VACOPTVALUE_DISABLED;
+		}
+		else
+			truncate = VACOPTVALUE_UNSPECIFIED;
+
+		if (relopts && relopts->vacuum_max_eager_freeze_failure_rate >= 0)
+			max_eager_freeze_failure_rate = relopts->vacuum_max_eager_freeze_failure_rate;
+		else
+			max_eager_freeze_failure_rate = -1.0;
+
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
 		tab->at_sharedrel = classForm->relisshared;
@@ -2806,13 +2842,8 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 			(doanalyze ? VACOPT_ANALYZE : 0) |
 			(!wraparound ? VACOPT_SKIP_LOCKED : 0);
 
-		/*
-		 * index_cleanup and truncate are unspecified at first in autovacuum.
-		 * They will be filled in with usable values using their reloptions
-		 * (or reloption defaults) later.
-		 */
-		tab->at_params.index_cleanup = VACOPTVALUE_UNSPECIFIED;
-		tab->at_params.truncate = VACOPTVALUE_UNSPECIFIED;
+		tab->at_params.index_cleanup = index_cleanup;
+		tab->at_params.truncate = truncate;
 		/* As of now, we don't support parallel vacuum for autovacuum */
 		tab->at_params.nworkers = -1;
 		tab->at_params.freeze_min_age = freeze_min_age;
@@ -2822,12 +2853,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
 		tab->at_params.is_wraparound = wraparound;
 		tab->at_params.log_min_duration = log_min_duration;
 		tab->at_params.toast_parent = InvalidOid;
-
-		/*
-		 * Later, in vacuum_rel(), we check reloptions for any
-		 * vacuum_max_eager_freeze_failure_rate override.
-		 */
-		tab->at_params.max_eager_freeze_failure_rate = vacuum_max_eager_freeze_failure_rate;
+		tab->at_params.max_eager_freeze_failure_rate = max_eager_freeze_failure_rate;
 		tab->at_storage_param_vac_cost_limit = avopts ?
 			avopts->vacuum_cost_limit : 0;
 		tab->at_storage_param_vac_cost_delay = avopts ?
-- 
2.39.5 (Apple Git-154)


--QWBYbd5Ar5k8NvSv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=v1-0003-autovac-combine-reloptions-correctly.patch



^ permalink  raw  reply  [nested|flat] 793+ messages in thread