Merge bcabf9175d into 31911d8297

.devcontainer/Dockerfile

@@ -113,10 +113,10 @@ FROM base AS uncrustify-builder
 RUN sudo apt update && sudo apt install -y cmake tree
 
 WORKDIR /uncrustify
-RUN curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz | tar xz
+RUN curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz | tar xz
-WORKDIR /uncrustify/uncrustify-uncrustify-0.68.1/
+WORKDIR /uncrustify/uncrustify-uncrustify-0.82.0/
 RUN mkdir build
-WORKDIR /uncrustify/uncrustify-uncrustify-0.68.1/build/
+WORKDIR /uncrustify/uncrustify-uncrustify-0.82.0/build/
 RUN cmake ..
 RUN MAKEFLAGS="-j $(nproc)" make -s
 

.github/workflows/build_and_test.yml

@@ -32,7 +32,7 @@ jobs:
       style_checker_image_name: "ghcr.io/citusdata/stylechecker"
       style_checker_tools_version: "0.8.18"
       sql_snapshot_pg_version: "17.6"
-      image_suffix: "-va20872f"
+      image_suffix: "-dev-7ba2db1"
       pg15_version: '{ "major": "15", "full": "15.14" }'
       pg16_version: '{ "major": "16", "full": "16.10" }'
       pg17_version: '{ "major": "17", "full": "17.6" }'

STYLEGUIDE.md

