1 files changed, 35 insertions, 114 deletions

diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 24245f71728..d6eb5d85599 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -24,7 +24,6 @@
 #include "access/nbtree.h"
 #include "access/reloptions.h"
 #include "access/spgist_private.h"
-#include "access/tableam.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "commands/tablespace.h"
@@ -45,7 +44,7 @@
  * value, upper and lower bounds (if applicable); for strings, consider a
  * validation routine.
  * (ii) add a record below (or use add_<type>_reloption).
- * (iii) add it to the appropriate options struct (perhaps HeapRdOptions)
+ * (iii) add it to the appropriate options struct (perhaps StdRdOptions)
  * (iv) add it to the appropriate handling routine (perhaps
  * default_reloptions)
  * (v) make sure the lock level is set correctly for that operation
@@ -1375,16 +1374,10 @@ untransformRelOptions(Datum options)
  * tupdesc is pg_class' tuple descriptor.  amoptions is a pointer to the index
  * AM's options parser function in the case of a tuple corresponding to an
  * index, or NULL otherwise.
- *
- * If common pointer is provided, then the corresponding struct will be
- * filled with options that table AM exposes for external usage.  That must
- * be filled with defaults before passing here.
  */
-
 bytea *
 extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,
-				  const TableAmRoutine *tableam, amoptions_function amoptions,
-				  CommonRdOptions *common)
+				  amoptions_function amoptions)
 {
 	bytea	   *options;
 	bool		isnull;
@@ -1406,8 +1399,7 @@ extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,
 		case RELKIND_RELATION:
 		case RELKIND_TOASTVALUE:
 		case RELKIND_MATVIEW:
-			options = tableam_reloptions(tableam, classForm->relkind,
-										 datum, common, false);
+			options = heap_reloptions(classForm->relkind, datum, false);
 			break;
 		case RELKIND_PARTITIONED_TABLE:
 			options = partitioned_table_reloptions(datum, false);
@@ -1703,7 +1695,7 @@ parse_one_reloption(relopt_value *option, char *text_str, int text_len,
  * Given the result from parseRelOptions, allocate a struct that's of the
  * specified base size plus any extra space that's needed for string variables.
  *
- * "base" should be sizeof(struct) of the reloptions struct (HeapRdOptions or
+ * "base" should be sizeof(struct) of the reloptions struct (StdRdOptions or
  * equivalent).
  */
 static void *
@@ -1840,95 +1832,59 @@ fillRelOptions(void *rdopts, Size basesize,
 
 
 /*
- * Option parser for anything that uses HeapRdOptions.
+ * Option parser for anything that uses StdRdOptions.
  */
-static bytea *
+bytea *
 default_reloptions(Datum reloptions, bool validate, relopt_kind kind)
 {
 	static const relopt_parse_elt tab[] = {
-		{"fillfactor", RELOPT_TYPE_INT, offsetof(HeapRdOptions, fillfactor)},
+		{"fillfactor", RELOPT_TYPE_INT, offsetof(StdRdOptions, fillfactor)},
 		{"autovacuum_enabled", RELOPT_TYPE_BOOL,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, enabled)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, enabled)},
 		{"autovacuum_vacuum_threshold", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_threshold)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_threshold)},
 		{"autovacuum_vacuum_insert_threshold", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_ins_threshold)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_ins_threshold)},
 		{"autovacuum_analyze_threshold", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, analyze_threshold)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, analyze_threshold)},
 		{"autovacuum_vacuum_cost_limit", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_cost_limit)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_cost_limit)},
 		{"autovacuum_freeze_min_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, freeze_min_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_min_age)},
 		{"autovacuum_freeze_max_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, freeze_max_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_max_age)},
 		{"autovacuum_freeze_table_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, freeze_table_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_table_age)},
 		{"autovacuum_multixact_freeze_min_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, multixact_freeze_min_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_min_age)},
 		{"autovacuum_multixact_freeze_max_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, multixact_freeze_max_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_max_age)},
 		{"autovacuum_multixact_freeze_table_age", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, multixact_freeze_table_age)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_table_age)},
 		{"log_autovacuum_min_duration", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, log_min_duration)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, log_min_duration)},
 		{"toast_tuple_target", RELOPT_TYPE_INT,
-		offsetof(HeapRdOptions, toast_tuple_target)},
+		offsetof(StdRdOptions, toast_tuple_target)},
 		{"autovacuum_vacuum_cost_delay", RELOPT_TYPE_REAL,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_cost_delay)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_cost_delay)},
 		{"autovacuum_vacuum_scale_factor", RELOPT_TYPE_REAL,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_scale_factor)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_scale_factor)},
 		{"autovacuum_vacuum_insert_scale_factor", RELOPT_TYPE_REAL,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, vacuum_ins_scale_factor)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_ins_scale_factor)},
 		{"autovacuum_analyze_scale_factor", RELOPT_TYPE_REAL,
-			offsetof(HeapRdOptions, common) +
-			offsetof(CommonRdOptions, autovacuum) +
-		offsetof(AutoVacOpts, analyze_scale_factor)},
+		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, analyze_scale_factor)},
 		{"user_catalog_table", RELOPT_TYPE_BOOL,
-			offsetof(HeapRdOptions, common) +
-		offsetof(CommonRdOptions, user_catalog_table)},
+		offsetof(StdRdOptions, user_catalog_table)},
 		{"parallel_workers", RELOPT_TYPE_INT,
-			offsetof(HeapRdOptions, common) +
-		offsetof(CommonRdOptions, parallel_workers)},
+		offsetof(StdRdOptions, parallel_workers)},
 		{"vacuum_index_cleanup", RELOPT_TYPE_ENUM,
-			offsetof(HeapRdOptions, common) +
-		offsetof(CommonRdOptions, vacuum_index_cleanup)},
+		offsetof(StdRdOptions, vacuum_index_cleanup)},
 		{"vacuum_truncate", RELOPT_TYPE_BOOL,
-			offsetof(HeapRdOptions, common) +
-		offsetof(CommonRdOptions, vacuum_truncate)}
+		offsetof(StdRdOptions, vacuum_truncate)}
 	};
 
 	return (bytea *) build_reloptions(reloptions, validate, kind,
-									  sizeof(HeapRdOptions),
+									  sizeof(StdRdOptions),
 									  tab, lengthof(tab));
 }
 
