Merge branch 'main' into gp_relsizes_stats

Author: Vlasdislav

src/backend/access/common/reloptions_gp.c

@@ -1791,7 +1791,7 @@ transformColumnEncoding(const TableAmRoutine *tam, Relation rel, List *colDefs,
 	return result;
 }
 
-List* transfromColumnEncodingAocoRootPartition(List *colDefs, List *stenc, List *withOptions, bool errorOnEncodingClause)
+List* transformColumnEncodingAocoRootPartition(List *colDefs, List *stenc, List *withOptions, bool errorOnEncodingClause)
 {
 	ColumnReferenceStorageDirective *deflt = NULL;
 	ListCell   *lc;

src/backend/commands/tablecmds.c

@@ -1183,7 +1183,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 		 * table access method. The partition table will have the same behaviors on
 		 * relam, reloptions, attribute encodings in the future.
 		 */
-		stmt->attr_encodings = transfromColumnEncodingAocoRootPartition(schema,
+		stmt->attr_encodings = transformColumnEncodingAocoRootPartition(schema,
 								stmt->attr_encodings,
 								stmt->options,
 								!AMHandlerIsAoCols(amHandlerOid)

src/backend/commands/vacuum_ao.c

@@ -224,6 +224,14 @@ ao_vacuum_rel_pre_cleanup(Relation onerel, VacuumParams *params, BufferAccessStr
 	 */
 	ao_vacuum_rel_recycle_dead_segments(onerel, params, bstrategy, vacrelstats);
 
+	/*
+	 * Make the pg_aoseg updates above visible to AppendOptimizedTruncateToEOF's
+	 * catalog snapshot; without this the zeroed-eof rows are invisible (same
+	 * CommandId) and the old non-zero-eof rows appear live, triggering "file
+	 * size smaller than logical eof".
+	 */
+	CommandCounterIncrement();
+
 	/*
 	 * Also truncate all live segments to the EOF values stored in pg_aoseg.
 	 * This releases space left behind by aborted inserts.

src/backend/optimizer/util/plancat.c

@@ -1621,8 +1621,10 @@ GetExtStatisticsName(Oid statOid)
 		elog(ERROR, "cache lookup failed for statistics object %u", statOid);
 
 	staForm = (Form_pg_statistic_ext) GETSTRUCT(htup);
+	/* Copy the name before releasing the cache entry. */
+	char *result = pstrdup(NameStr(staForm->stxname));
 	ReleaseSysCache(htup);
-	return NameStr(staForm->stxname);
+	return result;
 }
 
 /*

src/backend/parser/parse_partition_gp.c

@@ -1687,7 +1687,7 @@ generatePartitions(Oid parentrelid, GpPartitionDefinition *gpPartSpec,
 			if (elem->accessMethod && strcmp(elem->accessMethod, "ao_column") == 0)
 				elem->colencs = merge_partition_encoding(pstate, elem->colencs, penc_cls);
 			else if (!elem->colencs) {
-				/* For the aoco, used `transfromColumnEncodingAocoRootPartition` to
+				/* For the aoco, used `transformColumnEncodingAocoRootPartition` to
 				 * pass encoding clause in root partition. The logic in that method is
 				 * relate to aoco that means it only validate and pass the aoco encoding
 				 * clause options. So we have to give up pass root partition encoding

src/include/access/reloptions.h

@@ -306,7 +306,7 @@ extern List *transformColumnEncoding(const TableAmRoutine *tam, Relation rel, Li
 										List *stenc, List *withOptions, List *parentenc,
 										bool explicitOnly, bool createDefaultOne, bool appendonly);
 
-List* transfromColumnEncodingAocoRootPartition(List *colDefs, List *stenc, List *withOptions, bool errorOnEncodingClause);
+List* transformColumnEncodingAocoRootPartition(List *colDefs, List *stenc, List *withOptions, bool errorOnEncodingClause);
 
 extern List *transformStorageEncodingClause(List *options, bool validate);
 extern List *form_default_storage_directive(List *enc);