@@ -11,9 +11,9 @@ tool. This tool uses `uncrustify` under the hood.
 
 ```bash
 # Uncrustify changes the way it formats code every release a bit. To make sure
-# everyone formats consistently we use version 0.68.1:
+# everyone formats consistently we use version 0.82.0:
-curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz | tar xz
+curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz | tar xz
-cd uncrustify-uncrustify-0.68.1/
+cd uncrustify-uncrustify-0.82.0/
 mkdir build
 cd build
 cmake ..

src/backend/columnar/columnar_metadata.c

@@ -1332,7 +1332,8 @@ ColumnarRelationId(Oid relid, RelFileLocator relfilelocator)
 {
 	return OidIsValid(relid) ? relid : RelidByRelfilenumber(RelationTablespace_compat(
 																relfilelocator),
-															RelationPhysicalIdentifierNumber_compat(
+															RelationPhysicalIdentifierNumber_compat
+															(
 																relfilelocator));
 }
 

src/backend/columnar/columnar_reader.c

@@ -758,9 +758,11 @@ SnapshotMightSeeUnflushedStripes(Snapshot snapshot)
 		}
 
 		default:
+		{
 			return false;
 		}
 	}
+}
 
 
 /*

src/backend/columnar/columnar_storage.c

@@ -547,7 +547,8 @@ ColumnarStorageTruncate(Relation rel, uint64 newDataReservation)
 	if (!ColumnarLogicalOffsetIsValid(newDataReservation))
 	{
 		elog(ERROR,
-			 "attempted to truncate relation %d to invalid logical offset: " UINT64_FORMAT,
+			 "attempted to truncate relation %d to invalid logical offset: " UINT64_FORMAT
+			 ,
 			 rel->rd_id, newDataReservation);
 	}
 

src/backend/columnar/columnar_tableam.c

@@ -2410,10 +2410,11 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
 		}
 
 		default:
-
+		{
 			/* FALL THROUGH */
 			break;
 		}
+	}
 
 	if (columnarOptions != NIL && columnarRangeVar == NULL)
 	{

src/backend/distributed/commands/alter_table.c

@@ -185,8 +185,8 @@ typedef struct TableConversionState
 
 
 static TableConversionReturn * AlterDistributedTable(TableConversionParameters *params);
-static TableConversionReturn * AlterTableSetAccessMethod(
+static TableConversionReturn * AlterTableSetAccessMethod(TableConversionParameters *params
-	TableConversionParameters *params);
+														 );
 static TableConversionReturn * ConvertTable(TableConversionState *con);
 static TableConversionReturn * ConvertTableInternal(TableConversionState *con);
 static bool SwitchToSequentialAndLocalExecutionIfShardNameTooLong(char *relationName,
@@ -216,7 +216,8 @@ static void ErrorIfMatViewSizeExceedsTheLimit(Oid matViewOid);
 static char * CreateMaterializedViewDDLCommand(Oid matViewOid);
 static char * GetAccessMethodForMatViewIfExists(Oid viewOid);
 static bool WillRecreateForeignKeyToReferenceTable(Oid relationId,
-												   CascadeToColocatedOption cascadeOption);
+												   CascadeToColocatedOption cascadeOption)
+;
 static void WarningsForDroppingForeignKeysWithDistributedTables(Oid relationId);
 static void ErrorIfUnsupportedCascadeObjects(Oid relationId);
 static List * WrapTableDDLCommands(List *commandStrings);
@@ -506,7 +507,8 @@ UndistributeTable(TableConversionParameters *params)
 		IsCitusTableType(params->relationId, SINGLE_SHARD_DISTRIBUTED))
 	{
 		EnsureUndistributeTenantTableSafe(params->relationId,
-										  TenantOperationNames[TENANT_UNDISTRIBUTE_TABLE]);
+										  TenantOperationNames[TENANT_UNDISTRIBUTE_TABLE])
+		;
 	}
 
 	if (!params->cascadeViaForeignKeys)

src/backend/distributed/commands/common.c

@@ -64,8 +64,8 @@ PostprocessCreateDistributedObjectFromCatalogStmt(Node *stmt, const char *queryS
 		return NIL;
 	}
 
-	if (ops->qualify && DistOpsValidityState(stmt, ops) ==
+	if (ops->qualify && DistOpsValidityState(stmt, ops) == ShouldQualifyAfterLocalCreation
-		ShouldQualifyAfterLocalCreation)
+		)
 	{
 		/* qualify the statement after local creation */
 		ops->qualify(stmt);

src/backend/distributed/commands/create_distributed_table.c

@@ -703,7 +703,8 @@ EnsureColocateWithTableIsValid(Oid relationId, char distributionMethod,
 	 * the relation because the distribution column can be modified in that period.
 	 */
 	Oid distributionColumnType = ColumnTypeIdForRelationColumnName(relationId,
-																   distributionColumnName);
+																   distributionColumnName)
+	;
 
 	text *colocateWithTableNameText = cstring_to_text(colocateWithTableName);
 	Oid colocateWithTableId = ResolveRelationId(colocateWithTableNameText, false);
@@ -1108,8 +1109,8 @@ CreateCitusTable(Oid relationId, CitusTableType tableType,
 				 DistributedTableParams *distributedTableParams)
 {
 	if ((tableType == HASH_DISTRIBUTED || tableType == APPEND_DISTRIBUTED ||
-		 tableType == RANGE_DISTRIBUTED || tableType == SINGLE_SHARD_DISTRIBUTED) !=
+		 tableType == RANGE_DISTRIBUTED || tableType == SINGLE_SHARD_DISTRIBUTED) != (
-		(distributedTableParams != NULL))
+			distributedTableParams != NULL))
 	{
 		ereport(ERROR, (errmsg("distributed table params must be provided "
 							   "when creating a distributed table and must "

src/backend/distributed/commands/distribute_object_ops.c

@@ -2165,9 +2165,11 @@ GetDistributeObjectOps(Node *node)
 				}
 
 				default:
+				{
 					return &Any_SecLabel;
 				}
 			}
+		}
 
 		case T_RenameStmt:
 		{

src/backend/distributed/commands/function.c

@@ -108,7 +108,8 @@ static void DistributeFunctionColocatedWithDistributedTable(RegProcedure funcOid
 															const ObjectAddress *
 															functionAddress);
 static void DistributeFunctionColocatedWithSingleShardTable(const
-															ObjectAddress *functionAddress,
+															ObjectAddress *functionAddress
+															,
 															text *colocateWithText);
 static void DistributeFunctionColocatedWithReferenceTable(const
 														  ObjectAddress *functionAddress);
@@ -1896,9 +1897,11 @@ ShouldAddFunctionSignature(FunctionParameterMode mode)
 		}
 
 		default:
+		{
 			return true;
 		}
 	}
+}
 
 
 /*

src/backend/distributed/commands/grant.c

@@ -227,8 +227,8 @@ CollectGrantTableIdList(GrantStmt *grantStmt)
 
 	bool grantOnTableCommand = (grantStmt->targtype == ACL_TARGET_OBJECT &&
 								grantStmt->objtype == OBJECT_TABLE);
-	bool grantAllTablesOnSchemaCommand = (grantStmt->targtype ==
+	bool grantAllTablesOnSchemaCommand = (grantStmt->targtype == ACL_TARGET_ALL_IN_SCHEMA
-										  ACL_TARGET_ALL_IN_SCHEMA &&
+										  &&
 										  grantStmt->objtype == OBJECT_TABLE);
 
 	/* we are only interested in table level grants */

src/backend/distributed/commands/index.c

@@ -64,8 +64,8 @@ static int GetNumberOfIndexParameters(IndexStmt *createIndexStatement);
 static bool IndexAlreadyExists(IndexStmt *createIndexStatement);
 static Oid CreateIndexStmtGetIndexId(IndexStmt *createIndexStatement);
 static Oid CreateIndexStmtGetSchemaId(IndexStmt *createIndexStatement);
-static void SwitchToSequentialAndLocalExecutionIfIndexNameTooLong(
+static void SwitchToSequentialAndLocalExecutionIfIndexNameTooLong(IndexStmt *
-	IndexStmt *createIndexStatement);
+																  createIndexStatement);
 static char * GenerateLongestShardPartitionIndexName(IndexStmt *createIndexStatement);
 static char * GenerateDefaultIndexName(IndexStmt *createIndexStatement);
 static List * GenerateIndexParameters(IndexStmt *createIndexStatement);

src/backend/distributed/commands/multi_copy.c

@@ -1272,9 +1272,11 @@ ConversionPathForTypes(Oid inputType, Oid destType, CopyCoercionData *result)
 		}
 
 		default:
+		{
 			Assert(false); /* there are no other options for this enum */
 		}
 	}
+}
 
 
 /*
@@ -2859,7 +2861,8 @@ ErrorIfCopyHasOnErrorLogVerbosity(CopyStmt *copyStatement)
 		if (strcmp(option->defname, "on_error") == 0)
 		{
 			ereport(ERROR, (errmsg(
-								"Citus does not support COPY FROM with ON_ERROR option.")));
+								"Citus does not support COPY FROM with ON_ERROR option."))
+					);
 		}
 		else if (strcmp(option->defname, "log_verbosity") == 0)
 		{
@@ -2877,7 +2880,8 @@ ErrorIfCopyHasOnErrorLogVerbosity(CopyStmt *copyStatement)
 	if (log_verbosity)
 	{
 		ereport(ERROR, (errmsg(
-							"Citus does not support COPY FROM with LOG_VERBOSITY option.")));
+							"Citus does not support COPY FROM with LOG_VERBOSITY option.")
+						));
 	}
 #endif
 }

src/backend/distributed/commands/rename.c

@@ -149,7 +149,7 @@ PreprocessRenameStmt(Node *node, const char *renameCommand,
 		}
 
 		default:
-
+		{
 			/*
 			 * Nodes that are not supported by Citus: we pass-through to the
 			 * main PostgreSQL executor. Any Citus-supported RenameStmt
@@ -157,6 +157,7 @@ PreprocessRenameStmt(Node *node, const char *renameCommand,
 			 */
 			return NIL;
 		}
+	}
 
 	bool isCitusRelation = IsCitusTable(tableRelationId);
 	if (!isCitusRelation)

src/backend/distributed/commands/sequence.c

@@ -463,7 +463,8 @@ PreprocessAlterSequenceStmt(Node *node, const char *queryString,
 																			DEPENDENCY_INTERNAL))
 	{
 		ereport(ERROR, (errmsg(
-							"Altering a distributed sequence is currently not supported.")));
+							"Altering a distributed sequence is currently not supported.")
+						));
 	}
 
 	/*
@@ -991,8 +992,8 @@ FilterDistributedSequences(GrantStmt *stmt)
 {
 	bool grantOnSequenceCommand = (stmt->targtype == ACL_TARGET_OBJECT &&
 								   stmt->objtype == OBJECT_SEQUENCE);
-	bool grantOnAllSequencesInSchemaCommand = (stmt->targtype ==
+	bool grantOnAllSequencesInSchemaCommand = (stmt->targtype == ACL_TARGET_ALL_IN_SCHEMA
-											   ACL_TARGET_ALL_IN_SCHEMA &&
+											   &&
 											   stmt->objtype == OBJECT_SEQUENCE);
 
 	/* we are only interested in sequence level grants */
@@ -1036,7 +1037,8 @@ FilterDistributedSequences(GrantStmt *stmt)
 				RangeVar *distributedSequence = makeRangeVar(get_namespace_name(
 																 namespaceOid),
 															 get_rel_name(
-																 sequenceAddress->objectId),
+																 sequenceAddress->objectId
+																 ),
 															 -1);
 				grantSequenceList = lappend(grantSequenceList, distributedSequence);
 			}

src/backend/distributed/commands/serialize_distributed_ddls.c

@@ -237,9 +237,11 @@ AcquireCitusAdvisoryObjectClassLockGetOid(ObjectClass objectClass,
 		}
 
 		default:
+		{
 			elog(ERROR, "unsupported object class: %d", objectClass);
 		}
 	}
+}
 
 
 /*
@@ -270,6 +272,8 @@ AcquireCitusAdvisoryObjectClassLockCheckPrivileges(ObjectClass objectClass, Oid
 		}
 
 		default:
+		{
 			elog(ERROR, "unsupported object class: %d", objectClass);
 		}
 	}
+}

src/backend/distributed/commands/table.c

@@ -81,23 +81,23 @@ static void ErrorIfAttachCitusTableToPgLocalTable(Oid parentRelationId,
 												  Oid partitionRelationId);
 static bool DeparserSupportsAlterTableAddColumn(AlterTableStmt *alterTableStatement,
 												AlterTableCmd *addColumnSubCommand);
-static bool ATDefinesFKeyBetweenPostgresAndCitusLocalOrRef(
+static bool ATDefinesFKeyBetweenPostgresAndCitusLocalOrRef(AlterTableStmt *
-	AlterTableStmt *alterTableStatement);
+														   alterTableStatement);
 static bool ShouldMarkConnectedRelationsNotAutoConverted(Oid leftRelationId,
 														 Oid rightRelationId);
 static bool RelationIdListContainsCitusTableType(List *relationIdList,
 												 CitusTableType citusTableType);
 static bool RelationIdListContainsPostgresTable(List *relationIdList);
-static void ConvertPostgresLocalTablesToCitusLocalTables(
+static void ConvertPostgresLocalTablesToCitusLocalTables(AlterTableStmt *
-	AlterTableStmt *alterTableStatement);
+														 alterTableStatement);
 static bool RangeVarListHasLocalRelationConvertedByUser(List *relationRangeVarList,
 														AlterTableStmt *
 														alterTableStatement);
 static int CompareRangeVarsByOid(const void *leftElement, const void *rightElement);
-static List * GetAlterTableAddFKeyRightRelationIdList(
+static List * GetAlterTableAddFKeyRightRelationIdList(AlterTableStmt *alterTableStatement)
-	AlterTableStmt *alterTableStatement);
+;
-static List * GetAlterTableAddFKeyRightRelationRangeVarList(
+static List * GetAlterTableAddFKeyRightRelationRangeVarList(AlterTableStmt *
-	AlterTableStmt *alterTableStatement);
+															alterTableStatement);
 static List * GetAlterTableAddFKeyConstraintList(AlterTableStmt *alterTableStatement);
 static List * GetAlterTableCommandFKeyConstraintList(AlterTableCmd *command);
 static List * GetRangeVarListFromFKeyConstraintList(List *fKeyConstraintList);
@@ -2181,9 +2181,11 @@ AlterTableCommandTypeIsTrigger(AlterTableType alterTableType)
 		}
 
 		default:
+		{
 			return false;
 		}
 	}
+}
 
 
 /*
@@ -3426,7 +3428,8 @@ ErrorIfUnsupportedAlterTableStmt(AlterTableStmt *alterTableStatement)
 										columnConstraints->length > 1)
 									{
 										ereport(ERROR, (errcode(
-															ERRCODE_FEATURE_NOT_SUPPORTED),
+															ERRCODE_FEATURE_NOT_SUPPORTED)
+														,
 														errmsg(
 															"cannot execute ADD COLUMN .. DEFAULT nextval('..')"
 															" command with other subcommands/constraints"),
@@ -3441,7 +3444,8 @@ ErrorIfUnsupportedAlterTableStmt(AlterTableStmt *alterTableStatement)
 									if (!TableEmpty(relationId))
 									{
 										ereport(ERROR, (errcode(
-															ERRCODE_FEATURE_NOT_SUPPORTED),
+															ERRCODE_FEATURE_NOT_SUPPORTED)
+														,
 														errmsg(
 															"cannot add a column involving DEFAULT nextval('..') "
 															"because the table is not empty"),

src/backend/distributed/commands/utility_hook.c

@@ -1297,7 +1297,8 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob)
 							 "partial failure, potentially leading to an inconsistent "
 							 "state.\nIf the problematic command is a CREATE operation, "
 							 "consider using the 'IF EXISTS' syntax to drop the object,"
-							 "\nif applicable, and then re-attempt the original command.")));
+							 "\nif applicable, and then re-attempt the original command.")
+						));
 			}
 
 			PG_RE_THROW();

src/backend/distributed/connection/connection_management.c

@@ -475,8 +475,8 @@ FindAvailableConnection(dlist_head *connections, uint32 flags)
 		if (flags & OUTSIDE_TRANSACTION)
 		{
 			/* don't return connections that are used in transactions */
-			if (connection->remoteTransaction.transactionState !=
+			if (connection->remoteTransaction.transactionState != REMOTE_TRANS_NOT_STARTED
-				REMOTE_TRANS_NOT_STARTED)
+				)
 			{
 				continue;
 			}

src/backend/distributed/connection/placement_connection.c

@@ -191,8 +191,8 @@ static HTAB *ConnectionShardHash;
 
 static MultiConnection * FindPlacementListConnection(int flags, List *placementAccessList,
 													 const char *userName);
-static ConnectionPlacementHashEntry * FindOrCreatePlacementEntry(
+static ConnectionPlacementHashEntry * FindOrCreatePlacementEntry(ShardPlacement *placement
-	ShardPlacement *placement);
+																 );
 static bool CanUseExistingConnection(uint32 flags, const char *userName,
 									 ConnectionReference *placementConnection);
 static bool ConnectionAccessedDifferentPlacement(MultiConnection *connection,

src/backend/distributed/connection/shared_connection_stats.c

@@ -676,7 +676,8 @@ SharedConnectionStatsShmemInit(void)
 		ConnectionStatsSharedState->sharedConnectionHashTrancheName =
 			"Shared Connection Tracking Hash Tranche";
 		LWLockRegisterTranche(ConnectionStatsSharedState->sharedConnectionHashTrancheId,
-							  ConnectionStatsSharedState->sharedConnectionHashTrancheName);
+							  ConnectionStatsSharedState->sharedConnectionHashTrancheName)
+		;
 
 		LWLockInitialize(&ConnectionStatsSharedState->sharedConnectionHashLock,
 						 ConnectionStatsSharedState->sharedConnectionHashTrancheId);

src/backend/distributed/deparser/deparse_extension_stmts.c

@@ -28,7 +28,8 @@ static void AppendCreateExtensionStmtOptions(StringInfo buf, List *options);
 static void AppendDropExtensionStmt(StringInfo buf, DropStmt *stmt);
 static void AppendExtensionNameList(StringInfo buf, List *objects);
 static void AppendAlterExtensionSchemaStmt(StringInfo buf,
-										   AlterObjectSchemaStmt *alterExtensionSchemaStmt);
+										   AlterObjectSchemaStmt *alterExtensionSchemaStmt
+										   );
 static void AppendAlterExtensionStmt(StringInfo buf,
 									 AlterExtensionStmt *alterExtensionStmt);
 

src/backend/distributed/deparser/deparse_foreign_server_stmts.c

@@ -290,9 +290,11 @@ GetDefElemActionString(DefElemAction action)
 		}
 
 		default:
+		{
 			return "";
 		}
 	}
+}
 
 
 static void

src/backend/distributed/deparser/deparse_function_stmts.c

@@ -118,10 +118,12 @@ ObjectTypeToKeyword(ObjectType objtype)
 		}
 
 		default:
+		{
 			elog(ERROR, "Unknown object type: %d", objtype);
 			return NULL;
 		}
 	}
+}
 
 
 /*

src/backend/distributed/deparser/deparse_statistics_stmts.c

@@ -243,7 +243,8 @@ AppendColumnNames(StringInfo buf, CreateStatsStmt *stmt)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg(
-						 "only simple column references are allowed in CREATE STATISTICS")));
+						 "only simple column references are allowed in CREATE STATISTICS")
+					));
 		}
 
 		const char *columnName = quote_identifier(column->name);

src/backend/distributed/deparser/deparse_table_stmts.c

@@ -536,10 +536,12 @@ GeneratedWhenStr(char generatedWhen)
 		}
 
 		default:
+		{
 			ereport(ERROR, (errmsg("unrecognized generated_when: %d",
 								   generatedWhen)));
 		}
 	}
+}
 
 
 /*

src/backend/distributed/executor/adaptive_executor.c

@@ -646,7 +646,8 @@ static TransactionProperties DecideTransactionPropertiesForTaskList(RowModifyLev
 																	modLevel,
 																	List *taskList,
 																	bool
-																	exludeFromTransaction);
+																	exludeFromTransaction)
+;
 static void StartDistributedExecution(DistributedExecution *execution);
 static void RunLocalExecution(CitusScanState *scanState, DistributedExecution *execution);
 static void RunDistributedExecution(DistributedExecution *execution);
@@ -711,8 +712,8 @@ static void PlacementExecutionReady(TaskPlacementExecution *placementExecution);
 static TaskExecutionState TaskExecutionStateMachine(ShardCommandExecution *
 													shardCommandExecution);
 static int GetEventSetSize(List *sessionList);
-static bool ProcessSessionsWithFailedWaitEventSetOperations(
+static bool ProcessSessionsWithFailedWaitEventSetOperations(DistributedExecution *
-	DistributedExecution *execution);
+															execution);
 static bool HasIncompleteConnectionEstablishment(DistributedExecution *execution);
 static void RebuildWaitEventSet(DistributedExecution *execution);
 static void RebuildWaitEventSetForSessions(DistributedExecution *execution);
@@ -2635,8 +2636,10 @@ OpenNewConnections(WorkerPool *workerPool, int newConnectionCount,
 
 		/* open a new connection to the worker */
 		MultiConnection *connection = StartNodeUserDatabaseConnection(connectionFlags,
-																	  workerPool->nodeName,
+																	  workerPool->nodeName
-																	  workerPool->nodePort,
+																	  ,
+																	  workerPool->nodePort
+																	  ,
 																	  NULL, NULL);
 		if (!connection)
 		{

src/backend/distributed/executor/citus_custom_scan.c

@@ -67,8 +67,8 @@ static void CitusPreExecScan(CitusScanState *scanState);
 static bool ModifyJobNeedsEvaluation(Job *workerJob);
 static void RegenerateTaskForFasthPathQuery(Job *workerJob);
 static void RegenerateTaskListForInsert(Job *workerJob);
-static DistributedPlan * CopyDistributedPlanWithoutCache(
+static DistributedPlan * CopyDistributedPlanWithoutCache(DistributedPlan *
-	DistributedPlan *originalDistributedPlan);
+														 originalDistributedPlan);
 static void CitusEndScan(CustomScanState *node);
 static void CitusReScan(CustomScanState *node);
 static void EnsureForceDelegationDistributionKey(Job *job);

src/backend/distributed/executor/distributed_intermediate_results.c

@@ -69,8 +69,8 @@ static List * WrapTasksForPartitioning(const char *resultIdPrefix,
 									   bool binaryFormat);
 static List * ExecutePartitionTaskList(List *partitionTaskList,
 									   CitusTableCacheEntry *targetRelation);
-static PartitioningTupleDest * CreatePartitioningTupleDest(
+static PartitioningTupleDest * CreatePartitioningTupleDest(CitusTableCacheEntry *
-	CitusTableCacheEntry *targetRelation);
+														   targetRelation);
 static void PartitioningTupleDestPutTuple(TupleDestination *self, Task *task,
 										  int placementIndex, int queryNumber,
 										  HeapTuple heapTuple, uint64 tupleLibpqSize);

src/backend/distributed/executor/insert_select_executor.c

@@ -66,7 +66,8 @@ static HTAB * ExecutePlanIntoColocatedIntermediateResults(Oid targetRelationId,
 														  List *insertTargetList,
 														  PlannedStmt *selectPlan,
 														  EState *executorState,
-														  char *intermediateResultIdPrefix);
+														  char *intermediateResultIdPrefix
+														  );
 static int PartitionColumnIndexFromColumnList(Oid relationId, List *columnNameList);
 static void WrapTaskListForProjection(List *taskList, List *projectedTargetEntries);
 

src/backend/distributed/executor/merge_executor.c

@@ -38,11 +38,13 @@ static HTAB * ExecuteMergeSourcePlanIntoColocatedIntermediateResults(Oid targetR
 																	 sourceTargetList,
 																	 PlannedStmt *
 																	 sourcePlan,
-																	 EState *executorState,
+																	 EState *executorState
+																	 ,
 																	 char *
 																	 intermediateResultIdPrefix,
 																	 int
-																	 partitionColumnIndex);
+																	 partitionColumnIndex)
+;
 
 
 /*

src/backend/distributed/metadata/dependency.c

@@ -180,9 +180,10 @@ static bool FollowExtAndInternalDependencies(ObjectAddressCollector *collector,
 											 DependencyDefinition *definition);
 static void ApplyAddToDependencyList(ObjectAddressCollector *collector,
 									 DependencyDefinition *definition);
-static void ApplyAddCitusDependedObjectsToDependencyList(
+static void ApplyAddCitusDependedObjectsToDependencyList(ObjectAddressCollector *collector
-	ObjectAddressCollector *collector,
+														 ,
-	DependencyDefinition *definition);
+														 DependencyDefinition *definition)
+;
 static List * GetViewRuleReferenceDependencyList(Oid relationId);
 static List * ExpandCitusSupportedTypes(ObjectAddressCollector *collector,
 										ObjectAddress target);

src/backend/distributed/metadata/distobject.c

@@ -338,8 +338,8 @@ ShouldMarkRelationDistributed(Oid relationId)
 	bool ownedByExtension = IsTableOwnedByExtension(relationId);
 	bool alreadyDistributed = IsObjectDistributed(relationAddress);
 	bool hasUnsupportedDependency =
-		DeferErrorIfAnyObjectHasUnsupportedDependency(list_make1(relationAddress)) !=
+		DeferErrorIfAnyObjectHasUnsupportedDependency(list_make1(relationAddress)) != NULL
-		NULL;
+	;
 	bool hasCircularDependency =
 		DeferErrorIfCircularDependencyExists(relationAddress) != NULL;
 

src/backend/distributed/metadata/metadata_utility.c

@@ -812,7 +812,6 @@ GenerateSizeQueryOnMultiplePlacements(List *shardIntervalList,
 		{
 			partitionedShardNames = lappend(partitionedShardNames, quotedShardName);
 		}
-
 		/* for non-partitioned tables, we will use Postgres' size functions */
 		else
 		{
@@ -823,7 +822,8 @@ GenerateSizeQueryOnMultiplePlacements(List *shardIntervalList,
 	/* SELECT SUM(worker_partitioned_...) FROM VALUES (...) */
 	char *subqueryForPartitionedShards =
 		GenerateSizeQueryForRelationNameList(partitionedShardNames,
-											 GetWorkerPartitionedSizeUDFNameBySizeQueryType(
+											 GetWorkerPartitionedSizeUDFNameBySizeQueryType
+											 (
 												 sizeQueryType));
 
 	/* SELECT SUM(pg_..._size) FROM VALUES (...) */
@@ -4267,7 +4267,8 @@ CancelTasksForJob(int64 jobid)
 
 	const bool indexOK = true;
 	SysScanDesc scanDescriptor = systable_beginscan(pgDistBackgroundTasks,
-													DistBackgroundTaskJobIdTaskIdIndexId(),
+													DistBackgroundTaskJobIdTaskIdIndexId()
+													,
 													indexOK, NULL,
 													lengthof(scanKey), scanKey);
 

src/backend/distributed/operations/delete_protocol.c

@@ -76,7 +76,8 @@ static List * DropTaskList(Oid relationId, char *schemaName, char *relationName,
 						   List *deletableShardIntervalList);
 static void ExecuteDropShardPlacementCommandRemotely(ShardPlacement *shardPlacement,
 													 const char *shardRelationName,
-													 const char *dropShardPlacementCommand);
+													 const char *dropShardPlacementCommand
+													 );
 static char * CreateDropShardPlacementCommand(const char *schemaName,
 											  const char *shardRelationName,
 											  char storageType);

src/backend/distributed/operations/node_protocol.c

@@ -78,7 +78,8 @@ static void GatherIndexAndConstraintDefinitionListExcludingReplicaIdentity(Form_
 																		   indexForm,
 																		   List **
 																		   indexDDLEventList,
-																		   int indexFlags);
+																		   int indexFlags)
+;
 static Datum WorkerNodeGetDatum(WorkerNode *workerNode, TupleDesc tupleDescriptor);
 
 static char * CitusCreateAlterColumnarTableSet(char *qualifiedRelationName,

src/backend/distributed/operations/shard_cleaner.c

@@ -939,8 +939,8 @@ TryDropDatabaseOutsideTransaction(char *databaseName, char *nodeName, int nodePo
 		 * because we don't want to open a transaction block on remote nodes as DROP
 		 * DATABASE commands cannot be run inside a transaction block.
 		 */
-		if (ExecuteOptionalRemoteCommand(connection, commandString, NULL) !=
+		if (ExecuteOptionalRemoteCommand(connection, commandString, NULL) != RESPONSE_OKAY
-			RESPONSE_OKAY)
+			)
 		{
 			executeCommand = false;
 			break;

src/backend/distributed/operations/shard_split.c

@@ -131,14 +131,16 @@ static void UpdateDistributionColumnsForShardGroup(List *colocatedShardList,
 												   uint32 colocationId);
 static void InsertSplitChildrenShardMetadata(List *shardGroupSplitIntervalListList,
 											 List *workersForPlacementList);
-static void CreatePartitioningHierarchyForBlockingSplit(
+static void CreatePartitioningHierarchyForBlockingSplit(List *
-	List *shardGroupSplitIntervalListList,
+														shardGroupSplitIntervalListList,
 														List *workersForPlacementList);
 static void CreateForeignKeyConstraints(List *shardGroupSplitIntervalListList,
 										List *workersForPlacementList);
 static Task * CreateTaskForDDLCommandList(List *ddlCommandList, WorkerNode *workerNode);
-static StringInfo CreateSplitShardReplicationSetupUDF(
+static StringInfo CreateSplitShardReplicationSetupUDF(List *
-	List *sourceColocatedShardIntervalList, List *shardGroupSplitIntervalListList,
+													  sourceColocatedShardIntervalList,
+													  List *
+													  shardGroupSplitIntervalListList,
 													  List *destinationWorkerNodesList,
 													  DistributionColumnMap *
 													  distributionColumnOverrides);
@@ -883,7 +885,8 @@ DoSplitCopy(WorkerNode *sourceShardNode, List *sourceColocatedShardIntervalList,
 
 	ExecuteTaskListOutsideTransaction(ROW_MODIFY_NONE, splitCopyTaskList,
 									  MaxAdaptiveExecutorPoolSize,
-									  NULL /* jobIdList (ignored by API implementation) */);
+									  NULL /* jobIdList (ignored by API implementation) */
+									  );
 }
 
 
@@ -1881,7 +1884,8 @@ ExecuteSplitShardReplicationSetupUDF(WorkerNode *sourceWorkerNode,
 		ereport(ERROR, (errcode(ERRCODE_CONNECTION_FAILURE),
 						errmsg(
 							"Failed to run worker_split_shard_replication_setup UDF. It should successfully execute "
-							" for splitting a shard in a non-blocking way. Please retry.")));
+							" for splitting a shard in a non-blocking way. Please retry.")
+						));
 	}
 
 	/* Get replication slot information */

src/backend/distributed/operations/worker_shard_copy.c

@@ -471,8 +471,8 @@ WriteLocalTuple(TupleTableSlot *slot, ShardCopyDestReceiver *copyDest)
 	SetLocalExecutionStatus(LOCAL_EXECUTION_REQUIRED);
 
 	bool isBinaryCopy = localCopyOutState->binary;
-	bool shouldAddBinaryHeaders = (isBinaryCopy && localCopyOutState->fe_msgbuf->len ==
+	bool shouldAddBinaryHeaders = (isBinaryCopy && localCopyOutState->fe_msgbuf->len == 0)
-								   0);
+	;
 	if (shouldAddBinaryHeaders)
 	{
 		AppendCopyBinaryHeaders(localCopyOutState);

src/backend/distributed/operations/worker_split_copy_udf.c

@@ -72,7 +72,8 @@ worker_split_copy(PG_FUNCTION_ARGS)
 	{
 		ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 						errmsg(
-							"pg_catalog.split_copy_info array cannot contain null values")));
+							"pg_catalog.split_copy_info array cannot contain null values")
+						));
 	}
 
 	const int slice_ndim = 0;

src/backend/distributed/planner/distributed_planner.c

@@ -85,8 +85,8 @@ int PlannerLevel = 0;
 
 static bool ListContainsDistributedTableRTE(List *rangeTableList,
 											bool *maybeHasForeignDistributedTable);
-static PlannedStmt * CreateDistributedPlannedStmt(
+static PlannedStmt * CreateDistributedPlannedStmt(DistributedPlanningContext *planContext)
-	DistributedPlanningContext *planContext);
+;
 static PlannedStmt * InlineCtesAndCreateDistributedPlannedStmt(uint64 planId,
 															   DistributedPlanningContext
 															   *planContext);
@@ -125,14 +125,14 @@ static void AdjustReadIntermediateResultsCostInternal(RelOptInfo *relOptInfo,
 													  Const *resultFormatConst);
 static List * OuterPlanParamsList(PlannerInfo *root);
 static List * CopyPlanParamList(List *originalPlanParamList);
-static void CreateAndPushPlannerRestrictionContext(
+static void CreateAndPushPlannerRestrictionContext(DistributedPlanningContext *planContext
-	DistributedPlanningContext *planContext,
+												   ,
 												   FastPathRestrictionContext *
 												   fastPathContext);
 static PlannerRestrictionContext * CurrentPlannerRestrictionContext(void);
 static void PopPlannerRestrictionContext(void);
-static void ResetPlannerRestrictionContext(
+static void ResetPlannerRestrictionContext(PlannerRestrictionContext *
-	PlannerRestrictionContext *plannerRestrictionContext);
+										   plannerRestrictionContext);
 static PlannedStmt * PlanFastPathDistributedStmt(DistributedPlanningContext *planContext);
 static PlannedStmt * PlanDistributedStmt(DistributedPlanningContext *planContext,
 										 int rteIdCounter);

src/backend/distributed/planner/function_call_delegation.c

@@ -831,7 +831,8 @@ IsShardKeyValueAllowed(Const *shardKey, uint32 colocationId)
 	ereport(DEBUG4, errmsg("Comparing saved:%s with Shard key: %s colocationid:%d:%d",
 						   pretty_format_node_dump(
 							   nodeToString(
-								   AllowedDistributionColumnValue.distributionColumnValue)),
+								   AllowedDistributionColumnValue.distributionColumnValue)
+							   ),
 						   pretty_format_node_dump(nodeToString(shardKey)),
 						   AllowedDistributionColumnValue.colocationId, colocationId));
 

src/backend/distributed/planner/insert_select_planner.c

@@ -66,7 +66,8 @@ static bool InsertSelectHasRouterSelect(Query *originalQuery,
 										PlannerRestrictionContext *
 										plannerRestrictionContext);
 static Task * RouterModifyTaskForShardInterval(Query *originalQuery,
-											   CitusTableCacheEntry *targetTableCacheEntry,
+											   CitusTableCacheEntry *targetTableCacheEntry
+											   ,
 											   ShardInterval *shardInterval,
 											   PlannerRestrictionContext *
 											   plannerRestrictionContext,
@@ -1155,7 +1156,8 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte,
 		TargetEntry *newInsertTargetEntry = makeTargetEntry((Expr *) newInsertVar,
 															originalAttrNo,
 															oldInsertTargetEntry->resname,
-															oldInsertTargetEntry->resjunk);
+															oldInsertTargetEntry->resjunk)
+		;
 
 		newInsertTargetlist = lappend(newInsertTargetlist, newInsertTargetEntry);
 		resno++;

src/backend/distributed/planner/merge_planner.c

@@ -67,7 +67,8 @@ static DeferredErrorMessage * MergeQualAndTargetListFunctionsSupported(Oid
 																	   Query *query,
 																	   Node *quals,
 																	   List *targetList,
-																	   CmdType commandType);
+																	   CmdType commandType
+																	   );
 
 static DistributedPlan * CreateRouterMergePlan(Oid targetRelationId, Query *originalQuery,
 											   Query *query,
@@ -574,8 +575,8 @@ IsDistributionColumnInMergeSource(Expr *columnExpression, Query *query, bool
 		Var *distributionColumn = DistPartitionKey(relationId);
 
 		/* not all distributed tables have partition column */
-		if (distributionColumn != NULL && column->varattno ==
+		if (distributionColumn != NULL && column->varattno == distributionColumn->varattno
-			distributionColumn->varattno)
+			)
 		{
 			isDistributionColumn = true;
 		}
@@ -1046,7 +1047,8 @@ DeferErrorIfTargetHasFalseClause(Oid targetRelationId,
 {
 	ListCell *restrictionCell = NULL;
 	foreach(restrictionCell,
-			plannerRestrictionContext->relationRestrictionContext->relationRestrictionList)
+			plannerRestrictionContext->relationRestrictionContext->relationRestrictionList
+			)
 	{
 		RelationRestriction *relationRestriction =
 			(RelationRestriction *) lfirst(restrictionCell);
@@ -1078,7 +1080,8 @@ DeferErrorIfTargetHasFalseClause(Oid targetRelationId,
  */
 static DeferredErrorMessage *
 DeferErrorIfRoutableMergeNotSupported(Query *query, List *rangeTableList,
-									  PlannerRestrictionContext *plannerRestrictionContext,
+									  PlannerRestrictionContext *plannerRestrictionContext
+									  ,
 									  Oid targetRelationId)
 {
 	List *distTablesList = NIL;
@@ -1116,7 +1119,8 @@ DeferErrorIfRoutableMergeNotSupported(Query *query, List *rangeTableList,
 	if (list_length(distTablesList) > 0 && list_length(localTablesList) > 0)
 	{
 		ereport(DEBUG1, (errmsg(
-							 "A mix of distributed and local table, try repartitioning")));
+							 "A mix of distributed and local table, try repartitioning")))
+		;
 		return DeferredError(ERRCODE_FEATURE_NOT_SUPPORTED,
 							 "A mix of distributed and citus-local table, "
 							 "routable query is not possible", NULL, NULL);

src/backend/distributed/planner/multi_logical_optimizer.c

@@ -271,7 +271,8 @@ static void AppendTargetEntryToGroupClause(TargetEntry *targetEntry,
 static bool WorkerAggregateWalker(Node *node,
 								  WorkerAggregateWalkerContext *walkerContext);
 static List * WorkerAggregateExpressionList(Aggref *originalAggregate,
-											WorkerAggregateWalkerContext *walkerContextry);
+											WorkerAggregateWalkerContext *walkerContextry)
+;
 static AggregateType GetAggregateType(Aggref *aggregatExpression);
 static Oid AggregateArgumentType(Aggref *aggregate);
 static Expr * FirstAggregateArgument(Aggref *aggregate);
@@ -293,16 +294,17 @@ static Const * MakeIntegerConst(int32 integerValue);
 /* Local functions forward declarations for aggregate expression checks */
 static bool HasNonDistributableAggregates(MultiNode *logicalPlanNode);
 static bool CanPushDownExpression(Node *expression,
-								  const ExtendedOpNodeProperties *extendedOpNodeProperties);
+								  const ExtendedOpNodeProperties *extendedOpNodeProperties
-static DeferredErrorMessage * DeferErrorIfHasNonDistributableAggregates(
+								  );
-	MultiNode *logicalPlanNode);
+static DeferredErrorMessage * DeferErrorIfHasNonDistributableAggregates(MultiNode *
-static DeferredErrorMessage * DeferErrorIfUnsupportedArrayAggregate(
+																		logicalPlanNode);
-	Aggref *arrayAggregateExpression);
+static DeferredErrorMessage * DeferErrorIfUnsupportedArrayAggregate(Aggref *
+																	arrayAggregateExpression);
 static DeferredErrorMessage * DeferErrorIfUnsupportedJsonAggregate(AggregateType type,
 																   Aggref *
 																   aggregateExpression);
-static DeferredErrorMessage * DeferErrorIfUnsupportedAggregateDistinct(
+static DeferredErrorMessage * DeferErrorIfUnsupportedAggregateDistinct(Aggref *
-	Aggref *aggregateExpression,
+																	   aggregateExpression,
 																	   MultiNode *
 																	   logicalPlanNode);
 static Var * AggregateDistinctColumn(Aggref *aggregateExpression);
@@ -322,8 +324,8 @@ static bool HasOrderByAggregate(List *sortClauseList, List *targetList);
 static bool HasOrderByNonCommutativeAggregate(List *sortClauseList, List *targetList);
 static bool HasOrderByComplexExpression(List *sortClauseList, List *targetList);
 static bool HasOrderByHllType(List *sortClauseList, List *targetList);
-static bool ShouldProcessDistinctOrderAndLimitForWorker(
+static bool ShouldProcessDistinctOrderAndLimitForWorker(ExtendedOpNodeProperties *
-	ExtendedOpNodeProperties *extendedOpNodeProperties,
+														extendedOpNodeProperties,
 														bool pushingDownOriginalGrouping,
 														Node *havingQual);
 static bool IsIndexInRange(const List *list, int index);
@@ -5061,8 +5063,8 @@ HasOrderByHllType(List *sortClauseList, List *targetList)
  * neither should ProcessLimitOrderByForWorkerQuery.
  */
 static bool
-ShouldProcessDistinctOrderAndLimitForWorker(
+ShouldProcessDistinctOrderAndLimitForWorker(ExtendedOpNodeProperties *
-	ExtendedOpNodeProperties *extendedOpNodeProperties,
+											extendedOpNodeProperties,
 											bool pushingDownOriginalGrouping,
 											Node *havingQual)
 {

src/backend/distributed/planner/multi_router_planner.c

@@ -153,8 +153,8 @@ static String * MakeDummyColumnString(int dummyColumnId);
 static List * BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError);
 static List * GroupInsertValuesByShardId(List *insertValuesList);
 static List * ExtractInsertValuesList(Query *query, Var *partitionColumn);
-static DeferredErrorMessage * DeferErrorIfUnsupportedRouterPlannableSelectQuery(
+static DeferredErrorMessage * DeferErrorIfUnsupportedRouterPlannableSelectQuery(Query *
-	Query *query);
+																				query);
 static DeferredErrorMessage * ErrorIfQueryHasUnroutableModifyingCTE(Query *queryTree);
 static DeferredErrorMessage * ErrorIfQueryHasCTEWithSearchClause(Query *queryTree);
 static bool ContainsSearchClauseWalker(Node *node, void *context);
@@ -855,7 +855,8 @@ DeferErrorIfUnsupportedLocalTableJoin(List *rangeTableList)
 							 "Modifying local tables with remote local tables is "
 							 "not supported.",
 							 NULL,
-							 "Consider wrapping remote local table to a CTE, or subquery");
+							 "Consider wrapping remote local table to a CTE, or subquery")
+		;
 	}
 	return NULL;
 }
@@ -3152,7 +3153,8 @@ TargetShardIntervalForFastPathQuery(Query *query, bool *isMultiShardQuery,
 		if (cachedShardInterval == NULL)
 		{
 			ereport(ERROR, (errmsg(
-								"could not find shardinterval to which to send the query")));
+								"could not find shardinterval to which to send the query")
+							));
 		}
 
 		if (outputPartitionValueConst != NULL)

src/backend/distributed/planner/query_pushdown_planning.c

@@ -107,8 +107,12 @@ static AttrNumber FindResnoForVarInTargetList(List *targetList, int varno, int v
 static bool RelationInfoContainsOnlyRecurringTuples(PlannerInfo *plannerInfo,
 													Relids relids);
 static char * RecurringTypeDescription(RecurringTuplesType recurType);
-static DeferredErrorMessage * DeferredErrorIfUnsupportedLateralSubquery(
+static DeferredErrorMessage * DeferredErrorIfUnsupportedLateralSubquery(PlannerInfo *
-	PlannerInfo *plannerInfo, Relids recurringRelIds, Relids nonRecurringRelIds);
+																		plannerInfo,
+																		Relids
+																		recurringRelIds,
+																		Relids
+																		nonRecurringRelIds);
 static bool ContainsLateralSubquery(PlannerInfo *plannerInfo);
 static Var * PartitionColumnForPushedDownSubquery(Query *query);
 static bool ContainsReferencesToRelids(Query *query, Relids relids, int *foundRelid);
@@ -790,8 +794,8 @@ FromClauseRecurringTupleType(Query *queryTree)
  * such queries have lateral subqueries.
  */
 static DeferredErrorMessage *
-DeferredErrorIfUnsupportedRecurringTuplesJoin(
+DeferredErrorIfUnsupportedRecurringTuplesJoin(PlannerRestrictionContext *
-	PlannerRestrictionContext *plannerRestrictionContext,
+											  plannerRestrictionContext,
 											  bool plannerPhase)
 {
 	List *joinRestrictionList =

src/backend/distributed/planner/recursive_planning.c

@@ -161,7 +161,8 @@ static void RecursivelyPlanNonColocatedSubqueriesInWhere(Query *query,
 														 RecursivePlanningContext *
 														 recursivePlanningContext);
 static bool RecursivelyPlanRecurringTupleOuterJoinWalker(Node *node, Query *query,
-														 RecursivePlanningContext *context,
+														 RecursivePlanningContext *context
+														 ,
 														 bool chainedJoin);
 static void RecursivelyPlanDistributedJoinNode(Node *node, Query *query,
 											   RecursivePlanningContext *context);
@@ -207,8 +208,8 @@ static bool CanPushdownRecurringOuterJoinOnOuterRTE(RangeTblEntry *rte);
 static bool CanPushdownRecurringOuterJoinOnInnerVar(Var *innervar, RangeTblEntry *rte);
 static bool CanPushdownRecurringOuterJoin(JoinExpr *joinExpr, Query *query);
 #if PG_VERSION_NUM < PG_VERSION_17
-static bool hasPseudoconstantQuals(
+static bool hasPseudoconstantQuals(RelationRestrictionContext *relationRestrictionContext)
-	RelationRestrictionContext *relationRestrictionContext);
+;
 #endif
 
 /*
@@ -2780,8 +2781,8 @@ CanPushdownRecurringOuterJoinOnInnerVar(Var *innerVar, RangeTblEntry *rte)
 	}
 
 	/* Check if the inner variable is part of the distribution column */
-	if (cacheEntry->partitionColumn && innerVar->varattno ==
+	if (cacheEntry->partitionColumn && innerVar->varattno == cacheEntry->partitionColumn->
-		cacheEntry->partitionColumn->varattno)
+		varattno)
 	{
 		return true;
 	}
@@ -2922,7 +2923,8 @@ CanPushdownRecurringOuterJoinExtended(JoinExpr *joinExpr, Query *query,
 			joinExpr->larg, query->rtable))
 	{
 		ereport(DEBUG5, (errmsg(
-							 "Lateral join is not supported for pushdown in this path.")));
+							 "Lateral join is not supported for pushdown in this path.")))
+		;
 		return false;
 	}
 

src/backend/distributed/planner/relation_restriction_equivalence.c

@@ -156,8 +156,9 @@ static bool AllDistributedRelationsInRestrictionContextColocated(
 	restrictionContext);
 static bool IsNotSafeRestrictionToRecursivelyPlan(Node *node);
 static bool HasPlaceHolderVar(Node *node);
-static JoinRestrictionContext * FilterJoinRestrictionContext(
+static JoinRestrictionContext * FilterJoinRestrictionContext(JoinRestrictionContext *
-	JoinRestrictionContext *joinRestrictionContext, Relids
+															 joinRestrictionContext,
+															 Relids
 															 queryRteIdentities);
 static bool RangeTableArrayContainsAnyRTEIdentities(RangeTblEntry **rangeTableEntries, int
 													rangeTableArrayLength, Relids
@@ -614,7 +615,8 @@ RestrictionEquivalenceForPartitionKeys(PlannerRestrictionContext *restrictionCon
 	List *attributeEquivalenceList = GenerateAllAttributeEquivalences(restrictionContext);
 
 	return RestrictionEquivalenceForPartitionKeysViaEquivalences(restrictionContext,
-																 attributeEquivalenceList);
+																 attributeEquivalenceList)
+	;
 }
 
 
@@ -1160,8 +1162,8 @@ GenerateCommonEquivalence(List *attributeEquivalenceList,
  * with a single AttributeEquivalenceClassMember.
  */
 static AttributeEquivalenceClass *
-GenerateEquivalenceClassForRelationRestriction(
+GenerateEquivalenceClassForRelationRestriction(RelationRestrictionContext *
-	RelationRestrictionContext *relationRestrictionContext)
+											   relationRestrictionContext)
 {
 	ListCell *relationRestrictionCell = NULL;
 	AttributeEquivalenceClassMember *eqMember = NULL;
@@ -2071,8 +2073,8 @@ FindQueryContainingRTEIdentityInternal(Node *node,
  * distributed  relations in the given relation restrictions list are co-located.
  */
 static bool
-AllDistributedRelationsInRestrictionContextColocated(
+AllDistributedRelationsInRestrictionContextColocated(RelationRestrictionContext *
-	RelationRestrictionContext *restrictionContext)
+													 restrictionContext)
 {
 	RelationRestriction *relationRestriction = NULL;
 	List *relationIdList = NIL;

src/backend/distributed/planner/shard_pruning.c

@@ -1215,9 +1215,11 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 			}
 
 			default:
+			{
 				Assert(false);
 			}
 		}
+	}
 
 	prune->hasValidConstraint = true;
 }

src/backend/distributed/replication/multi_logical_replication.c

@@ -131,8 +131,8 @@ static void ExecuteRemainingPostLoadTableCommands(List *logicalRepTargetList);
 static char * escape_param_str(const char *str);
 static XLogRecPtr GetRemoteLSN(MultiConnection *connection, char *command);
 static void WaitForMiliseconds(long timeout);
-static XLogRecPtr GetSubscriptionPosition(
+static XLogRecPtr GetSubscriptionPosition(GroupedLogicalRepTargets *
-	GroupedLogicalRepTargets *groupedLogicalRepTargets);
+										  groupedLogicalRepTargets);
 
 static HTAB * CreateShardMovePublicationInfoHash(WorkerNode *targetNode,
 												 List *shardIntervals);

src/backend/distributed/shardsplit/shardsplit_decoder.c

@@ -210,10 +210,12 @@ shard_split_change_cb(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 
 		/* Only INSERT/DELETE/UPDATE actions are visible in the replication path of split shard */
 		default:
+		{
 			ereport(ERROR, errmsg(
 						"Unexpected Action :%d. Expected action is INSERT/DELETE/UPDATE",
 						change->action));
 		}
+	}
 #else
 	switch (change->action)
 	{
@@ -245,10 +247,12 @@ shard_split_change_cb(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 
 		/* Only INSERT/DELETE/UPDATE actions are visible in the replication path of split shard */
 		default:
+		{
 			ereport(ERROR, errmsg(
 						"Unexpected Action :%d. Expected action is INSERT/DELETE/UPDATE",
 						change->action));
 		}
+	}
 #endif
 
 	/* Current replication slot is not responsible for handling the change */
@@ -318,10 +322,12 @@ shard_split_change_cb(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 
 			/* Only INSERT/DELETE/UPDATE actions are visible in the replication path of split shard */
 			default:
+			{
 				ereport(ERROR, errmsg(
 							"Unexpected Action :%d. Expected action is INSERT/DELETE/UPDATE",
 							change->action));
 			}
+		}
 #else
 		switch (change->action)
 		{
@@ -373,10 +379,12 @@ shard_split_change_cb(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 
 			/* Only INSERT/DELETE/UPDATE actions are visible in the replication path of split shard */
 			default:
+			{
 				ereport(ERROR, errmsg(
 							"Unexpected Action :%d. Expected action is INSERT/DELETE/UPDATE",
 							change->action));
 			}
+		}
 #endif
 	}
 

src/backend/distributed/stats/stat_counters.c

@@ -541,7 +541,8 @@ StatCountersShmemInit(void)
 	SharedBackendStatsSlotArray = (BackendStatsSlot *)
 								  ShmemInitStruct("Citus Shared Backend Stats Slot Array",
 												  SharedBackendStatsSlotArrayShmemSize(),
-												  &sharedBackendStatsSlotArrayAlreadyInit);
+												  &sharedBackendStatsSlotArrayAlreadyInit)
+	;
 
 	bool sharedSavedBackendStatsHashLockAlreadyInit = false;
 	SharedSavedBackendStatsHashLock = ShmemInitStruct(

src/backend/distributed/test/shard_rebalancer.c

@@ -34,8 +34,8 @@
 #include "distributed/shard_rebalancer.h"
 
 /* static declarations for json conversion */
-static List * JsonArrayToShardPlacementTestInfoList(
+static List * JsonArrayToShardPlacementTestInfoList(ArrayType *
-	ArrayType *shardPlacementJsonArrayObject);
+													shardPlacementJsonArrayObject);
 static List * JsonArrayToWorkerTestInfoList(ArrayType *workerNodeJsonArrayObject);
 static bool JsonFieldValueBoolDefault(Datum jsonDocument, const char *key,
 									  bool defaultValue);

src/backend/distributed/transaction/distributed_deadlock_detection.c

@@ -395,8 +395,8 @@ AssociateDistributedTransactionWithBackendProc(TransactionNode *transactionNode)
 		DistributedTransactionId *currentTransactionId =
 			&currentBackendData.transactionId;
 
-		if (currentTransactionId->transactionNumber !=
+		if (currentTransactionId->transactionNumber != transactionNode->transactionId.
-			transactionNode->transactionId.transactionNumber)
+			transactionNumber)
 		{
 			continue;
 		}

src/backend/distributed/transaction/worker_transaction.c

@@ -634,8 +634,9 @@ SendMetadataCommandListToWorkerListInCoordinatedTransaction(List *workerNodeList
  * false.
  */
 bool
-SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
+SendOptionalCommandListToWorkerOutsideTransactionWithConnection(MultiConnection *
-	MultiConnection *workerConnection, List *commandList)
+																workerConnection, List *
+																commandList)
 {
 	if (PQstatus(workerConnection->pgConn) != CONNECTION_OK)
 	{

src/backend/distributed/utils/aggregate_utils.c

@@ -376,12 +376,12 @@ ExtractAggregationValues(FunctionCallInfo fcinfo, int argumentIndex,
 			HeapTupleHeader tupleHeader =
 				DatumGetHeapTupleHeader(fcGetArgValue(fcinfo, argumentIndex));
 
-			if (HeapTupleHeaderGetNatts(tupleHeader) !=
+			if (HeapTupleHeaderGetNatts(tupleHeader) != aggregationArgumentContext->
-				aggregationArgumentContext->argumentCount ||
+				argumentCount ||
-				HeapTupleHeaderGetTypeId(tupleHeader) !=
+				HeapTupleHeaderGetTypeId(tupleHeader) != aggregationArgumentContext->
-				aggregationArgumentContext->tupleDesc->tdtypeid ||
+				tupleDesc->tdtypeid ||
-				HeapTupleHeaderGetTypMod(tupleHeader) !=
+				HeapTupleHeaderGetTypMod(tupleHeader) != aggregationArgumentContext->
-				aggregationArgumentContext->tupleDesc->tdtypmod)
+				tupleDesc->tdtypmod)
 			{
 				ereport(ERROR, (errmsg("worker_partial_agg_sfunc received "
 									   "incompatible record")));
@@ -818,7 +818,8 @@ coord_combine_agg_ffunc(PG_FUNCTION_ARGS)
 	if (!TypecheckCoordCombineAggReturnType(fcinfo, ffunc, box))
 	{
 		ereport(ERROR, (errmsg(
-							"coord_combine_agg_ffunc could not confirm type correctness")));
+							"coord_combine_agg_ffunc could not confirm type correctness"))
+				);
 	}
 
 	if (ffunc == InvalidOid)

src/backend/distributed/utils/background_jobs.c

@@ -88,26 +88,26 @@ static shm_mq_result ConsumeTaskWorkerOutput(shm_mq_handle *responseq, StringInf
 											 bool *hadError);
 static void UpdateDependingTasks(BackgroundTask *task);
 static int64 CalculateBackoffDelay(int retryCount);
-static bool NewExecutorExceedsCitusLimit(
+static bool NewExecutorExceedsCitusLimit(QueueMonitorExecutionContext *
-	QueueMonitorExecutionContext *queueMonitorExecutionContext);
+										 queueMonitorExecutionContext);
 static bool NewExecutorExceedsPgMaxWorkers(BackgroundWorkerHandle *handle,
 										   QueueMonitorExecutionContext *
 										   queueMonitorExecutionContext);
 static bool AssignRunnableTaskToNewExecutor(BackgroundTask *runnableTask,
 											QueueMonitorExecutionContext *
 											queueMonitorExecutionContext);
-static void AssignRunnableTasks(
+static void AssignRunnableTasks(QueueMonitorExecutionContext *queueMonitorExecutionContext
-	QueueMonitorExecutionContext *queueMonitorExecutionContext);
+								);
 static List * GetRunningTaskEntries(HTAB *currentExecutors);
-static shm_mq_result ReadFromExecutorQueue(
+static shm_mq_result ReadFromExecutorQueue(BackgroundExecutorHashEntry *
-	BackgroundExecutorHashEntry *backgroundExecutorHashEntry,
+										   backgroundExecutorHashEntry,
 										   bool *hadError);
-static void CheckAndResetLastWorkerAllocationFailure(
+static void CheckAndResetLastWorkerAllocationFailure(QueueMonitorExecutionContext *
-	QueueMonitorExecutionContext *queueMonitorExecutionContext);
+													 queueMonitorExecutionContext);
-static TaskExecutionStatus TaskConcurrentCancelCheck(
+static TaskExecutionStatus TaskConcurrentCancelCheck(TaskExecutionContext *
-	TaskExecutionContext *taskExecutionContext);
+													 taskExecutionContext);
-static TaskExecutionStatus ConsumeExecutorQueue(
+static TaskExecutionStatus ConsumeExecutorQueue(TaskExecutionContext *taskExecutionContext
-	TaskExecutionContext *taskExecutionContext);
+												);
 static void TaskHadError(TaskExecutionContext *taskExecutionContext);
 static void TaskEnded(TaskExecutionContext *taskExecutionContext);
 static void TerminateAllTaskExecutors(HTAB *currentExecutors);
@@ -537,7 +537,8 @@ NewExecutorExceedsPgMaxWorkers(BackgroundWorkerHandle *handle,
  */
 static bool
 AssignRunnableTaskToNewExecutor(BackgroundTask *runnableTask,
-								QueueMonitorExecutionContext *queueMonitorExecutionContext)
+								QueueMonitorExecutionContext *queueMonitorExecutionContext
+								)
 {
 	Assert(runnableTask && runnableTask->status == BACKGROUND_TASK_STATUS_RUNNABLE);
 
@@ -649,8 +650,8 @@ GetRunningTaskEntries(HTAB *currentExecutors)
  * It also resets the failure timestamp.
  */
 static void
-CheckAndResetLastWorkerAllocationFailure(
+CheckAndResetLastWorkerAllocationFailure(QueueMonitorExecutionContext *
-	QueueMonitorExecutionContext *queueMonitorExecutionContext)
+										 queueMonitorExecutionContext)
 {
 	if (queueMonitorExecutionContext->backgroundWorkerFailedStartTime > 0)
 	{

src/backend/distributed/utils/colocation_utils.c

@@ -531,8 +531,8 @@ ColocationId(int shardCount, int replicationFactor, Oid distributionColumnType,
 			continue;
 		}
 
-		if (colocationId == INVALID_COLOCATION_ID || colocationId >
+		if (colocationId == INVALID_COLOCATION_ID || colocationId > colocationForm->
-			colocationForm->colocationid)
+			colocationid)
 		{
 			/*
 			 * We assign the smallest colocation id among all the matches so that we
@@ -1051,8 +1051,8 @@ ColocatedShardIntervalList(ShardInterval *shardInterval)
 		 * Since we iterate over co-located tables, shard count of each table should be
 		 * same and greater than shardIntervalIndex.
 		 */
-		Assert(cacheEntry->shardIntervalArrayLength ==
+		Assert(cacheEntry->shardIntervalArrayLength == colocatedTableCacheEntry->
-			   colocatedTableCacheEntry->shardIntervalArrayLength);
+			   shardIntervalArrayLength);
 
 		ShardInterval *colocatedShardInterval =
 			colocatedTableCacheEntry->sortedShardIntervalArray[shardIntervalIndex];
@@ -1122,8 +1122,8 @@ ColocatedNonPartitionShardIntervalList(ShardInterval *shardInterval)
 		 * Since we iterate over co-located tables, shard count of each table should be
 		 * same and greater than shardIntervalIndex.
 		 */
-		Assert(cacheEntry->shardIntervalArrayLength ==
+		Assert(cacheEntry->shardIntervalArrayLength == colocatedTableCacheEntry->
-			   colocatedTableCacheEntry->shardIntervalArrayLength);
+			   shardIntervalArrayLength);
 
 		ShardInterval *colocatedShardInterval =
 			colocatedTableCacheEntry->sortedShardIntervalArray[shardIntervalIndex];

src/backend/distributed/utils/foreign_key_relationship.c

@@ -81,7 +81,8 @@ static List * GetRelationshipNodesForFKeyConnectedRelations(
 static List * GetAllNeighboursList(ForeignConstraintRelationshipNode *relationshipNode);
 static ForeignConstraintRelationshipNode * GetRelationshipNodeForRelationId(Oid
 																			relationId,
-																			bool *isFound);
+																			bool *isFound)
+;
 static void CreateForeignConstraintRelationshipGraph(void);
 static bool IsForeignConstraintRelationshipGraphValid(void);
 static List * GetNeighbourList(ForeignConstraintRelationshipNode *relationshipNode,
@@ -177,8 +178,8 @@ ShouldUndistributeCitusLocalTable(Oid relationId)
  * to given relation node via a foreign key relationhip graph.
  */
 static List *
-GetRelationshipNodesForFKeyConnectedRelations(
+GetRelationshipNodesForFKeyConnectedRelations(ForeignConstraintRelationshipNode *
-	ForeignConstraintRelationshipNode *relationshipNode)
+											  relationshipNode)
 {
 	HTAB *oidVisitedMap = CreateSimpleHashSetWithName(Oid, "oid visited hash set");
 
@@ -566,8 +567,8 @@ PopulateAdjacencyLists(void)
 		/* we just saw this edge, no need to add it twice */
 		if (currentFConstraintRelationshipEdge->referencingRelationOID ==
 			prevReferencingOid &&
-			currentFConstraintRelationshipEdge->referencedRelationOID ==
+			currentFConstraintRelationshipEdge->referencedRelationOID == prevReferencedOid
-			prevReferencedOid)
+			)
 		{
 			continue;
 		}

src/backend/distributed/utils/multi_partitioning_utils.c

@@ -61,8 +61,12 @@ static void CreateFixPartitionShardIndexNames(Oid parentRelationId,
 static List * WorkerFixPartitionShardIndexNamesCommandList(uint64 parentShardId,
 														   List *indexIdList,
 														   Oid partitionRelationId);
-static List * WorkerFixPartitionShardIndexNamesCommandListForParentShardIndex(
+static List * WorkerFixPartitionShardIndexNamesCommandListForParentShardIndex(char *
-	char *qualifiedParentShardIndexName, Oid parentIndexId, Oid partitionRelationId);
+																			  qualifiedParentShardIndexName,
+																			  Oid
+																			  parentIndexId,
+																			  Oid
+																			  partitionRelationId);
 static List * WorkerFixPartitionShardIndexNamesCommandListForPartitionIndex(Oid
 																			partitionIndexId,
 																			char *
@@ -652,8 +656,10 @@ WorkerFixPartitionShardIndexNamesCommandList(uint64 parentShardId,
  * given partition. Otherwise, all the partitions are included.
  */
 static List *
-WorkerFixPartitionShardIndexNamesCommandListForParentShardIndex(
+WorkerFixPartitionShardIndexNamesCommandListForParentShardIndex(char *
-	char *qualifiedParentShardIndexName, Oid parentIndexId, Oid partitionRelationId)
+																qualifiedParentShardIndexName,
+																Oid parentIndexId, Oid
+																partitionRelationId)
 {
 	List *commandList = NIL;
 

src/include/distributed/citus_ruleutils.h

@@ -29,7 +29,8 @@ extern char * pg_get_serverdef_string(Oid tableRelationId);
 extern char * pg_get_sequencedef_string(Oid sequenceRelid);
 extern Form_pg_sequence pg_get_sequencedef(Oid sequenceRelationId);
 extern char * pg_get_tableschemadef_string(Oid tableRelationId,
-										   IncludeSequenceDefaults includeSequenceDefaults,
+										   IncludeSequenceDefaults includeSequenceDefaults
+										   ,
 										   IncludeIdentities includeIdentityDefaults,
 										   char *accessMethod);
 extern void EnsureRelationKindSupported(Oid relationId);

src/include/distributed/commands.h

@@ -48,7 +48,8 @@ extern void SwitchToSequentialAndLocalExecutionIfRelationNameTooLong(Oid relatio
 extern void SwitchToSequentialAndLocalExecutionIfPartitionNameTooLong(Oid
 																	  parentRelationId,
 																	  Oid
-																	  partitionRelationId);
+																	  partitionRelationId)
+;
 
 /* DistOpsOperationType to be used in DistributeObjectOps */
 typedef enum DistOpsOperationType
@@ -560,13 +561,15 @@ extern List * PreprocessAlterSequenceSchemaStmt(Node *node, const char *queryStr
 												processUtilityContext);
 extern List * PostprocessAlterSequenceSchemaStmt(Node *node, const char *queryString);
 extern List * PreprocessAlterSequenceOwnerStmt(Node *node, const char *queryString,
-											   ProcessUtilityContext processUtilityContext);
+											   ProcessUtilityContext processUtilityContext
+											   );
 extern List * PostprocessAlterSequenceOwnerStmt(Node *node, const char *queryString);
 extern List * PreprocessAlterSequencePersistenceStmt(Node *node, const char *queryString,
 													 ProcessUtilityContext
 													 processUtilityContext);
 extern List * PreprocessSequenceAlterTableStmt(Node *node, const char *queryString,
-											   ProcessUtilityContext processUtilityContext);
+											   ProcessUtilityContext processUtilityContext
+											   );
 extern List * PreprocessDropSequenceStmt(Node *node, const char *queryString,
 										 ProcessUtilityContext processUtilityContext);
 extern List * SequenceDropStmtObjectAddress(Node *stmt, bool missing_ok, bool
@@ -639,7 +642,8 @@ extern void PrepareAlterTableStmtForConstraint(AlterTableStmt *alterTableStateme
 extern List * PreprocessAlterTableStmt(Node *node, const char *alterTableCommand,
 									   ProcessUtilityContext processUtilityContext);
 extern List * PreprocessAlterTableMoveAllStmt(Node *node, const char *queryString,
-											  ProcessUtilityContext processUtilityContext);
+											  ProcessUtilityContext processUtilityContext)
+;
 extern List * PreprocessAlterTableSchemaStmt(Node *node, const char *queryString,
 											 ProcessUtilityContext processUtilityContext);
 extern void SkipForeignKeyValidationIfConstraintIsFkey(AlterTableStmt *alterTableStmt,
@@ -789,8 +793,8 @@ extern List * PostprocessAlterTriggerDependsStmt(Node *node, const char *querySt
 extern List * PreprocessAlterTriggerDependsStmt(Node *node, const char *queryString,
 												ProcessUtilityContext
 												processUtilityContext);
-extern void AlterTriggerDependsEventExtendNames(
+extern void AlterTriggerDependsEventExtendNames(AlterObjectDependsStmt *
-	AlterObjectDependsStmt *alterTriggerDependsStmt,
+												alterTriggerDependsStmt,
 												char *schemaName, uint64 shardId);
 extern void ErrorOutForTriggerIfNotSupported(Oid relationId);
 extern void ErrorIfRelationHasUnsupportedTrigger(Oid relationId);
@@ -834,8 +838,9 @@ extern bool RelationIdListHasReferenceTable(List *relationIdList);
 extern List * GetFKeyCreationCommandsForRelationIdList(List *relationIdList);
 extern void DropRelationForeignKeys(Oid relationId, int flags);
 extern void SetLocalEnableLocalReferenceForeignKeys(bool state);
-extern void ExecuteAndLogUtilityCommandListInTableTypeConversionViaSPI(
+extern void ExecuteAndLogUtilityCommandListInTableTypeConversionViaSPI(List *
-	List *utilityCommandList);
+																	   utilityCommandList)
+;
 extern void ExecuteAndLogUtilityCommandList(List *ddlCommandList);
 extern void ExecuteAndLogUtilityCommand(const char *commandString);
 extern void ExecuteForeignKeyCreateCommandList(List *ddlCommandList,

src/include/distributed/coordinator_protocol.h

@@ -63,7 +63,8 @@
 #define WORKER_APPLY_SHARD_DDL_COMMAND_WITHOUT_SCHEMA \
 		"SELECT worker_apply_shard_ddl_command (" UINT64_FORMAT ", %s)"
 #define WORKER_APPLY_INTER_SHARD_DDL_COMMAND \
-	"SELECT worker_apply_inter_shard_ddl_command (" UINT64_FORMAT ", %s, " UINT64_FORMAT \
+		"SELECT worker_apply_inter_shard_ddl_command (" UINT64_FORMAT \
+		", %s, " UINT64_FORMAT \
 		", %s, %s)"
 #define SHARD_RANGE_QUERY "SELECT min(%s), max(%s) FROM %s"
 #define SHARD_TABLE_SIZE_QUERY "SELECT pg_table_size(%s)"
@@ -225,7 +226,8 @@ extern uint64 GetNextShardId(void);
 extern uint64 GetNextPlacementId(void);
 extern Oid ResolveRelationId(text *relationName, bool missingOk);
 extern List * GetFullTableCreationCommands(Oid relationId,
-										   IncludeSequenceDefaults includeSequenceDefaults,
+										   IncludeSequenceDefaults includeSequenceDefaults
+										   ,
 										   IncludeIdentities includeIdentityDefaults,
 										   bool creatingShellTableOnRemoteNode);
 extern List * GetPostLoadTableCreationCommands(Oid relationId, bool includeIndexes,

src/include/distributed/extended_op_node_utils.h

@@ -40,8 +40,9 @@ typedef struct ExtendedOpNodeProperties
 } ExtendedOpNodeProperties;
 
 
-extern ExtendedOpNodeProperties BuildExtendedOpNodeProperties(
+extern ExtendedOpNodeProperties BuildExtendedOpNodeProperties(MultiExtendedOp *
-	MultiExtendedOp *extendedOpNode, bool hasNonDistributableAggregates);
+															  extendedOpNode, bool
+															  hasNonDistributableAggregates);
 
 
 #endif /* EXTENDED_OP_NODE_UTILS_H_ */

src/include/distributed/intermediate_results.h

@@ -112,8 +112,8 @@ extern List * PartitionTasklistResults(const char *resultIdPrefix, List *selectT
 									   int partitionColumnIndex,
 									   CitusTableCacheEntry *distributionScheme,
 									   bool binaryFormat);
-extern char * QueryStringForFragmentsTransfer(
+extern char * QueryStringForFragmentsTransfer(NodeToNodeFragmentsTransfer *
-	NodeToNodeFragmentsTransfer *fragmentsTransfer);
+											  fragmentsTransfer);
 extern void ShardMinMaxValueArrays(ShardInterval **shardIntervalArray, int shardCount,
 								   Oid intervalTypeId, ArrayType **minValueArray,
 								   ArrayType **maxValueArray);

src/include/distributed/metadata_cache.h

@@ -210,7 +210,8 @@ extern ShardPlacement * ShardPlacementForFunctionColocatedWithDistTable(
 	DistObjectCacheEntry *procedure, List *argumentList, Var *partitionColumn,
 	CitusTableCacheEntry
 	*cacheEntry,
-	PlannedStmt *plan);
+	PlannedStmt *plan)
+;
 extern bool CitusHasBeenLoaded(void);
 extern bool CheckCitusVersion(int elevel);
 extern bool CheckAvailableVersion(int elevel);

src/include/distributed/placement_connection.h

@@ -21,7 +21,8 @@ extern MultiConnection * StartPlacementConnection(uint32 flags,
 												  struct ShardPlacement *placement,
 												  const char *userName);
 extern MultiConnection *  GetConnectionIfPlacementAccessedInXact(int flags,
-																 List *placementAccessList,
+																 List *placementAccessList
+																 ,
 																 const char *userName);
 extern MultiConnection * StartPlacementListConnection(uint32 flags,
 													  List *placementAccessList,

src/include/distributed/query_pushdown_planning.h

@@ -26,7 +26,8 @@ extern int ValuesMaterializationThreshold;
 
 extern bool CanPushdownSubquery(Query *subqueryTree, bool outerMostQueryHasLimit);
 extern bool ShouldUseSubqueryPushDown(Query *originalQuery, Query *rewrittenQuery,
-									  PlannerRestrictionContext *plannerRestrictionContext);
+									  PlannerRestrictionContext *plannerRestrictionContext
+									  );
 extern bool JoinTreeContainsSubquery(Query *query);
 extern bool IsNodeSubquery(Node *node);
 extern bool HasEmptyJoinTree(Query *query);
@@ -37,8 +38,8 @@ extern MultiNode * SubqueryMultiNodeTree(Query *originalQuery,
 										 Query *queryTree,
 										 PlannerRestrictionContext *
 										 plannerRestrictionContext);
-extern DeferredErrorMessage * DeferErrorIfUnsupportedSubqueryPushdown(
+extern DeferredErrorMessage * DeferErrorIfUnsupportedSubqueryPushdown(Query *originalQuery
-	Query *originalQuery,
+																	  ,
 																	  PlannerRestrictionContext
 																	  *
 																	  plannerRestrictionContext,

src/include/distributed/recursive_planning.h

@@ -31,8 +31,8 @@ typedef struct RangeTblEntryIndex
 	Index rteIndex;
 }RangeTblEntryIndex;
 
-extern PlannerRestrictionContext * GetPlannerRestrictionContext(
+extern PlannerRestrictionContext * GetPlannerRestrictionContext(RecursivePlanningContext *
-	RecursivePlanningContext *recursivePlanningContext);
+																recursivePlanningContext);
 extern List * GenerateSubplansForSubqueriesAndCTEs(uint64 planId, Query *originalQuery,
 												   PlannerRestrictionContext *
 												   plannerRestrictionContext,

src/include/distributed/relation_restriction_equivalence.h

@@ -41,8 +41,8 @@ extern PlannerRestrictionContext * FilterPlannerRestrictionForQuery(
 extern List * GetRestrictInfoListForRelation(RangeTblEntry *rangeTblEntry,
 											 PlannerRestrictionContext *
 											 plannerRestrictionContext);
-extern RelationRestriction * RelationRestrictionForRelation(
+extern RelationRestriction * RelationRestrictionForRelation(RangeTblEntry *rangeTableEntry
-	RangeTblEntry *rangeTableEntry,
+															,
 															PlannerRestrictionContext *
 															plannerRestrictionContext);
 extern JoinRestrictionContext * RemoveDuplicateJoinRestrictions(JoinRestrictionContext *

src/include/distributed/repartition_executor.h

@@ -20,8 +20,8 @@ extern List * GenerateTaskListWithColocatedIntermediateResults(Oid targetRelatio
 															   Query *
 															   modifyQueryViaCoordinatorOrRepartition,
 															   char *resultIdPrefix);
-extern List * GenerateTaskListWithRedistributedResults(
+extern List * GenerateTaskListWithRedistributedResults(Query *
-	Query *modifyQueryViaCoordinatorOrRepartition,
+													   modifyQueryViaCoordinatorOrRepartition,
 													   CitusTableCacheEntry *
 													   targetRelation,
 													   List **redistributedResults,

src/include/distributed/resource_lock.h

@@ -171,7 +171,8 @@ IsNodeWideObjectClass(ObjectClass objectClass)
 	 * this assertion check based on latest supported major Postgres version.
 	 */
 	StaticAssertStmt(PG_MAJORVERSION_NUM <= 18,
-					 "better to check if any of newly added ObjectClass'es are node-wide");
+					 "better to check if any of newly added ObjectClass'es are node-wide")
+	;
 
 	switch (objectClass)
 	{
@@ -187,9 +188,11 @@ IsNodeWideObjectClass(ObjectClass objectClass)
 		}
 
 		default:
+		{
 			return false;
 		}
 	}
+}
 
 
 /*

src/include/distributed/shardinterval_utils.h

@@ -38,7 +38,8 @@ typedef struct SortShardIntervalContext
 
 extern ShardInterval ** SortShardIntervalArray(ShardInterval **shardIntervalArray, int
 											   shardCount, Oid collation,
-											   FmgrInfo *shardIntervalSortCompareFunction);
+											   FmgrInfo *shardIntervalSortCompareFunction)
+;
 extern int CompareShardIntervals(const void *leftElement, const void *rightElement,
 								 SortShardIntervalContext *sortContext);
 extern int CompareShardIntervalsById(const void *leftElement, const void *rightElement);

src/include/distributed/shardsplit_logical_replication.h

@@ -34,9 +34,10 @@ extern List * PopulateShardSplitSubscriptionsMetadataList(HTAB *shardSplitInfoHa
 														  List *
 														  shardGroupSplitIntervalListList,
 														  List *workersForPlacementList);
-extern HTAB *  CreateShardSplitInfoMapForPublication(
+extern HTAB *  CreateShardSplitInfoMapForPublication(List *
-	List *sourceColocatedShardIntervalList,
+													 sourceColocatedShardIntervalList,
-	List *shardGroupSplitIntervalListList,
+													 List *shardGroupSplitIntervalListList
+													 ,
 													 List *destinationWorkerNodesList);
 
 /* Functions to drop publisher-subscriber resources */

src/include/distributed/shardsplit_shared_memory.h

@@ -74,7 +74,8 @@ void StoreShardSplitSharedMemoryHandle(dsm_handle dsmHandle);
 /* Functions for creating and accessing shared memory segments consisting shard split information */
 extern ShardSplitInfoSMHeader * CreateSharedMemoryForShardSplitInfo(int
 																	shardSplitInfoCount,
-																	dsm_handle *dsmHandle);
+																	dsm_handle *dsmHandle)
+;
 extern void ReleaseSharedMemoryOfShardSplitInfo(void);
 
 extern ShardSplitInfoSMHeader *  GetShardSplitInfoSMHeader(void);

src/include/distributed/worker_shard_copy.h

@@ -16,7 +16,8 @@
 extern bool EnableBinaryProtocol;
 
 extern DestReceiver * CreateShardCopyDestReceiver(EState *executorState,
-												  List *destinationShardFullyQualifiedName,
+												  List *destinationShardFullyQualifiedName
+												  ,
 												  uint32_t destinationNodeId);
 
 extern const char * CopyableColumnNamesFromRelationName(const char *schemaName, const

src/include/distributed/worker_transaction.h

@@ -81,8 +81,10 @@ extern bool SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
 	List *
 	commandList);
 extern bool SendOptionalMetadataCommandListToWorkerInCoordinatedTransaction(const
-																			char *nodeName,
+																			char *nodeName
-																			int32 nodePort,
+																			,
+																			int32 nodePort
+																			,
 																			const char *
 																			nodeUser,
 																			List *
@@ -100,16 +102,17 @@ extern void SendCommandListToWorkerOutsideTransaction(const char *nodeName,
 													  int32 nodePort,
 													  const char *nodeUser,
 													  List *commandList);
-extern void SendCommandListToWorkerOutsideTransactionWithConnection(
+extern void SendCommandListToWorkerOutsideTransactionWithConnection(MultiConnection *
-	MultiConnection *workerConnection,
+																	workerConnection,
 																	List *commandList);
 extern void SendCommandListToWorkerListWithBareConnections(List *workerConnections,
 														   List *commandList);
-extern void SendMetadataCommandListToWorkerListInCoordinatedTransaction(
+extern void SendMetadataCommandListToWorkerListInCoordinatedTransaction(List *
-	List *workerNodeList,
+																		workerNodeList,
 																		const char *
 																		nodeUser,
-	List *commandList);
+																		List *commandList)
+;
 extern void RemoveWorkerTransaction(const char *nodeName, int32 nodePort);
 
 /* helper functions for worker transactions */

src/include/pg_version_compat.h

@@ -364,8 +364,10 @@ getObjectClass(const ObjectAddress *object)
 		}
 
 		case TransformRelationId:
+		{
 			return OCLASS_TRANSFORM;
 		}
+	}
 
 	/* shouldn't get here */
 	elog(ERROR, "unrecognized object class: %u", object->classId);