arenadata · RekGRpth · Sep 15, 2023 · Sep 26, 2023 · Sep 26, 2023 · Sep 26, 2023
diff --git a/.abi-check/6.27.1_arenadata58/postgres.symbols.ignore b/.abi-check/6.27.1_arenadata58/postgres.symbols.ignore
@@ -0,0 +1,2 @@
+ConfigureNamesBool_gp
+StdRdOptions
diff --git a/gpdb-doc/dita/ref_guide/config_params/guc-list.xml b/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
@@ -157,6 +157,8 @@
             </li>
             <li><xref href="#gp_add_column_inherits_table_setting"/>
             </li>
+            <li><xref href="#gp_add_partition_inherits_table_setting"/>
+            </li>
             <li>
               <xref href="#gp_adjust_selectivity_for_outerjoins"/>
             </li>
@@ -2261,6 +2263,61 @@
       </table>
     </body>
   </topic>
+  <topic id="gp_add_partition_inherits_table_setting">
+    <title>gp_add_partition_inherits_table_setting</title>
+    <body>
+      <p>When adding a partition to an append-optimized, row-oriented or column-oriented table with the <codeph><xref
+            href="../sql_commands/ALTER_TABLE.xml">ALTER TABLE</xref></codeph> command, this
+        parameter controls whether the table's parameters (<codeph>appendonly</codeph>, <codeph>orientation</codeph>,
+          <codeph>compresstype</codeph>, <codeph>compresslevel</codeph>, <codeph>checksum</codeph> and
+          <codeph>blocksize</codeph>) can be inherited from the table values. The default is
+          <codeph>off</codeph>, the table's settings are not considered when adding
+        a partition to the table. If the value is <codeph>on</codeph>, the table's settings are
+        considered. </p>
+      <p>When you create an append-optimized row-oriented or column-oriented table, you can set the table's
+        parameters <codeph>appendonly</codeph>, <codeph>orientation</codeph>, <codeph>compresstype</codeph>,
+          <codeph>compresslevel</codeph>, <codeph>checksum</codeph> and
+          <codeph>blocksize</codeph> for the table in the <codeph>WITH</codeph> clause. When you add
+        a partition, Greenplum Database sets each parameter based on one of the
+        following settings, in order of preference.<ol id="ol_hqk_l4w_kmc">
+          <li>The setting specified in the <codeph>ALTER TABLE</codeph> command
+              <codeph>WITH</codeph> clause.</li>
+          <li>If this server configuration parameter is set to <codeph>on</codeph>, the table's
+            setting specified in the <codeph>WITH</codeph> clause when the table was
+            created. Otherwise, the table's setting is ignored.</li>
+          <li>The setting specified in the server configuration parameter
+                <codeph><xref href="#gp_default_storage_options"
+              >gp_default_storage_options</xref></codeph>.</li>
+        </ol></p>
+      <p>You must specify <codeph>--skipvalidation</codeph> when modifying this parameter as it is a
+        restricted configuration parameter. Use extreme caution when setting configuration
+        parameters with this option. For
+        example:<codeblock>gpconfig --skipvalidation -c gp_add_partition_inherits_table_setting -v on</codeblock></p>
+      <p>For information about the storage parameters, see <codeph><xref
+            href="../sql_commands/CREATE_TABLE.xml">CREATE TABLE</xref></codeph>.</p>
+      <table id="table_nyn_wjd_lmc">
+        <tgroup cols="3">
+          <colspec colnum="1" colname="col1" colwidth="1*"/>
+          <colspec colnum="2" colname="col2" colwidth="1*"/>
+          <colspec colnum="3" colname="col3" colwidth="1*"/>
+          <thead>
+            <row>
+              <entry colname="col1">Value Range</entry>
+              <entry colname="col2">Default</entry>
+              <entry colname="col3">Set Classifications</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="col1">Boolean</entry>
+              <entry colname="col2">off</entry>
+              <entry colname="col3">master<p>session</p><p>reload</p></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </body>
+  </topic>
   <topic id="gp_adjust_selectivity_for_outerjoins">
     <title>gp_adjust_selectivity_for_outerjoins</title>
     <body>

