PG17 compatibility: Resolve compilation issues (#7699)

This PR provides successful compilation against PG17.0.

- Remove ExecFreeExprContext call
Relevant PG commit
d060e921ea5aa47b6265174c32e1128cebdbc3df
postgres/postgres@d060e92

- PG17 uses streaming IO in analyze, fix scan_analyze_next_block function
Relevant PG commit
041b96802efa33d2bc9456f2ad946976b92b5ae1
postgres/postgres@041b968

- Define ObjectClass for PG17+ only since it's removed
Relevant PG commit:
89e5ef7e21812916c9cf9fcf56e45f0f74034656
postgres/postgres@89e5ef7

- Remove ReorderBufferTupleBuf structure.
Relevant PG commit:
08e6344fd6423210b339e92c069bb979ba4e7cd6
postgres/postgres@08e6344

- Define colliculocale and daticulocale since they have been renamed
Relevant PG commit:
f696c0cd5f299f1b51e214efc55a22a782cc175d
postgres/postgres@f696c0c

- makeStringConst defined in PG17
Relevant PG commit:
de3600452b61d1bc3967e9e37e86db8956c8f577
postgres/postgres@de36004

- RangeVarCallbackOwnsTable was replaced by RangeVarCallbackMaintainsTable
Relevant PG commit:
ecb0fd33720fab91df1207e85704f382f55e1eb7
postgres/postgres@ecb0fd3

- attstattarget is nullable, define pg compatible functions for it
Relevant PG commit:
4f622503d6de975ac87448aea5cea7de4bc140d5
postgres/postgres@4f62250

- stxstattarget is nullable in PG17, write compat functions for it
Relevant PG commit:
012460ee93c304fbc7220e5b55d9d0577fc766ab
postgres/postgres@012460e

- Use ResourceOwner to track WaitEventSet in PG17
Relevant PG commit:
50c67c2019ab9ade8aa8768bfe604cd802fe8591
postgres/postgres@50c67c2

- getIdentitySequence now uses Relation instead of relation_id
Relevant PG commit:
509199587df73f06eda898ae13284292f4ae573a
postgres/postgres@5091995

- Remove no-op tuplestore_donestoring function
Relevant PG commit:
75680c3d805e2323cd437ac567f0677fdfc7b680
postgres/postgres@75680c3

- MergeAction can have 3 merge kinds (now enum) in PG17, write compat
Relevant PG commit:
0294df2f1f842dfb0eed79007b21016f486a3c6c
postgres/postgres@0294df2

- EXPLAIN (MEMORY) is added, make changes to ExplainOnePlan
Relevant PG commit:
5de890e3610d5a12cdaea36413d967cf5c544e20
postgres/postgres@5de890e

- LIMIT_OPTION_DEFAULT has been removed as it's useless, use LIMIT_OPTION_COUNT
Relevant PG commit:
a6be0600ac3b71dda8277ab0fcbe59ee101ac1ce
postgres/postgres@a6be060

- write compat for create_foreignscan_path bcs of more arguments in PG17
Relevant PG commit:
9e9931d2bf40e2fea447d779c2e133c2c1256ef3
postgres/postgres@9e9931d

- pgprocno and lxid have been combined into a struct in PGPROC
Relevant PG commits:
28f3915b73f75bd1b50ba070f56b34241fe53fd1
postgres/postgres@28f3915

ab355e3a88de745607f6dd4c21f0119b5c68f2ad
postgres/postgres@ab355e3

024c521117579a6d356050ad3d78fdc95e44eefa
postgres/postgres@024c521

- Simplify CitusNewNode (#7434)
postgres refactored newNode() in PG 17, the main point for doing this is
the original tricks is no longer neccessary for modern compilers[1].
This does the same for Citus.
This should have no backward compatibility issues since it just replaces
palloc0fast with palloc0.
This is good for forward compatibility since palloc0fast no longer
exists in PG 17.
[1]
https://www.postgresql.org/message-id/[email protected]
(cherry picked from commit 4b295cc)

src/backend/columnar/columnar_customscan.c

@@ -1924,11 +1924,6 @@ ColumnarScan_EndCustomScan(CustomScanState *node)
 	 */
 	TableScanDesc scanDesc = node->ss.ss_currentScanDesc;
 
-	/*
-	 * Free the exprcontext
-	 */
-	ExecFreeExprContext(&node->ss.ps);
-
 	/*
 	 * clean out the tuple table
 	 */

src/backend/columnar/columnar_tableam.c

@@ -1424,8 +1424,13 @@ ConditionalLockRelationWithTimeout(Relation rel, LOCKMODE lockMode, int timeout,
 
 
 static bool
-columnar_scan_analyze_next_block(TableScanDesc scan, BlockNumber blockno,
+columnar_scan_analyze_next_block(TableScanDesc scan,
+#if PG_VERSION_NUM >= PG_VERSION_17
+								 ReadStream *stream)
+#else
+								 BlockNumber blockno,
 								 BufferAccessStrategy bstrategy)
+#endif
 {
 	/*
 	 * Our access method is not pages based, i.e. tuples are not confined

src/backend/distributed/cdc/cdc_decoder.c

@@ -22,6 +22,8 @@
 #include "utils/rel.h"
 #include "utils/typcache.h"
 
+#include "pg_version_constants.h"
+
 PG_MODULE_MAGIC;
 
 extern void _PG_output_plugin_init(OutputPluginCallbacks *cb);
@@ -435,6 +437,74 @@ TranslateChangesIfSchemaChanged(Relation sourceRelation, Relation targetRelation
 		return;
 	}
 
+#if PG_VERSION_NUM >= PG_VERSION_17
+
+	/* Check the ReorderBufferChange's action type and handle them accordingly.*/
+	switch (change->action)
+	{
+		case REORDER_BUFFER_CHANGE_INSERT:
+		{
+			/* For insert action, only new tuple should always be translated*/
+			HeapTuple sourceRelationNewTuple = change->data.tp.newtuple;
+			HeapTuple targetRelationNewTuple = GetTupleForTargetSchemaForCdc(
+				sourceRelationNewTuple, sourceRelationDesc, targetRelationDesc);
+			change->data.tp.newtuple = targetRelationNewTuple;
+			break;
+		}
+
+		/*
+		 * For update changes both old and new tuples need to be translated for target relation
+		 * if the REPLICA IDENTITY is set to FULL. Otherwise, only the new tuple needs to be
+		 * translated for target relation.
+		 */
+		case REORDER_BUFFER_CHANGE_UPDATE:
+		{
+			/* For update action, new tuple should always be translated*/
+			/* Get the new tuple from the ReorderBufferChange, and translate it to target relation. */
+			HeapTuple sourceRelationNewTuple = change->data.tp.newtuple;
+			HeapTuple targetRelationNewTuple = GetTupleForTargetSchemaForCdc(
+				sourceRelationNewTuple, sourceRelationDesc, targetRelationDesc);
+			change->data.tp.newtuple = targetRelationNewTuple;
+
+			/*
+			 * Format oldtuple according to the target relation. If the column values of replica
+			 * identiy change, then the old tuple is non-null and needs to be formatted according
+			 * to the target relation schema.
+			 */
+			if (change->data.tp.oldtuple != NULL)
+			{
+				HeapTuple sourceRelationOldTuple = change->data.tp.oldtuple;
+				HeapTuple targetRelationOldTuple = GetTupleForTargetSchemaForCdc(
+					sourceRelationOldTuple,
+					sourceRelationDesc,
+					targetRelationDesc);
+
+				change->data.tp.oldtuple = targetRelationOldTuple;
+			}
+			break;
+		}
+
+		case REORDER_BUFFER_CHANGE_DELETE:
+		{
+			/* For delete action, only old tuple should be translated*/
+			HeapTuple sourceRelationOldTuple = change->data.tp.oldtuple;
+			HeapTuple targetRelationOldTuple = GetTupleForTargetSchemaForCdc(
+				sourceRelationOldTuple,
+				sourceRelationDesc,
+				targetRelationDesc);
+
+			change->data.tp.oldtuple = targetRelationOldTuple;
+			break;
+		}
+
+		default:
+		{
+			/* Do nothing for other action types. */
+			break;
+		}
+	}
+#else
+
 	/* Check the ReorderBufferChange's action type and handle them accordingly.*/
 	switch (change->action)
 	{
@@ -499,4 +569,5 @@ TranslateChangesIfSchemaChanged(Relation sourceRelation, Relation targetRelation
 			break;
 		}
 	}
+#endif
 }

src/backend/distributed/commands/collation.c

@@ -77,7 +77,7 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
 	 * ICU-related field. Only the libc-related fields or the ICU-related field
 	 * is set, never both.
 	 */
-	char *colliculocale;
+	char *colllocale;
 	bool isnull;
 
 	Datum datum = SysCacheGetAttr(COLLOID, heapTuple, Anum_pg_collation_collcollate,
@@ -101,17 +101,17 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
 		collctype = NULL;
 	}
 
-	datum = SysCacheGetAttr(COLLOID, heapTuple, Anum_pg_collation_colliculocale, &isnull);
+	datum = SysCacheGetAttr(COLLOID, heapTuple, Anum_pg_collation_colllocale, &isnull);
 	if (!isnull)
 	{
-		colliculocale = TextDatumGetCString(datum);
+		colllocale = TextDatumGetCString(datum);
 	}
 	else
 	{
-		colliculocale = NULL;
+		colllocale = NULL;
 	}
 
-	Assert((collcollate && collctype) || colliculocale);
+	Assert((collcollate && collctype) || colllocale);
 #else
 
 	/*
@@ -147,12 +147,12 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
 					 *quotedCollationName, providerString);
 
 #if PG_VERSION_NUM >= PG_VERSION_15
-	if (colliculocale)
+	if (colllocale)
 	{
 		appendStringInfo(&collationNameDef,
 						 ", locale = %s",
-						 quote_literal_cstr(colliculocale));
-		pfree(colliculocale);
+						 quote_literal_cstr(colllocale));
+		pfree(colllocale);
 	}
 	else
 	{

src/backend/distributed/commands/role.c

@@ -71,7 +71,9 @@ static char * GetRoleNameFromDbRoleSetting(HeapTuple tuple,
 										   TupleDesc DbRoleSettingDescription);
 static char * GetDatabaseNameFromDbRoleSetting(HeapTuple tuple,
 											   TupleDesc DbRoleSettingDescription);
+#if PG_VERSION_NUM < PG_VERSION_17
 static Node * makeStringConst(char *str, int location);
+#endif
 static Node * makeIntConst(int val, int location);
 static Node * makeFloatConst(char *str, int location);
 static const char * WrapQueryInAlterRoleIfExistsCall(const char *query, RoleSpec *role);
@@ -949,6 +951,8 @@ PreprocessCreateRoleStmt(Node *node, const char *queryString,
 }
 
 
+#if PG_VERSION_NUM < PG_VERSION_17
+
 /*
  * makeStringConst creates a Const Node that stores a given string
  *
@@ -972,6 +976,9 @@ makeStringConst(char *str, int location)
 }
 
 
+#endif
+
+
 /*
  * makeIntConst creates a Const Node that stores a given integer
  *

src/backend/distributed/commands/statistics.c

@@ -651,14 +651,15 @@ GetAlterIndexStatisticsCommands(Oid indexOid)
 		}
 
 		Form_pg_attribute targetAttr = (Form_pg_attribute) GETSTRUCT(attTuple);
-		if (targetAttr->attstattarget != DEFAULT_STATISTICS_TARGET)
+		int32 targetAttstattarget = getAttstattarget_compat(attTuple);
+		if (targetAttstattarget != DEFAULT_STATISTICS_TARGET)
 		{
 			char *indexNameWithSchema = generate_qualified_relation_name(indexOid);
 
 			char *command =
 				GenerateAlterIndexColumnSetStatsCommand(indexNameWithSchema,
 														targetAttr->attnum,
-														targetAttr->attstattarget);
+														targetAttstattarget);
 
 			alterIndexStatisticsCommandList =
 				lappend(alterIndexStatisticsCommandList,
@@ -773,9 +774,10 @@ CreateAlterCommandIfTargetNotDefault(Oid statsOid)
 	}
 
 	Form_pg_statistic_ext statisticsForm = (Form_pg_statistic_ext) GETSTRUCT(tup);
+	int16 currentStxstattarget = getStxstattarget_compat(tup);
 	ReleaseSysCache(tup);
 
-	if (statisticsForm->stxstattarget == -1)
+	if (currentStxstattarget == -1)
 	{
 		return NULL;
 	}
@@ -785,7 +787,8 @@ CreateAlterCommandIfTargetNotDefault(Oid statsOid)
 	char *schemaName = get_namespace_name(statisticsForm->stxnamespace);
 	char *statName = NameStr(statisticsForm->stxname);
 
-	alterStatsStmt->stxstattarget = statisticsForm->stxstattarget;
+	alterStatsStmt->stxstattarget = getAlterStatsStxstattarget_compat(
+		currentStxstattarget);
 	alterStatsStmt->defnames = list_make2(makeString(schemaName), makeString(statName));
 
 	return DeparseAlterStatisticsStmt((Node *) alterStatsStmt);

src/backend/distributed/connection/connection_management.c

@@ -866,7 +866,8 @@ WaitEventSetFromMultiConnectionStates(List *connections, int *waitCount)
 		*waitCount = 0;
 	}
 
-	WaitEventSet *waitEventSet = CreateWaitEventSet(CurrentMemoryContext, eventSetSize);
+	WaitEventSet *waitEventSet = CreateWaitEventSet(WaitEventSetTracker_compat,
+													eventSetSize);
 	EnsureReleaseResource((MemoryContextCallbackFunction) (&FreeWaitEventSet),
 						  waitEventSet);
 

src/backend/distributed/connection/remote_commands.c

@@ -1130,7 +1130,7 @@ BuildWaitEventSet(MultiConnection **allConnections, int totalConnectionCount,
 
 	/* allocate pending connections + 2 for the signal latch and postmaster death */
 	/* (CreateWaitEventSet makes room for pgwin32_signal_event automatically) */
-	WaitEventSet *waitEventSet = CreateWaitEventSet(CurrentMemoryContext,
+	WaitEventSet *waitEventSet = CreateWaitEventSet(WaitEventSetTracker_compat,
 													pendingConnectionCount + 2);
 
 	for (int connectionIndex = 0; connectionIndex < pendingConnectionCount;

src/backend/distributed/deparser/citus_ruleutils.c

@@ -395,7 +395,8 @@ pg_get_tableschemadef_string(Oid tableRelationId, IncludeSequenceDefaults
 			if (attributeForm->attidentity && includeIdentityDefaults)
 			{
 				bool missing_ok = false;
-				Oid seqOid = getIdentitySequence(RelationGetRelid(relation),
+				Oid seqOid = getIdentitySequence(identitySequenceRelation_compat(
+													 relation),
 												 attributeForm->attnum, missing_ok);
 
 				if (includeIdentityDefaults == INCLUDE_IDENTITY)
@@ -738,15 +739,26 @@ pg_get_tablecolumnoptionsdef_string(Oid tableRelationId)
 			 * If the user changed the column's statistics target, create
 			 * alter statement and add statement to a list for later processing.
 			 */
-			if (attributeForm->attstattarget >= 0)
+			HeapTuple atttuple = SearchSysCache2(ATTNUM,
+												 ObjectIdGetDatum(tableRelationId),
+												 Int16GetDatum(attributeForm->attnum));
+			if (!HeapTupleIsValid(atttuple))
+			{
+				elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+					 attributeForm->attnum, tableRelationId);
+			}
+
+			int32 targetAttstattarget = getAttstattarget_compat(atttuple);
+			ReleaseSysCache(atttuple);
+			if (targetAttstattarget >= 0)
 			{
 				StringInfoData statement = { NULL, 0, 0, 0 };
 				initStringInfo(&statement);
 
 				appendStringInfo(&statement, "ALTER COLUMN %s ",
 								 quote_identifier(attributeName));
 				appendStringInfo(&statement, "SET STATISTICS %d",
-								 attributeForm->attstattarget);
+								 targetAttstattarget);
 
 				columnOptionList = lappend(columnOptionList, statement.data);
 			}

src/backend/distributed/deparser/deparse_statistics_stmts.c

@@ -177,8 +177,9 @@ AppendAlterStatisticsSchemaStmt(StringInfo buf, AlterObjectSchemaStmt *stmt)
 static void
 AppendAlterStatisticsStmt(StringInfo buf, AlterStatsStmt *stmt)
 {
-	appendStringInfo(buf, "ALTER STATISTICS %s SET STATISTICS %d", NameListToQuotedString(
-						 stmt->defnames), stmt->stxstattarget);
+	appendStringInfo(buf, "ALTER STATISTICS %s SET STATISTICS %d",
+					 NameListToQuotedString(stmt->defnames),
+					 getIntStxstattarget_compat(stmt->stxstattarget));
 }
 
 

src/backend/distributed/executor/adaptive_executor.c

@@ -4740,7 +4740,7 @@ BuildWaitEventSet(List *sessionList)
 	int eventSetSize = GetEventSetSize(sessionList);
 
 	WaitEventSet *waitEventSet =
-		CreateWaitEventSet(CurrentMemoryContext, eventSetSize);
+		CreateWaitEventSet(WaitEventSetTracker_compat, eventSetSize);
 
 	WorkerSession *session = NULL;
 	foreach_declared_ptr(session, sessionList)

src/backend/distributed/executor/query_stats.c

@@ -759,9 +759,6 @@ citus_query_stats(PG_FUNCTION_ARGS)
 
 	LWLockRelease(queryStats->lock);
 
-	/* clean up and return the tuplestore */
-	tuplestore_donestoring(tupstore);
-
 	return (Datum) 0;
 }
 

src/backend/distributed/planner/merge_planner.c

@@ -1475,7 +1475,7 @@ FetchAndValidateInsertVarIfExists(Oid targetRelationId, Query *query)
 	foreach_declared_ptr(action, query->mergeActionList)
 	{
 		/* Skip MATCHED clause as INSERTS are not allowed in it */
-		if (action->matched)
+		if (matched_compat(action))
 		{
 			continue;
 		}