@@ -2057,64 +2013,29 @@ view_reloptions(Datum reloptions, bool validate)
 }
 
 /*
- * Fill CommonRdOptions with the default values.
- */
-void
-fill_default_common_reloptions(CommonRdOptions *common)
-{
-	common->autovacuum.enabled = true;
-	common->autovacuum.vacuum_threshold = -1;
-	common->autovacuum.vacuum_ins_threshold = -2;
-	common->autovacuum.analyze_threshold = -1;
-	common->autovacuum.vacuum_cost_limit = -1;
-	common->autovacuum.freeze_min_age = -1;
-	common->autovacuum.freeze_max_age = -1;
-	common->autovacuum.freeze_table_age = -1;
-	common->autovacuum.multixact_freeze_min_age = -1;
-	common->autovacuum.multixact_freeze_max_age = -1;
-	common->autovacuum.multixact_freeze_table_age = -1;
-	common->autovacuum.log_min_duration = -1;
-	common->autovacuum.vacuum_cost_delay = -1;
-	common->autovacuum.vacuum_scale_factor = -1;
-	common->autovacuum.vacuum_ins_scale_factor = -1;
-	common->autovacuum.analyze_scale_factor = -1;
-	common->parallel_workers = -1;
-	common->user_catalog_table = false;
-	common->vacuum_index_cleanup = STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO;
-	common->vacuum_truncate = true;
-}
-
-/*
  * Parse options for heaps, views and toast tables.
  */
 bytea *
-heap_reloptions(char relkind, Datum reloptions,
-				CommonRdOptions *common, bool validate)
+heap_reloptions(char relkind, Datum reloptions, bool validate)
 {
-	HeapRdOptions *rdopts;
+	StdRdOptions *rdopts;
 
 	switch (relkind)
 	{
 		case RELKIND_TOASTVALUE:
-			rdopts = (HeapRdOptions *)
+			rdopts = (StdRdOptions *)
 				default_reloptions(reloptions, validate, RELOPT_KIND_TOAST);
 			if (rdopts != NULL)
 			{
 				/* adjust default-only parameters for TOAST relations */
 				rdopts->fillfactor = 100;
-				rdopts->common.autovacuum.analyze_threshold = -1;
-				rdopts->common.autovacuum.analyze_scale_factor = -1;
+				rdopts->autovacuum.analyze_threshold = -1;
+				rdopts->autovacuum.analyze_scale_factor = -1;
 			}
-			if (rdopts != NULL && common != NULL)
-				*common = rdopts->common;
 			return (bytea *) rdopts;
 		case RELKIND_RELATION:
 		case RELKIND_MATVIEW:
-			rdopts = (HeapRdOptions *)
-				default_reloptions(reloptions, validate, RELOPT_KIND_HEAP);
-			if (rdopts != NULL && common != NULL)
-				*common = rdopts->common;
-			return (bytea *) rdopts;
+			return default_reloptions(reloptions, validate, RELOPT_KIND_HEAP);
 		default:
 			/* other relkinds are not supported */
 			return NULL;