diff --git a/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml b/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml
@@ -1363,6 +1363,8 @@
                   >max_appendonly_tables</xref>
               </p><xref href="guc-list.xml#gp_add_column_inherits_table_setting"
                 >gp_add_column_inherits_table_setting</xref>
+              <xref href="guc-list.xml#gp_add_partition_inherits_table_setting"
+                >gp_add_partition_inherits_table_setting</xref>
               <p>
                 <xref href="guc-list.xml#gp_appendonly_compaction" type="section"
                   >gp_appendonly_compaction</xref>

diff --git a/gpdb-doc/dita/ref_guide/config_params/guc_config.ditamap b/gpdb-doc/dita/ref_guide/config_params/guc_config.ditamap
@@ -77,6 +77,7 @@
             <topicref href="guc-list.xml#extra_float_digits"/>
             <topicref href="guc-list.xml#from_collapse_limit"/>
             <topicref href="guc-list.xml#gp_add_column_inherits_table_setting"/>
+            <topicref href="guc-list.xml#gp_add_partition_inherits_table_setting"/>
             <topicref href="guc-list.xml#gp_adjust_selectivity_for_outerjoins"/>
             <topicref href="guc-list.xml#gp_appendonly_compaction"/>
             <topicref href="guc-list.xml#gp_appendonly_compaction_threshold"/>

diff --git a/gpdb-doc/dita/ref_guide/sql_commands/ALTER_TABLE.xml b/gpdb-doc/dita/ref_guide/sql_commands/ALTER_TABLE.xml
@@ -786,7 +786,34 @@ where <varname>action</varname> is one of:
                                                 If the partitioned table was originally defined
                                                 using a subpartition template, then the template
                                                 will be used to generate the subpartitions
-                                                automatically.</pd>
+                                                automatically.
+                                                <p>When you add a partition to an
+                                                append-optimized, row-oriented or column-oriented table, Greenplum
+                                                Database sets each parameter (<codeph>appendonly</codeph>, <codeph>orientation</codeph>,
+                                                  <codeph>compresstype</codeph>,
+                                                  <codeph>compresslevel</codeph>, <codeph>checksum</codeph> and
+                                                  <codeph>blocksize</codeph>) based on the following
+                                                setting, in order of preference.<ol
+                                                  id="ol_hqk_l4w_kmc">
+                                                  <li>The parameter setting specified in
+                                                  the <codeph>ALTER TABLE</codeph> command
+                                                  <codeph>WITH</codeph> clause.</li>
+                                                  <li>If the server configuration parameter
+                                                  <codeph><xref
+                                                  href="../config_params/guc-list.xml#gp_add_partition_inherits_table_setting"
+                                                  >gp_add_partition_inherits_table_setting</xref></codeph>
+                                                  is <codeph>on</codeph>, use the table's
+                                                  parameters specified in the
+                                                  <codeph>WITH</codeph> clause when the table was
+                                                  created. The default server configuration
+                                                  parameter default is <codeph>off</codeph>, the
+                                                  <codeph>WITH</codeph> clause parameters are
+                                                  ignored.</li>
+                                                  <li>The parameter setting specified in
+                                                  the server configuration parameter <codeph><xref
+                                                  href="../config_params/guc-list.xml#gp_default_storage_options"
+                                                  >gp_default_storage_option</xref></codeph>.</li>
+                                                </ol></p></pd>
                                 </plentry>
                                 <plentry>
                                         <pt>EXCHANGE [DEFAULT] PARTITION</pt>

diff --git a/gpdb-doc/markdown/ref_guide/config_params/guc-list.html.md b/gpdb-doc/markdown/ref_guide/config_params/guc-list.html.md
@@ -437,6 +437,28 @@ For information about the data storage compression parameters, see [CREATE TABLE
 |-----------|-------|-------------------|
 |Boolean|off|master, session, reload|
 
+## <a id="gp_add_partition_inherits_table_setting"></a>gp\_add\_partition\_inherits\_table\_setting 
+
+When adding a partition to an append-optimized, row-oriented or column-oriented table with the [ALTER TABLE](../sql_commands/ALTER_TABLE.html) command, this parameter controls whether the table's parameters \(`appendonly`, `orientation`, `compresstype`, `compresslevel`, `checksum` and `blocksize`\) can be inherited from the table. The default is `off`, the table's settings are not considered when adding a partition to the table. If the value is `on`, the table's settings are considered.
+
+When you create an append-optimized row-oriented or column-oriented table, you can set the table's parameters `appendonly`, `orientation`, `compresstype`, `compresslevel`, `checksum` and `blocksize` for the table in the `WITH` clause. When you add a partition, Greenplum Database sets each parameter based on one of the following settings, in order of preference.
+
+1.  The setting specified in the `ALTER TABLE` command `WITH` clause.
+2.  If this server configuration parameter is set to `on`, the table's setting specified in the `WITH` clause when the table was created. Otherwise, the table's setting is ignored.
+3.  The setting specified in the server configuration parameter [gp\_default\_storage\_options](#gp_default_storage_options).
+
+You must specify `--skipvalidation` when modifying this parameter as it is a restricted configuration parameter. Use extreme caution when setting configuration parameters with this option. For example:
+
+```
+gpconfig --skipvalidation -c gp_add_partition_inherits_table_setting -v on
+```
+
+For information about the storage parameters, see [CREATE TABLE](../sql_commands/CREATE_TABLE.html).
+
+|Value Range|Default|Set Classifications|
+|-----------|-------|-------------------|
+|Boolean|off|master, session, reload|
+
 ## <a id="gp_adjust_selectivity_for_outerjoins"></a>gp\_adjust\_selectivity\_for\_outerjoins 
 
 Enables the selectivity of NULL tests over outer joins.

diff --git a/gpdb-doc/markdown/ref_guide/config_params/guc_category-list.html.md b/gpdb-doc/markdown/ref_guide/config_params/guc_category-list.html.md
@@ -450,6 +450,7 @@ The following parameters configure the append-optimized tables feature of Greenp
 
 - [max_appendonly_tables](guc-list.html#max_appendonly_tables)
 - [gp_add_column_inherits_table_setting](guc-list.html) [gp_appendonly_compaction](guc-list.html#gp_add_column_inherits_table_setting](guc-list.html) [gp_appendonly_compaction)
+- [gp_add_partition_inherits_table_setting](guc-list.html) [gp_appendonly_compaction](guc-list.html#gp_add_partition_inherits_table_setting](guc-list.html) [gp_appendonly_compaction)
 - [gp_appendonly_compaction_threshold](guc-list.html#gp_appendonly_compaction_threshold)
 - [validate_previous_free_tid](guc-list.html#validate_previous_free_tid)
 

diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
@@ -1225,7 +1225,9 @@ default_reloptions(Datum reloptions, bool validate, relopt_kind kind)
 		{"user_catalog_table", RELOPT_TYPE_BOOL,
 		offsetof(StdRdOptions, user_catalog_table)},
 		{SOPT_ANALYZEHLL, RELOPT_TYPE_BOOL,
-		offsetof(StdRdOptions, analyze_hll_non_part_table)}
+		offsetof(StdRdOptions, analyze_hll_non_part_table)},
+		{SOPT_INHERIT, RELOPT_TYPE_BOOL,
+		offsetof(StdRdOptions, inherit_table_options)}
 	};
 
 	options = parseRelOptions(reloptions, validate, kind, &numoptions);

diff --git a/src/backend/access/common/reloptions_gp.c b/src/backend/access/common/reloptions_gp.c
@@ -71,6 +71,14 @@ static relopt_bool boolRelOpts_gp[] =
 		},
 		ANALYZE_DEFAULT_HLL
 	},
+	{
+		{
+			SOPT_INHERIT,
+			"Inherit table options",
+			RELOPT_KIND_HEAP
+		},
+		INHERIT_DEFAULT
+	},
 	/* list terminator */
 	{{NULL}}
 };
@@ -613,7 +621,8 @@ transformAOStdRdOptions(StdRdOptions *opts, Datum withOpts)
 				foundComplevel = false,
 				foundChecksum = false,
 				foundOrientation = false,
-				foundAnalyzeHLL = false;
+				foundAnalyzeHLL = false,
+				foundInherit = false;
 
 	/*
 	 * withOpts must be parsed to see if an option was spcified in WITH()
@@ -744,6 +753,17 @@ transformAOStdRdOptions(StdRdOptions *opts, Datum withOpts)
 				astate = accumArrayResult(astate, d, false, TEXTOID,
 										  CurrentMemoryContext);
 			}
+			soptLen = strlen(SOPT_INHERIT);
+			if (withLen > soptLen &&
+				pg_strncasecmp(strval, SOPT_INHERIT, soptLen) == 0)
+			{
+				foundInherit = true;
+				d = CStringGetTextDatum(psprintf("%s=%s",
+												 SOPT_INHERIT,
+												 (opts->inherit_table_options ? "true" : "false")));
+				astate = accumArrayResult(astate, d, false, TEXTOID,
+										  CurrentMemoryContext);
+			}
 		}
 	}
 
@@ -821,6 +841,14 @@ transformAOStdRdOptions(StdRdOptions *opts, Datum withOpts)
 		astate = accumArrayResult(astate, d, false, TEXTOID,
 								  CurrentMemoryContext);
 	}
+	if ((opts->inherit_table_options != INHERIT_DEFAULT) && !foundInherit)
+	{
+		d = CStringGetTextDatum(psprintf("%s=%s",
+										 SOPT_INHERIT,
+										 (opts->inherit_table_options ? "true" : "false")));
+		astate = accumArrayResult(astate, d, false, TEXTOID,
+								  CurrentMemoryContext);
+	}
 	return astate ?
 		makeArrayResult(astate, CurrentMemoryContext) :
 		PointerGetDatum(NULL);
@@ -840,6 +868,7 @@ validate_and_adjust_options(StdRdOptions *result,
 	relopt_value *checksum_opt;
 	relopt_value *orientation_opt;
 	relopt_value *analyze_hll_non_part_table_opt;
+	relopt_value *inherit_table_options_opt;
 
 	/* fillfactor */
 	fillfactor_opt = get_option_set(options, num_options, SOPT_FILLFACTOR);
@@ -1106,6 +1135,16 @@ validate_and_adjust_options(StdRdOptions *result,
 					 errmsg("usage of parameter \"analyze_hll_non_part_table\" in a non relation object is not supported")));
 		result->analyze_hll_non_part_table = analyze_hll_non_part_table_opt->values.bool_val;
 	}
+	/* inherit_table_options */
+	inherit_table_options_opt = get_option_set(options, num_options, SOPT_INHERIT);
+	if (inherit_table_options_opt != NULL)
+	{
+		if (!KIND_IS_RELATION(kind))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("usage of parameter \"inherit\" in a non relation object is not supported")));
+		result->inherit_table_options = inherit_table_options_opt->values.bool_val;
+	}
 
 	if (result->appendonly && result->compresstype[0])
 		if (result->compresslevel == AO_DEFAULT_COMPRESSLEVEL)
@@ -1116,7 +1155,7 @@ void
 validate_and_refill_options(StdRdOptions *result, relopt_value *options,
 							int numrelopts, relopt_kind kind, bool validate)
 {
-	if (validate &&
+	if (validate && !get_option_set(options, numrelopts, SOPT_INHERIT) &&
 		ao_storage_opts_changed &&
 		KIND_IS_RELATION(kind))
 	{
@@ -1142,6 +1181,8 @@ validate_and_refill_options(StdRdOptions *result, relopt_value *options,
 			result->columnstore = ao_storage_opts.columnstore;
 		if (!(get_option_set(options, numrelopts, SOPT_ANALYZEHLL)))
 			result->analyze_hll_non_part_table = ao_storage_opts.analyze_hll_non_part_table;
+		// if (!(get_option_set(options, numrelopts, SOPT_INHERIT)))
+		// 	result->inherit_table_options = ao_storage_opts.inherit_table_options;
 	}
 
 	validate_and_adjust_options(result, options, numrelopts, kind, validate);

diff --git a/src/backend/cdb/cdbpartition.c b/src/backend/cdb/cdbpartition.c
@@ -6784,6 +6784,19 @@ atpxPartAddList(Relation rel,
 	if (pelem->storeAttr)
 		ct->options = (List *) ((AlterPartitionCmd *) pelem->storeAttr)->arg1;
 
+	if (gp_add_partition_inherits_table_setting && RelationIsAppendOptimized(rel))
+	{
+		ListCell *lc;
+
+		foreach(lc, reloptions_list(RelationGetRelid(rel)))
+		{
+			DefElem *de = lfirst(lc);
+
+			if (!reloptions_has_opt(ct->options, de->defname))
+				ct->options = lappend(ct->options, de);
+		}
+	}
+
 	ct->tableElts = list_concat(ct->tableElts, list_copy(colencs));
 
 	ct->oncommit = ONCOMMIT_NOOP;
@@ -7127,7 +7140,14 @@ atpxPartAddList(Relation rel,
 			else if (IsA(q, CreateStmt))
 			{
 				/* propagate owner */
-				((CreateStmt *) q)->ownerid = ownerid;
+				CreateStmt *ct = (CreateStmt *)q;
+				ct->ownerid = ownerid;
+
+				if (gp_add_partition_inherits_table_setting && RelationIsAppendOptimized(rel))
+				{
+					if (!reloptions_has_opt(ct->options, "inherit"))
+						ct->options = lappend(ct->options, makeDefElem("inherit", (Node *) makeString("true")));
+				}
 			}
 
 			/*

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -14419,7 +14419,7 @@ drop_parent_dependency(Oid relid, Oid refclassid, Oid refobjid, bool is_partitio
 /*
  * deparse pg_class.reloptions into a list.
  */
-static List *
+List *
 reloptions_list(Oid relid)
 {
 	Datum		reloptions;

diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
@@ -463,6 +463,8 @@ char	   *gp_default_storage_options = NULL;
 
 bool		gp_add_column_inherits_table_setting = false;
 
+bool		gp_add_partition_inherits_table_setting = false;
+
 int			writable_external_table_bufsize = 1024;
 
 bool		gp_external_enable_filter_pushdown = true;
@@ -3408,6 +3410,17 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"gp_add_partition_inherits_table_setting", PGC_USERSET, CUSTOM_OPTIONS,
+			gettext_noop("ALTER TABLE ADD PARTITION inherits storage setting from the AO table."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&gp_add_partition_inherits_table_setting,
+		false,
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL

diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h
@@ -42,6 +42,7 @@
 #define AO_DEFAULT_CHECKSUM       true
 #define AO_DEFAULT_COLUMNSTORE    false
 #define ANALYZE_DEFAULT_HLL       false
+#define INHERIT_DEFAULT           false
 
 /* types supported by reloptions */
 typedef enum relopt_type

diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h
@@ -769,6 +769,9 @@ extern bool gp_enable_motion_mk_sort;
 /* Alter table add column inherits storage setting from the table */
 extern bool gp_add_column_inherits_table_setting;
 
+/* Alter table add partition inherits storage setting from the table */
+extern bool gp_add_partition_inherits_table_setting;
+
 #ifdef USE_ASSERT_CHECKING
 extern bool gp_mk_sort_check;
 #endif

diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
@@ -137,4 +137,6 @@ extern void RangeVarCallbackOwnsRelation(const RangeVar *relation,
 							 Oid relId, Oid oldRelId, void *noCatalogs);
 
 extern List * rel_get_column_encodings(Relation rel);
+
+extern List * reloptions_list(Oid relid);
 #endif   /* TABLECMDS_H */
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
@@ -624,6 +624,7 @@ extern IndexCheckType gp_indexcheck_vacuum;
 /* Max number of chars needed to hold value of a storage option. */
 #define MAX_SOPT_VALUE_LEN 15
 #define SOPT_ANALYZEHLL    "analyze_hll_non_part_table"
+#define SOPT_INHERIT       "inherit"
 
 /*
  * Functions exported by guc.c

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
@@ -240,6 +240,7 @@ typedef struct StdRdOptions
 	int			check_option_offset;	/* for views */
 	bool		user_catalog_table;		/* use as an additional catalog
 										 * relation */
+	bool		inherit_table_options; 	/* inherit table options */
 } StdRdOptions;
 
 #define HEAP_MIN_FILLFACTOR			10

diff --git a/src/include/utils/sync_guc_name.h b/src/include/utils/sync_guc_name.h
@@ -129,3 +129,4 @@
 		"gp_add_column_inherits_table_setting",
 		"gp_resgroup_debug_wait_queue",
 		"gp_log_resqueue_priority_sleep_time",
+		"gp_add_partition_inherits_table_setting",