Pre-beta mechanical code beautification.

Run pgindent, pgperltidy, and reformat-dat-files.
I manually fixed a couple of comments that pgindent uglified.

42 files changed, 207 insertions, 191 deletions

diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h
index a382551a981..0b89f399f08 100644
--- a/src/include/access/amapi.h
+++ b/src/include/access/amapi.h
@@ -245,7 +245,7 @@ typedef struct IndexAmRoutine
 	/* does AM use maintenance_work_mem? */
 	bool		amusemaintenanceworkmem;
 	/* does AM block HOT update? */
-	bool        amhotblocking;
+	bool		amhotblocking;
 	/* OR of parallel vacuum flags.  See vacuum.h for flags. */
 	uint8		amparallelvacuumoptions;
 	/* type of data stored in index, or InvalidOid if variable */
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 5d7f7fd800e..abf62d9df79 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -188,7 +188,7 @@ extern int	heap_page_prune(Relation relation, Buffer buffer,
 							struct GlobalVisState *vistest,
 							TransactionId old_snap_xmin,
 							TimestampTz old_snap_ts_ts,
-							int	*nnewlpdead,
+							int *nnewlpdead,
 							OffsetNumber *off_loc);
 extern void heap_page_prune_execute(Buffer buffer,
 									OffsetNumber *redirected, int nredirected,
diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h
index e465800e445..3b6a497e1b4 100644
--- a/src/include/access/rmgr.h
+++ b/src/include/access/rmgr.h
@@ -26,7 +26,7 @@ typedef enum RmgrIds
 {
 #include "access/rmgrlist.h"
 	RM_NEXT_ID
-} RmgrIds;
+}			RmgrIds;
 
 #undef PG_RMGR
 
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 837fe7de0b9..4794941df31 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -231,9 +231,10 @@ typedef struct xl_xact_assignment
 typedef struct xl_xact_xinfo
 {
 	/*
-	 * Even though we right now only require two bytes of space in xinfo we use
-	 * four so following records don't have to care about alignment. Commit
-	 * records can be large, so copying large portions isn't attractive.
+	 * Even though we right now only require two bytes of space in xinfo we
+	 * use four so following records don't have to care about alignment.
+	 * Commit records can be large, so copying large portions isn't
+	 * attractive.
 	 */
 	uint32		xinfo;
 } xl_xact_xinfo;
@@ -274,7 +275,7 @@ typedef struct xl_xact_stats_item
 
 typedef struct xl_xact_stats_items
 {
-	int		nitems;
+	int			nitems;
 	xl_xact_stats_item items[FLEXIBLE_ARRAY_MEMBER];
 } xl_xact_stats_items;
 #define MinSizeOfXactStatsItems offsetof(xl_xact_stats_items, items)
@@ -378,7 +379,7 @@ typedef struct xl_xact_parsed_commit
 	char		twophase_gid[GIDSIZE];	/* only for 2PC */
 	int			nabortrels;		/* only for 2PC */
 	RelFileNode *abortnodes;	/* only for 2PC */
-	int			nabortstats;		/* only for 2PC */
+	int			nabortstats;	/* only for 2PC */
 	xl_xact_stats_item *abortstats; /* only for 2PC */
 
 	XLogRecPtr	origin_lsn;
diff --git a/src/include/access/xlogstats.h b/src/include/access/xlogstats.h
index be59eece225..7eb4370f2d5 100644
--- a/src/include/access/xlogstats.h
+++ b/src/include/access/xlogstats.h
@@ -20,20 +20,20 @@
 
 typedef struct XLogRecStats
 {
-	uint64	count;
-	uint64	rec_len;
-	uint64	fpi_len;
+	uint64		count;
+	uint64		rec_len;
+	uint64		fpi_len;
 } XLogRecStats;
 
 typedef struct XLogStats
 {
-	uint64	count;
+	uint64		count;
 #ifdef FRONTEND
 	XLogRecPtr	startptr;
 	XLogRecPtr	endptr;
 #endif
-	XLogRecStats    rmgr_stats[RM_MAX_ID + 1];
-	XLogRecStats    record_stats[RM_MAX_ID + 1][MAX_XLINFO_TYPES];
+	XLogRecStats rmgr_stats[RM_MAX_ID + 1];
+	XLogRecStats record_stats[RM_MAX_ID + 1][MAX_XLINFO_TYPES];
 } XLogStats;
 
 extern void XLogRecGetLen(XLogReaderState *record, uint32 *rec_len,
diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h
index 5fcbbc136f9..c9d0b75a01b 100644
--- a/src/include/access/xlogutils.h
+++ b/src/include/access/xlogutils.h
@@ -78,7 +78,7 @@ typedef enum
 /* Private data of the read_local_xlog_page_no_wait callback. */
 typedef struct ReadLocalXLogPageNoWaitPrivate
 {
-	bool end_of_wal;	/* true, when end of WAL is reached */
+	bool		end_of_wal;		/* true, when end of WAL is reached */
 } ReadLocalXLogPageNoWaitPrivate;
 
 extern XLogRedoAction XLogReadBufferForRedo(XLogReaderState *record,
diff --git a/src/include/catalog/objectaccess.h b/src/include/catalog/objectaccess.h
index ac6adcb7300..567ab63e855 100644
--- a/src/include/catalog/objectaccess.h
+++ b/src/include/catalog/objectaccess.h
@@ -129,10 +129,10 @@ typedef void (*object_access_hook_type) (ObjectAccessType access,
 										 void *arg);
 
 typedef void (*object_access_hook_type_str) (ObjectAccessType access,
-										 Oid classId,
-										 const char *objectStr,
-										 int subId,
-										 void *arg);
+											 Oid classId,
+											 const char *objectStr,
+											 int subId,
+											 void *arg);
 
 /* Plugin sets this variable to a suitable hook function. */
 extern PGDLLIMPORT object_access_hook_type object_access_hook;
@@ -152,12 +152,12 @@ extern void RunFunctionExecuteHook(Oid objectId);
 
 /* String versions */
 extern void RunObjectPostCreateHookStr(Oid classId, const char *objectStr, int subId,
-									bool is_internal);
+									   bool is_internal);
 extern void RunObjectDropHookStr(Oid classId, const char *objectStr, int subId,
-							  int dropflags);
+								 int dropflags);
 extern void RunObjectTruncateHookStr(const char *objectStr);
 extern void RunObjectPostAlterHookStr(Oid classId, const char *objectStr, int subId,
-								   Oid auxiliaryId, bool is_internal);
+									  Oid auxiliaryId, bool is_internal);
 extern bool RunNamespaceSearchHookStr(const char *objectStr, bool ereport_on_violation);
 extern void RunFunctionExecuteHookStr(const char *objectStr);
 
diff --git a/src/include/catalog/pg_aggregate.dat b/src/include/catalog/pg_aggregate.dat
index 62156346cf4..86cc6507983 100644
--- a/src/include/catalog/pg_aggregate.dat
+++ b/src/include/catalog/pg_aggregate.dat
@@ -563,7 +563,8 @@
 { aggfnoid => 'range_agg(anyrange)', aggtransfn => 'range_agg_transfn',
   aggfinalfn => 'range_agg_finalfn', aggfinalextra => 't',
   aggtranstype => 'internal' },
-{ aggfnoid => 'range_agg(anymultirange)', aggtransfn => 'multirange_agg_transfn',
+{ aggfnoid => 'range_agg(anymultirange)',
+  aggtransfn => 'multirange_agg_transfn',
   aggfinalfn => 'multirange_agg_finalfn', aggfinalextra => 't',
   aggtranstype => 'internal' },
 
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 304e8c18d52..e1f4eefa220 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -223,7 +223,7 @@ DECLARE_INDEX(pg_class_tblspc_relfilenode_index, 3455, ClassTblspcRelfilenodeInd
 	 (relkind) == RELKIND_TOASTVALUE || \
 	 (relkind) == RELKIND_MATVIEW)
 
-extern int errdetail_relkind_not_supported(char relkind);
+extern int	errdetail_relkind_not_supported(char relkind);
 
 #endif							/* EXPOSE_TO_CLIENT_CODE */
 
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index c642c3bb952..2190ccb5b88 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -41,7 +41,7 @@ CATALOG(pg_collation,3456,CollationRelationId)
 	int32		collencoding;	/* encoding for this collation; -1 = "all" */
 #ifdef CATALOG_VARLEN			/* variable-length fields start here */
 	text		collcollate BKI_DEFAULT(_null_);	/* LC_COLLATE setting */
-	text		collctype BKI_DEFAULT(_null_);		/* LC_CTYPE setting */
+	text		collctype BKI_DEFAULT(_null_);	/* LC_CTYPE setting */
 	text		colliculocale BKI_DEFAULT(_null_);	/* ICU locale ID */
 	text		collversion BKI_DEFAULT(_null_);	/* provider-dependent
 													 * version of collation
diff --git a/src/include/catalog/pg_database.dat b/src/include/catalog/pg_database.dat
index 05873f74f68..47dcbfb343b 100644
--- a/src/include/catalog/pg_database.dat
+++ b/src/include/catalog/pg_database.dat
@@ -14,7 +14,8 @@
 
 { oid => '1', oid_symbol => 'Template1DbOid',
   descr => 'default template for new databases',
-  datname => 'template1', encoding => 'ENCODING', datlocprovider => 'LOCALE_PROVIDER', datistemplate => 't',
+  datname => 'template1', encoding => 'ENCODING',
+  datlocprovider => 'LOCALE_PROVIDER', datistemplate => 't',
   datallowconn => 't', datconnlimit => '-1', datfrozenxid => '0',
   datminmxid => '1', dattablespace => 'pg_default', datcollate => 'LC_COLLATE',
   datctype => 'LC_CTYPE', daticulocale => 'ICU_LOCALE', datacl => '_null_' },
diff --git a/src/include/catalog/pg_parameter_acl.h b/src/include/catalog/pg_parameter_acl.h
index 263079c9e1d..aa7264a4bbb 100644
--- a/src/include/catalog/pg_parameter_acl.h
+++ b/src/include/catalog/pg_parameter_acl.h
@@ -46,7 +46,7 @@ CATALOG(pg_parameter_acl,8924,ParameterAclRelationId) BKI_SHARED_RELATION
  *		the format of pg_parameter_acl relation.
  * ----------------
  */
-typedef FormData_pg_parameter_acl *Form_pg_parameter_acl;
+typedef FormData_pg_parameter_acl * Form_pg_parameter_acl;
 
 DECLARE_TOAST_WITH_MACRO(pg_parameter_acl, 8925, 8926, PgParameterAclToastTable, PgParameterAclToastIndex);
 
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 6d378ff7859..c1bc1c3cce1 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -5383,9 +5383,8 @@
   prosrc => 'pg_stat_have_stats' },
 
 { oid => '8523', descr => 'statistics: information about subscription stats',
-  proname => 'pg_stat_get_subscription_stats',
-  provolatile => 's', proparallel => 'r',
-  prorettype => 'record', proargtypes => 'oid',
+  proname => 'pg_stat_get_subscription_stats', provolatile => 's',
+  proparallel => 'r', prorettype => 'record', proargtypes => 'oid',
   proallargtypes => '{oid,oid,int8,int8,timestamptz}',
   proargmodes => '{i,o,o,o,o}',
   proargnames => '{subid,subid,apply_error_count,sync_error_count,stats_reset}',
@@ -5655,8 +5654,8 @@
   proargnames => '{wal_records,wal_fpi,wal_bytes,wal_buffers_full,wal_write,wal_sync,wal_write_time,wal_sync_time,stats_reset}',
   prosrc => 'pg_stat_get_wal' },
 { oid => '9085', descr => 'statistics: information about WAL prefetching',
-  proname => 'pg_stat_get_recovery_prefetch', prorows => '1', provolatile => 'v',
-  proretset => 't', prorettype => 'record', proargtypes => '',
+  proname => 'pg_stat_get_recovery_prefetch', prorows => '1', proretset => 't',
+  provolatile => 'v', prorettype => 'record', proargtypes => '',
   proallargtypes => '{timestamptz,int8,int8,int8,int8,int8,int8,int4,int4,int4}',
   proargmodes => '{o,o,o,o,o,o,o,o,o,o}',
   proargnames => '{stats_reset,prefetch,hit,skip_init,skip_new,skip_fpw,skip_rep,wal_distance,block_distance,io_depth}',
@@ -6298,8 +6297,7 @@
 { oid => '2739', descr => 'finish taking an online backup',
   proname => 'pg_backup_stop', provolatile => 'v', proparallel => 'r',
   prorettype => 'record', proargtypes => 'bool',
-  proallargtypes => '{bool,pg_lsn,text,text}',
-  proargmodes => '{i,o,o,o}',
+  proallargtypes => '{bool,pg_lsn,text,text}', proargmodes => '{i,o,o,o}',
   proargnames => '{wait_for_archive,lsn,labelfile,spcmapfile}',
   prosrc => 'pg_backup_stop' },
 { oid => '3436', descr => 'promote standby server',
@@ -8800,15 +8798,18 @@
   prosrc => 'json_object_agg_transfn' },
 { oid => '8175', descr => 'json object aggregate transition function',
   proname => 'json_object_agg_strict_transfn', proisstrict => 'f',
-  provolatile => 's', prorettype => 'internal', proargtypes => 'internal any any',
+  provolatile => 's', prorettype => 'internal',
+  proargtypes => 'internal any any',
   prosrc => 'json_object_agg_strict_transfn' },
 { oid => '8176', descr => 'json object aggregate transition function',
   proname => 'json_object_agg_unique_transfn', proisstrict => 'f',
-  provolatile => 's', prorettype => 'internal', proargtypes => 'internal any any',
+  provolatile => 's', prorettype => 'internal',
+  proargtypes => 'internal any any',
   prosrc => 'json_object_agg_unique_transfn' },
 { oid => '8177', descr => 'json object aggregate transition function',
   proname => 'json_object_agg_unique_strict_transfn', proisstrict => 'f',
-  provolatile => 's', prorettype => 'internal', proargtypes => 'internal any any',
+  provolatile => 's', prorettype => 'internal',
+  proargtypes => 'internal any any',
   prosrc => 'json_object_agg_unique_strict_transfn' },
 { oid => '3196', descr => 'json object aggregate final function',
   proname => 'json_object_agg_finalfn', proisstrict => 'f',
@@ -8822,7 +8823,8 @@
   proname => 'json_object_agg_strict', prokind => 'a', proisstrict => 'f',
   provolatile => 's', prorettype => 'json', proargtypes => 'any any',
   prosrc => 'aggregate_dummy' },
-{ oid => '8179', descr => 'aggregate input into a json object with unique keys',
+{ oid => '8179',
+  descr => 'aggregate input into a json object with unique keys',
   proname => 'json_object_agg_unique', prokind => 'a', proisstrict => 'f',
   provolatile => 's', prorettype => 'json', proargtypes => 'any any',
   prosrc => 'aggregate_dummy' },
@@ -10192,15 +10194,15 @@
 # SQL-spec window functions
 { oid => '3100', descr => 'row number within partition',
   proname => 'row_number', prosupport => 'window_row_number_support',
-  prokind => 'w', proisstrict => 'f',  prorettype => 'int8',
-  proargtypes => '', prosrc => 'window_row_number' },
+  prokind => 'w', proisstrict => 'f', prorettype => 'int8', proargtypes => '',
+  prosrc => 'window_row_number' },
 { oid => '8799', descr => 'planner support for row_number run condition',
   proname => 'window_row_number_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'window_row_number_support' },
 { oid => '3101', descr => 'integer rank with gaps',
-  proname => 'rank', prosupport => 'window_rank_support',
-  prokind => 'w', proisstrict => 'f', prorettype => 'int8',
-  proargtypes => '', prosrc => 'window_rank' },
+  proname => 'rank', prosupport => 'window_rank_support', prokind => 'w',
+  proisstrict => 'f', prorettype => 'int8', proargtypes => '',
+  prosrc => 'window_rank' },
 { oid => '8800', descr => 'planner support for rank run condition',
   proname => 'window_rank_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'window_rank_support' },
@@ -10737,8 +10739,9 @@
   prorettype => 'anymultirange', proargtypes => 'anyrange',
   prosrc => 'aggregate_dummy' },
 { oid => '8205', descr => 'aggregate transition function',
-  proname => 'multirange_agg_transfn', proisstrict => 'f', prorettype => 'internal',
-  proargtypes => 'internal anymultirange', prosrc => 'multirange_agg_transfn' },
+  proname => 'multirange_agg_transfn', proisstrict => 'f',
+  prorettype => 'internal', proargtypes => 'internal anymultirange',
+  prosrc => 'multirange_agg_transfn' },
 { oid => '8206', descr => 'aggregate final function',
   proname => 'multirange_agg_finalfn', proisstrict => 'f',
   prorettype => 'anymultirange', proargtypes => 'internal anymultirange',
@@ -10756,8 +10759,8 @@
   prorettype => 'anymultirange', proargtypes => 'anymultirange',
   prosrc => 'aggregate_dummy' },
 { oid => '1293', descr => 'expand multirange to set of ranges',
-  proname => 'unnest', prorows => '100',
-  proretset => 't', prorettype => 'anyrange', proargtypes => 'anymultirange',
+  proname => 'unnest', prorows => '100', proretset => 't',
+  prorettype => 'anyrange', proargtypes => 'anymultirange',
   prosrc => 'multirange_unnest' },
 
 # date, time, timestamp constructors
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 29b18566657..48205ba4293 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -87,8 +87,8 @@ typedef struct PublicationDesc
 	bool		rf_valid_for_delete;
 
 	/*
-	 * true if the columns are part of the replica identity or the publication actions
-	 * do not include UPDATE or DELETE.
+	 * true if the columns are part of the replica identity or the publication
+	 * actions do not include UPDATE or DELETE.
 	 */
 	bool		cols_valid_for_update;
 	bool		cols_valid_for_delete;
diff --git a/src/include/catalog/pg_statistic_ext_data.h b/src/include/catalog/pg_statistic_ext_data.h
index b01e6205974..0ea3c41b5b0 100644
--- a/src/include/catalog/pg_statistic_ext_data.h
+++ b/src/include/catalog/pg_statistic_ext_data.h
@@ -50,7 +50,7 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId)
  *		the format of pg_statistic_ext_data relation.
  * ----------------
  */
-typedef FormData_pg_statistic_ext_data * Form_pg_statistic_ext_data;
+typedef FormData_pg_statistic_ext_data *Form_pg_statistic_ext_data;
 
 DECLARE_TOAST(pg_statistic_ext_data, 3430, 3431);
 
diff --git a/src/include/catalog/renumber_oids.pl b/src/include/catalog/renumber_oids.pl
index ba8c69c87e9..1e33450b444 100755
--- a/src/include/catalog/renumber_oids.pl
+++ b/src/include/catalog/renumber_oids.pl
@@ -140,7 +140,9 @@ foreach my $input_file (@header_files)
 				$changed = 1;
 			}
 		}
-		elsif ($line =~ m/^(DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*)(\d+)(,\s*)(\d+)(,\s*\w+,\s*\w+)\)/)
+		elsif ($line =~
+			m/^(DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*)(\d+)(,\s*)(\d+)(,\s*\w+,\s*\w+)\)/
+		  )
 		{
 			my $oid2 = $2;
 			my $oid4 = $4;
@@ -148,19 +150,21 @@ foreach my $input_file (@header_files)
 			{
 				$oid2 = $maphash{$oid2};
 				my $repl = $1 . $oid2 . $3 . $oid4 . $5 . ")";
-				$line =~ s/^DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*\d+,\s*\d+,\s*\w+,\s*\w+\)/$repl/;
+				$line =~
+				  s/^DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*\d+,\s*\d+,\s*\w+,\s*\w+\)/$repl/;
 				$changed = 1;
 			}
 			if (exists $maphash{$oid4})
 			{
 				$oid4 = $maphash{$oid4};
 				my $repl = $1 . $oid2 . $3 . $oid4 . $5 . ")";
-				$line =~ s/^DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*\d+,\s*\d+,\s*\w+,\s*\w+\)/$repl/;
+				$line =~
+				  s/^DECLARE_TOAST_WITH_MACRO\(\s*\w+,\s*\d+,\s*\d+,\s*\w+,\s*\w+\)/$repl/;
 				$changed = 1;
 			}
 		}
-		elsif (
-			$line =~ m/^(DECLARE_(UNIQUE_)?INDEX(_PKEY)?\(\s*\w+,\s*)(\d+)(,\s*.+)\)/)
+		elsif ($line =~
+			m/^(DECLARE_(UNIQUE_)?INDEX(_PKEY)?\(\s*\w+,\s*)(\d+)(,\s*.+)\)/)
 		{
 			if (exists $maphash{$4})
 			{
diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h
index ae87caf089d..57df3fc1e3d 100644
--- a/src/include/commands/publicationcmds.h
+++ b/src/include/commands/publicationcmds.h
@@ -32,8 +32,8 @@ extern ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId);
 extern void AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId);
 extern void InvalidatePublicationRels(List *relids);
 extern bool pub_rf_contains_invalid_column(Oid pubid, Relation relation,
-									 List *ancestors, bool pubviaroot);
+										   List *ancestors, bool pubviaroot);
 extern bool pub_collist_contains_invalid_column(Oid pubid, Relation relation,
-									 List *ancestors, bool pubviaroot);
+												List *ancestors, bool pubviaroot);
 
 #endif							/* PUBLICATIONCMDS_H */
diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 9df70e6f06f..e34db8c93cb 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -684,49 +684,49 @@ typedef struct ExprEvalStep
 			{
 				int			category;
 				Oid			outfuncid;
-			}		   *arg_type_cache;		/* cache for datum_to_json[b]() */
+			}		   *arg_type_cache; /* cache for datum_to_json[b]() */
 			int			nargs;
 		}			json_constructor;
 
 		/* for EEOP_IS_JSON */
 		struct
 		{
-					JsonIsPredicate *pred;	/* original expression node */
+			JsonIsPredicate *pred;	/* original expression node */
 		}			is_json;
 
 		/* for EEOP_JSONEXPR */
 		struct
 		{
-			JsonExpr   *jsexpr;			/* original expression node */
+			JsonExpr   *jsexpr; /* original expression node */
 
 			struct
 			{
-				FmgrInfo	func;		/* typinput function for output type */
+				FmgrInfo	func;	/* typinput function for output type */
 				Oid			typioparam;
-			} input;					/* I/O info for output type */
+			}			input;	/* I/O info for output type */
 
 			NullableDatum
-					   *formatted_expr,		/* formatted context item value */
-					   *res_expr,			/* result item */
-					   *coercion_expr,		/* input for JSON item coercion */
-					   *pathspec;			/* path specification value */
+					   *formatted_expr, /* formatted context item value */
+					   *res_expr,	/* result item */
+					   *coercion_expr,	/* input for JSON item coercion */
+					   *pathspec;	/* path specification value */
 
-			ExprState  *result_expr;		/* coerced to output type */
+			ExprState  *result_expr;	/* coerced to output type */
 			ExprState  *default_on_empty;	/* ON EMPTY DEFAULT expression */
 			ExprState  *default_on_error;	/* ON ERROR DEFAULT expression */
-			List	   *args;				/* passing arguments */
+			List	   *args;	/* passing arguments */
 
-			void	   *cache;				/* cache for json_populate_type() */
+			void	   *cache;	/* cache for json_populate_type() */
 
 			struct JsonCoercionsState
 			{
 				struct JsonCoercionState
 				{
-					JsonCoercion *coercion;		/* coercion expression */
-					ExprState  *estate;	/* coercion expression state */
-				} 			null,
+					JsonCoercion *coercion; /* coercion expression */
+					ExprState  *estate; /* coercion expression state */
+				}			null,
 							string,
-							numeric,
+				numeric    ,
 							boolean,
 							date,
 							time,
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 873772f1883..d68a6b9d28c 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -266,7 +266,7 @@ ExecProcNode(PlanState *node)
 extern ExprState *ExecInitExpr(Expr *node, PlanState *parent);
 extern ExprState *ExecInitExprWithParams(Expr *node, ParamListInfo ext_params);
 extern ExprState *ExecInitExprWithCaseValue(Expr *node, PlanState *parent,
-						  Datum *caseval, bool *casenull);
+											Datum *caseval, bool *casenull);
 extern ExprState *ExecInitQual(List *qual, PlanState *parent);
 extern ExprState *ExecInitCheck(List *qual, PlanState *parent);
 extern List *ExecInitExprList(List *nodes, PlanState *parent);
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index d55abc5414d..5314b737052 100644
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -473,7 +473,7 @@ typedef struct
 	FMGR_ABI_EXTRA, \
 }
 
-StaticAssertDecl(sizeof(FMGR_ABI_EXTRA) <= sizeof(((Pg_magic_struct*)0)->abi_extra),
+StaticAssertDecl(sizeof(FMGR_ABI_EXTRA) <= sizeof(((Pg_magic_struct *) 0)->abi_extra),
 				 "FMGR_ABI_EXTRA too long");
 
 /*
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 94b191f8ae0..57288013795 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -2158,8 +2158,8 @@ typedef struct MemoizeState
 								 * by bit, false when using hash equality ops */
 	MemoizeInstrumentation stats;	/* execution statistics */
 	SharedMemoizeInfo *shared_info; /* statistics for parallel workers */
-	Bitmapset	   *keyparamids; /* Param->paramids of expressions belonging to
-								  * param_exprs */
+	Bitmapset  *keyparamids;	/* Param->paramids of expressions belonging to
+								 * param_exprs */
 } MemoizeState;
 
 /* ----------------
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 340d28f4e1a..b3b407579b0 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -705,7 +705,8 @@ extern bool equal(const void *a, const void *b);
  */
 typedef double Selectivity;		/* fraction of tuples a qualifier will pass */
 typedef double Cost;			/* execution cost (in page-access units) */
-typedef double Cardinality;		/* (estimated) number of rows or other integer count */
+typedef double Cardinality;		/* (estimated) number of rows or other integer
+								 * count */
 
 
 /*
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 9a716f3794f..73f635b4553 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -301,6 +301,7 @@ typedef struct A_Expr
 typedef struct A_Const
 {
 	NodeTag		type;
+
 	/*
 	 * Value nodes are inline for performance.  You can treat 'val' as a node,
 	 * as in IsA(&val, Integer).  'val' is not valid if isnull is true.
@@ -763,7 +764,8 @@ typedef struct DefElem
 	NodeTag		type;
 	char	   *defnamespace;	/* NULL if unqualified name */
 	char	   *defname;
-	Node	   *arg;			/* typically Integer, Float, String, or TypeName */
+	Node	   *arg;			/* typically Integer, Float, String, or
+								 * TypeName */
 	DefElemAction defaction;	/* unspecified action, or SET/ADD/DROP */
 	int			location;		/* token location, or -1 if unknown */
 } DefElem;
@@ -1151,7 +1153,7 @@ typedef struct RangeTblEntry
 	 * Fields valid for ENR RTEs (else NULL/zero):
 	 */
 	char	   *enrname;		/* name of ephemeral named relation */
-	Cardinality	enrtuples;		/* estimated or actual from caller */
+	Cardinality enrtuples;		/* estimated or actual from caller */
 
 	/*
 	 * Fields valid in all RTEs:
@@ -1667,7 +1669,7 @@ typedef struct JsonFuncExpr
 	JsonOutput *output;			/* output clause, if specified */
 	JsonBehavior *on_empty;		/* ON EMPTY behavior, if specified */
 	JsonBehavior *on_error;		/* ON ERROR behavior, if specified */
-	JsonWrapper	wrapper;		/* array wrapper behavior (JSON_QUERY only) */
+	JsonWrapper wrapper;		/* array wrapper behavior (JSON_QUERY only) */
 	bool		omit_quotes;	/* omit or keep quotes? (JSON_QUERY only) */
 	int			location;		/* token location, or -1 if unknown */
 } JsonFuncExpr;
@@ -1680,17 +1682,17 @@ typedef struct JsonTableColumn
 {
 	NodeTag		type;
 	JsonTableColumnType coltype;	/* column type */
-	char	   *name;				/* column name */
-	TypeName   *typeName;			/* column type name */
-	char	   *pathspec;			/* path specification, if any */
-	char	   *pathname;			/* path name, if any */
-	JsonFormat *format;				/* JSON format clause, if specified */
-	JsonWrapper	wrapper;			/* WRAPPER behavior for formatted columns */
-	bool		omit_quotes;		/* omit or keep quotes on scalar strings? */
-	List	   *columns;			/* nested columns */
-	JsonBehavior *on_empty;			/* ON EMPTY behavior */
-	JsonBehavior *on_error;			/* ON ERROR behavior */
-	int			location;			/* token location, or -1 if unknown */
+	char	   *name;			/* column name */
+	TypeName   *typeName;		/* column type name */
+	char	   *pathspec;		/* path specification, if any */
+	char	   *pathname;		/* path name, if any */
+	JsonFormat *format;			/* JSON format clause, if specified */
+	JsonWrapper wrapper;		/* WRAPPER behavior for formatted columns */
+	bool		omit_quotes;	/* omit or keep quotes on scalar strings? */
+	List	   *columns;		/* nested columns */
+	JsonBehavior *on_empty;		/* ON EMPTY behavior */
+	JsonBehavior *on_error;		/* ON ERROR behavior */
+	int			location;		/* token location, or -1 if unknown */
 } JsonTableColumn;
 
 /*
@@ -1725,12 +1727,12 @@ typedef struct JsonTablePlan JsonTablePlan;
 struct JsonTablePlan
 {
 	NodeTag		type;
-	JsonTablePlanType plan_type;		/* plan type */
+	JsonTablePlanType plan_type;	/* plan type */
 	JsonTablePlanJoinType join_type;	/* join type (for joined plan only) */
-	JsonTablePlan *plan1;				/* first joined plan */
-	JsonTablePlan *plan2;				/* second joined plan */
-	char	   *pathname;				/* path name (for simple plan only) */
-	int			location;				/* token location, or -1 if unknown */
+	JsonTablePlan *plan1;		/* first joined plan */
+	JsonTablePlan *plan2;		/* second joined plan */
+	char	   *pathname;		/* path name (for simple plan only) */
+	int			location;		/* token location, or -1 if unknown */
 };
 
 /*
@@ -1740,13 +1742,13 @@ struct JsonTablePlan
 typedef struct JsonTable
 {
 	NodeTag		type;
-	JsonCommon *common;					/* common JSON path syntax fields */
-	List	   *columns;				/* list of JsonTableColumn */
-	JsonTablePlan *plan;				/* join plan, if specified */
-	JsonBehavior *on_error;				/* ON ERROR behavior, if specified */
-	Alias	   *alias;					/* table alias in FROM clause */
-	bool		lateral;				/* does it have LATERAL prefix? */
-	int			location;				/* token location, or -1 if unknown */
+	JsonCommon *common;			/* common JSON path syntax fields */
+	List	   *columns;		/* list of JsonTableColumn */
+	JsonTablePlan *plan;		/* join plan, if specified */
+	JsonBehavior *on_error;		/* ON ERROR behavior, if specified */
+	Alias	   *alias;			/* table alias in FROM clause */
+	bool		lateral;		/* does it have LATERAL prefix? */
+	int			location;		/* token location, or -1 if unknown */
 } JsonTable;
 
 /*
@@ -1807,7 +1809,7 @@ typedef struct JsonObjectConstructor
 	NodeTag		type;
 	List	   *exprs;			/* list of JsonKeyValue pairs */
 	JsonOutput *output;			/* RETURNING clause, if specified  */
-	bool		absent_on_null;	/* skip NULL values? */
+	bool		absent_on_null; /* skip NULL values? */
 	bool		unique;			/* check key uniqueness? */
 	int			location;		/* token location, or -1 if unknown */
 } JsonObjectConstructor;
@@ -1821,7 +1823,7 @@ typedef struct JsonArrayConstructor
 	NodeTag		type;
 	List	   *exprs;			/* list of JsonValueExpr elements */
 	JsonOutput *output;			/* RETURNING clause, if specified  */
-	bool		absent_on_null;	/* skip NULL elements? */
+	bool		absent_on_null; /* skip NULL elements? */
 	int			location;		/* token location, or -1 if unknown */
 } JsonArrayConstructor;
 
@@ -1835,7 +1837,7 @@ typedef struct JsonArrayQueryConstructor
 	Node	   *query;			/* subquery */
 	JsonOutput *output;			/* RETURNING clause, if specified  */
 	JsonFormat *format;			/* FORMAT clause for subquery, if specified */
-	bool		absent_on_null;	/* skip NULL elements? */
+	bool		absent_on_null; /* skip NULL elements? */
 	int			location;		/* token location, or -1 if unknown */
 } JsonArrayQueryConstructor;
 
@@ -1861,9 +1863,9 @@ typedef struct JsonAggConstructor
 typedef struct JsonObjectAgg
 {
 	NodeTag		type;
-	JsonAggConstructor *constructor; /* common fields */
+	JsonAggConstructor *constructor;	/* common fields */
 	JsonKeyValue *arg;			/* object key-value pair */
-	bool		absent_on_null;	/* skip NULL values? */
+	bool		absent_on_null; /* skip NULL values? */
 	bool		unique;			/* check key uniqueness? */
 } JsonObjectAgg;
 
@@ -1874,9 +1876,9 @@ typedef struct JsonObjectAgg
 typedef struct JsonArrayAgg
 {
 	NodeTag		type;
-	JsonAggConstructor *constructor; /* common fields */
+	JsonAggConstructor *constructor;	/* common fields */
 	JsonValueExpr *arg;			/* array element expression */
-	bool		absent_on_null;	/* skip NULL elements? */
+	bool		absent_on_null; /* skip NULL elements? */
 } JsonArrayAgg;
 
 
@@ -2621,7 +2623,7 @@ typedef struct Constraint
 	char		generated_when; /* ALWAYS or BY DEFAULT */
 
 	/* Fields used for unique constraints (UNIQUE and PRIMARY KEY): */
-	bool		nulls_not_distinct;	/* null treatment for UNIQUE constraints */
+	bool		nulls_not_distinct; /* null treatment for UNIQUE constraints */
 	List	   *keys;			/* String nodes naming referenced key
 								 * column(s) */
 	List	   *including;		/* String nodes naming referenced nonkey
@@ -3250,7 +3252,7 @@ typedef struct IndexStmt
 	SubTransactionId oldFirstRelfilenodeSubid;	/* rd_firstRelfilenodeSubid of
 												 * oldNode */
 	bool		unique;			/* is index unique? */
-	bool		nulls_not_distinct;	/* null treatment for UNIQUE constraints */
+	bool		nulls_not_distinct; /* null treatment for UNIQUE constraints */
 	bool		primary;		/* is index a primary key? */
 	bool		isconstraint;	/* is it for a pkey/unique constraint? */
 	bool		deferrable;		/* is the constraint DEFERRABLE? */
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index 244d1e11974..a6e5db4eecc 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -335,11 +335,11 @@ struct PlannerInfo
 
 	MemoryContext planner_cxt;	/* context holding PlannerInfo */
 
-	Cardinality	total_table_pages;	/* # of pages in all non-dummy tables of
+	Cardinality total_table_pages;	/* # of pages in all non-dummy tables of
 									 * query */
 
-	Selectivity	tuple_fraction; /* tuple_fraction passed to query_planner */
-	Cardinality	limit_tuples;	/* limit_tuples passed to query_planner */
+	Selectivity tuple_fraction; /* tuple_fraction passed to query_planner */
+	Cardinality limit_tuples;	/* limit_tuples passed to query_planner */
 
 	Index		qual_security_level;	/* minimum security_level for quals */
 	/* Note: qual_security_level is zero if there are no securityQuals */
@@ -682,7 +682,7 @@ typedef struct RelOptInfo
 	Relids		relids;			/* set of base relids (rangetable indexes) */
 
 	/* size estimates generated by planner */
-	Cardinality	rows;			/* estimated number of result tuples */
+	Cardinality rows;			/* estimated number of result tuples */
 
 	/* per-relation planner control flags */
 	bool		consider_startup;	/* keep cheap-startup-cost paths? */
@@ -719,7 +719,7 @@ typedef struct RelOptInfo
 	List	   *indexlist;		/* list of IndexOptInfo */
 	List	   *statlist;		/* list of StatisticExtInfo */
 	BlockNumber pages;			/* size estimates derived from pg_class */
-	Cardinality	tuples;
+	Cardinality tuples;
 	double		allvisfrac;
 	Bitmapset  *eclass_indexes; /* Indexes in PlannerInfo's eq_classes list of
 								 * ECs that mention this rel */
@@ -842,7 +842,7 @@ struct IndexOptInfo
 
 	/* index-size statistics (from pg_class and elsewhere) */
 	BlockNumber pages;			/* number of disk pages in index */
-	Cardinality	tuples;			/* number of index tuples in index */
+	Cardinality tuples;			/* number of index tuples in index */
 	int			tree_height;	/* index tree height, or -1 if unknown */
 
 	/* index descriptor information */
@@ -1151,7 +1151,7 @@ typedef struct ParamPathInfo
 	NodeTag		type;
 
 	Relids		ppi_req_outer;	/* rels supplying parameters used by path */
-	Cardinality	ppi_rows;		/* estimated number of result tuples */
+	Cardinality ppi_rows;		/* estimated number of result tuples */
 	List	   *ppi_clauses;	/* join clauses available from outer rels */
 } ParamPathInfo;
 
@@ -1201,7 +1201,7 @@ typedef struct Path
 	int			parallel_workers;	/* desired # of workers; 0 = not parallel */
 
 	/* estimated size/costs for path (see costsize.c for more info) */
-	Cardinality	rows;			/* estimated number of result tuples */
+	Cardinality rows;			/* estimated number of result tuples */
 	Cost		startup_cost;	/* cost expended before fetching any tuples */
 	Cost		total_cost;		/* total cost (assuming all tuples fetched) */
 
@@ -1464,7 +1464,7 @@ typedef struct AppendPath
 	List	   *subpaths;		/* list of component Paths */
 	/* Index of first partial path in subpaths; list_length(subpaths) if none */
 	int			first_partial_path;
-	Cardinality	limit_tuples;	/* hard limit on output tuples, or -1 */
+	Cardinality limit_tuples;	/* hard limit on output tuples, or -1 */
 } AppendPath;
 
 #define IS_DUMMY_APPEND(p) \
@@ -1486,7 +1486,7 @@ typedef struct MergeAppendPath
 {
 	Path		path;
 	List	   *subpaths;		/* list of component Paths */
-	Cardinality	limit_tuples;	/* hard limit on output tuples, or -1 */
+	Cardinality limit_tuples;	/* hard limit on output tuples, or -1 */
 } MergeAppendPath;
 
 /*
@@ -1529,7 +1529,7 @@ typedef struct MemoizePath
 								 * complete after caching the first record. */
 	bool		binary_mode;	/* true when cache key should be compared bit
 								 * by bit, false when using hash equality ops */
-	Cardinality	calls;			/* expected number of rescans */
+	Cardinality calls;			/* expected number of rescans */
 	uint32		est_entries;	/* The maximum number of entries that the
 								 * planner expects will fit in the cache, or 0
 								 * if unknown */
@@ -1681,7 +1681,7 @@ typedef struct HashPath
 	JoinPath	jpath;
 	List	   *path_hashclauses;	/* join clauses used for hashing */
 	int			num_batches;	/* number of batches expected */
-	Cardinality	inner_rows_total;	/* total inner rows expected */
+	Cardinality inner_rows_total;	/* total inner rows expected */
 } HashPath;
 
 /*
@@ -1784,7 +1784,7 @@ typedef struct AggPath
 	Path	   *subpath;		/* path representing input source */
 	AggStrategy aggstrategy;	/* basic strategy, see nodes.h */
 	AggSplit	aggsplit;		/* agg-splitting mode, see nodes.h */
-	Cardinality	numGroups;		/* estimated number of groups in input */
+	Cardinality numGroups;		/* estimated number of groups in input */
 	uint64		transitionSpace;	/* for pass-by-ref transition data */
 	List	   *groupClause;	/* a list of SortGroupClause's */
 	List	   *qual;			/* quals (HAVING quals), if any */
@@ -1798,7 +1798,7 @@ typedef struct GroupingSetData
 {
 	NodeTag		type;
 	List	   *set;			/* grouping set as list of sortgrouprefs */
-	Cardinality	numGroups;		/* est. number of result groups */
+	Cardinality numGroups;		/* est. number of result groups */
 } GroupingSetData;
 
 typedef struct RollupData
@@ -1807,7 +1807,7 @@ typedef struct RollupData
 	List	   *groupClause;	/* applicable subset of parse->groupClause */
 	List	   *gsets;			/* lists of integer indexes into groupClause */
 	List	   *gsets_data;		/* list of GroupingSetData */
-	Cardinality	numGroups;		/* est. number of result groups */
+	Cardinality numGroups;		/* est. number of result groups */
 	bool		hashable;		/* can be hashed */
 	bool		is_hashed;		/* to be implemented as a hashagg */
 } RollupData;
@@ -1861,7 +1861,7 @@ typedef struct SetOpPath
 	List	   *distinctList;	/* SortGroupClauses identifying target cols */
 	AttrNumber	flagColIdx;		/* where is the flag column, if any */
 	int			firstFlag;		/* flag value for first input relation */
-	Cardinality	numGroups;		/* estimated number of groups in input */
+	Cardinality numGroups;		/* estimated number of groups in input */
 } SetOpPath;
 
 /*
@@ -1874,7 +1874,7 @@ typedef struct RecursiveUnionPath
 	Path	   *rightpath;
 	List	   *distinctList;	/* SortGroupClauses identifying target cols */
 	int			wtParam;		/* ID of Param representing work table */
-	Cardinality	numGroups;		/* estimated number of groups in input */
+	Cardinality numGroups;		/* estimated number of groups in input */
 } RecursiveUnionPath;
 
 /*
@@ -2632,7 +2632,7 @@ typedef struct
 typedef struct
 {
 	bool		limit_needed;
-	Cardinality	limit_tuples;
+	Cardinality limit_tuples;
 	int64		count_est;
 	int64		offset_est;
 } FinalPathExtraData;
@@ -2663,15 +2663,15 @@ typedef struct JoinCostWorkspace
 	Cost		inner_rescan_run_cost;
 
 	/* private for cost_mergejoin code */
-	Cardinality	outer_rows;
-	Cardinality	inner_rows;
-	Cardinality	outer_skip_rows;
-	Cardinality	inner_skip_rows;
+	Cardinality outer_rows;
+	Cardinality inner_rows;
+	Cardinality outer_skip_rows;
+	Cardinality inner_skip_rows;
 
 	/* private for cost_hashjoin code */
 	int			numbuckets;
 	int			numbatches;
-	Cardinality	inner_rows_total;
+	Cardinality inner_rows_total;
 } JoinCostWorkspace;
 
 /*
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index e43e360d9be..e319e83bd82 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -121,7 +121,7 @@ typedef struct Plan
 	/*
 	 * planner's estimate of result size of this plan step
 	 */
-	Cardinality	plan_rows;		/* number of rows plan is expected to emit */
+	Cardinality plan_rows;		/* number of rows plan is expected to emit */
 	int			plan_width;		/* average row width in bytes */
 
 	/*
@@ -834,7 +834,7 @@ typedef struct Memoize
 	uint32		est_entries;	/* The maximum number of entries that the
 								 * planner expects will fit in the cache, or 0
 								 * if unknown */
-	Bitmapset   *keyparamids;	/* paramids from param_exprs */
+	Bitmapset  *keyparamids;	/* paramids from param_exprs */
 } Memoize;
 
 /* ----------------
@@ -1013,7 +1013,7 @@ typedef struct Hash
 	AttrNumber	skewColumn;		/* outer join key's column #, or zero */
 	bool		skewInherit;	/* is outer join rel an inheritance tree? */
 	/* all other info is in the parent HashJoin node */
-	Cardinality	rows_total;		/* estimate total rows if parallel_aware */
+	Cardinality rows_total;		/* estimate total rows if parallel_aware */
 } Hash;
 
 /* ----------------
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 66d32fc0062..66e179c4356 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -1251,7 +1251,7 @@ typedef enum JsonExprOp
 	JSON_VALUE_OP,				/* JSON_VALUE() */
 	JSON_QUERY_OP,				/* JSON_QUERY() */
 	JSON_EXISTS_OP,				/* JSON_EXISTS() */
-	JSON_TABLE_OP               /* JSON_TABLE() */
+	JSON_TABLE_OP				/* JSON_TABLE() */
 } JsonExprOp;
 
 /*
@@ -1274,7 +1274,8 @@ typedef enum JsonFormatType
 {
 	JS_FORMAT_DEFAULT,			/* unspecified */
 	JS_FORMAT_JSON,				/* FORMAT JSON [ENCODING ...] */
-	JS_FORMAT_JSONB				/* implicit internal format for RETURNING jsonb */
+	JS_FORMAT_JSONB				/* implicit internal format for RETURNING
+								 * jsonb */
 } JsonFormatType;
 
 /*
@@ -1315,7 +1316,7 @@ typedef enum JsonWrapper
 typedef struct JsonFormat
 {
 	NodeTag		type;
-	JsonFormatType format_type;	/* format type */
+	JsonFormatType format_type; /* format type */
 	JsonEncoding encoding;		/* JSON encoding */
 	int			location;		/* token location, or -1 if unknown */
 } JsonFormat;
@@ -1340,7 +1341,7 @@ typedef struct JsonValueExpr
 {
 	NodeTag		type;
 	Expr	   *raw_expr;		/* raw expression */
-	Expr	   *formatted_expr;	/* formatted expression or NULL */
+	Expr	   *formatted_expr; /* formatted expression or NULL */
 	JsonFormat *format;			/* FORMAT clause, if specified */
 } JsonValueExpr;
 
@@ -1367,7 +1368,7 @@ typedef struct JsonConstructorExpr
 	Expr	   *func;			/* underlying json[b]_xxx() function call */
 	Expr	   *coercion;		/* coercion to RETURNING type */
 	JsonReturning *returning;	/* RETURNING clause */
-	bool		absent_on_null;	/* ABSENT ON NULL? */
+	bool		absent_on_null; /* ABSENT ON NULL? */
 	bool		unique;			/* WITH UNIQUE KEYS? (JSON_OBJECT[AGG] only) */
 	int			location;
 } JsonConstructorExpr;
@@ -1380,7 +1381,7 @@ typedef enum JsonValueType
 {
 	JS_TYPE_ANY,				/* IS JSON [VALUE] */
 	JS_TYPE_OBJECT,				/* IS JSON OBJECT */
-	JS_TYPE_ARRAY,				/* IS JSON ARRAY*/
+	JS_TYPE_ARRAY,				/* IS JSON ARRAY */
 	JS_TYPE_SCALAR				/* IS JSON SCALAR */
 } JsonValueType;
 
@@ -1450,17 +1451,17 @@ typedef struct JsonExpr
 {
 	Expr		xpr;
 	JsonExprOp	op;				/* json function ID */
-	Node	   *formatted_expr;	/* formatted context item expression */
+	Node	   *formatted_expr; /* formatted context item expression */
 	JsonCoercion *result_coercion;	/* resulting coercion to RETURNING type */
 	JsonFormat *format;			/* context item format (JSON/JSONB) */
 	Node	   *path_spec;		/* JSON path specification expression */
 	List	   *passing_names;	/* PASSING argument names */
-	List	   *passing_values;	/* PASSING argument values */
+	List	   *passing_values; /* PASSING argument values */
 	JsonReturning *returning;	/* RETURNING clause type/format info */
 	JsonBehavior *on_empty;		/* ON EMPTY behavior */
 	JsonBehavior *on_error;		/* ON ERROR behavior */
-	JsonItemCoercions *coercions; /* coercions for JSON_VALUE */
-	JsonWrapper	wrapper;		/* WRAPPER for JSON_QUERY */
+	JsonItemCoercions *coercions;	/* coercions for JSON_VALUE */
+	JsonWrapper wrapper;		/* WRAPPER for JSON_QUERY */
 	bool		omit_quotes;	/* KEEP/OMIT QUOTES for JSON_QUERY */
 	int			location;		/* token location, or -1 if unknown */
 } JsonExpr;
@@ -1472,13 +1473,15 @@ typedef struct JsonExpr
 typedef struct JsonTableParent
 {
 	NodeTag		type;
-	Const	   *path;		/* jsonpath constant */
-	char	   *name;		/* path name */
-	Node	   *child;		/* nested columns, if any */
-	bool		outerJoin;	/* outer or inner join for nested columns? */
-	int			colMin;		/* min column index in the resulting column list */
-	int			colMax;		/* max column index in the resulting column list */
-	bool		errorOnError; /* ERROR/EMPTY ON ERROR behavior */
+	Const	   *path;			/* jsonpath constant */
+	char	   *name;			/* path name */
+	Node	   *child;			/* nested columns, if any */
+	bool		outerJoin;		/* outer or inner join for nested columns? */
+	int			colMin;			/* min column index in the resulting column
+								 * list */
+	int			colMax;			/* max column index in the resulting column
+								 * list */
+	bool		errorOnError;	/* ERROR/EMPTY ON ERROR behavior */
 } JsonTableParent;
 
 /*
@@ -1488,9 +1491,9 @@ typedef struct JsonTableParent
 typedef struct JsonTableSibling
 {
 	NodeTag		type;
-	Node	   *larg;		/* left join node */
-	Node	   *rarg;		/* right join node */
-	bool		cross;		/* cross or union join? */
+	Node	   *larg;			/* left join node */
+	Node	   *rarg;			/* right join node */
+	bool		cross;			/* cross or union join? */
 } JsonTableSibling;
 
 /* ----------------
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 3d95e6bfc88..b6e137cf83f 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -203,9 +203,9 @@ typedef enum
 extern PathKeysComparison compare_pathkeys(List *keys1, List *keys2);
 extern bool pathkeys_contained_in(List *keys1, List *keys2);
 extern bool pathkeys_count_contained_in(List *keys1, List *keys2, int *n_common);
-extern int group_keys_reorder_by_pathkeys(List *pathkeys,
-										  List **group_pathkeys,
-										  List **group_clauses);
+extern int	group_keys_reorder_by_pathkeys(List *pathkeys,
+										   List **group_pathkeys,
+										   List **group_clauses);
 extern List *get_useful_group_keys_orderings(PlannerInfo *root, double nrows,
 											 List *path_pathkeys,
 											 List *pathkeys, List *clauses);
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index c69920d1087..dc379547c70 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -26,7 +26,7 @@ extern PGDLLIMPORT post_parse_analyze_hook_type post_parse_analyze_hook;
 
 
 extern Query *parse_analyze_fixedparams(RawStmt *parseTree, const char *sourceText,
-							const Oid *paramTypes, int numParams, QueryEnvironment *queryEnv);
+										const Oid *paramTypes, int numParams, QueryEnvironment *queryEnv);
 extern Query *parse_analyze_varparams(RawStmt *parseTree, const char *sourceText,
 									  Oid **paramTypes, int *numParams, QueryEnvironment *queryEnv);
 extern Query *parse_analyze_withcb(RawStmt *parseTree, const char *sourceText,
diff --git a/src/include/parser/parse_param.h b/src/include/parser/parse_param.h
index d6f0b656495..df1ee660d83 100644
--- a/src/include/parser/parse_param.h
+++ b/src/include/parser/parse_param.h
@@ -16,9 +16,9 @@
 #include "parser/parse_node.h"
 
 extern void setup_parse_fixed_parameters(ParseState *pstate,
-								   const Oid *paramTypes, int numParams);
+										 const Oid *paramTypes, int numParams);
 extern void setup_parse_variable_parameters(ParseState *pstate,
-									  Oid **paramTypes, int *numParams);
+											Oid **paramTypes, int *numParams);
 extern void check_variable_parameters(ParseState *pstate, Query *query);
 extern bool query_contains_extern_params(Query *query);
 
diff --git a/src/include/port.h b/src/include/port.h
index 3d103a2b31b..12c05b5d9f9 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -140,7 +140,7 @@ extern char *pipe_read_line(char *cmd, char *line, int maxsize);
 
 #ifdef EXEC_BACKEND
 /* Disable ASLR before exec, for developer builds only (in exec.c) */
-extern int pg_disable_aslr(void);
+extern int	pg_disable_aslr(void);
 #endif
 
 
diff --git a/src/include/postmaster/pgarch.h b/src/include/postmaster/pgarch.h
index 38cb1c64774..f366a159a8e 100644
--- a/src/include/postmaster/pgarch.h
+++ b/src/include/postmaster/pgarch.h
@@ -55,19 +55,19 @@ typedef struct ArchiveModuleCallbacks
 	ArchiveCheckConfiguredCB check_configured_cb;
 	ArchiveFileCB archive_file_cb;
 	ArchiveShutdownCB shutdown_cb;
-}			ArchiveModuleCallbacks;
+} ArchiveModuleCallbacks;
 
 /*
  * Type of the shared library symbol _PG_archive_module_init that is looked
  * up when loading an archive library.
  */
-typedef void (*ArchiveModuleInit) (ArchiveModuleCallbacks * cb);
+typedef void (*ArchiveModuleInit) (ArchiveModuleCallbacks *cb);
 
 /*
  * Since the logic for archiving via a shell command is in the core server
  * and does not need to be loaded via a shared library, it has a special
  * initialization function.
  */
-extern void shell_archive_init(ArchiveModuleCallbacks * cb);
+extern void shell_archive_init(ArchiveModuleCallbacks *cb);
 
 #endif							/* _PGARCH_H */
diff --git a/src/include/replication/basebackup_target.h b/src/include/replication/basebackup_target.h
index e23ac29a89d..1cf3c0777dc 100644
--- a/src/include/replication/basebackup_target.h
+++ b/src/include/replication/basebackup_target.h
@@ -42,7 +42,7 @@ typedef struct BaseBackupTargetHandle BaseBackupTargetHandle;
  */
 extern void BaseBackupAddTarget(char *name,
 								void *(*check_detail) (char *, char *),
-								bbsink * (*get_sink) (bbsink *, void *));
+								bbsink *(*get_sink) (bbsink *, void *));
 
 /*
  * These functions are used by the core code to access base backup targets
diff --git a/src/include/replication/decode.h b/src/include/replication/decode.h
index a33c2a718a7..741bf65cf7a 100644
--- a/src/include/replication/decode.h
+++ b/src/include/replication/decode.h
@@ -28,7 +28,7 @@ extern void xact_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 extern void standby_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 extern void logicalmsg_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf);
 
-extern void	LogicalDecodingProcessRecord(LogicalDecodingContext *ctx,
+extern void LogicalDecodingProcessRecord(LogicalDecodingContext *ctx,
 										 XLogReaderState *record);
 
 #endif
diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
index 1ee63c4cf44..8c9f3321d50 100644
--- a/src/include/replication/slot.h
+++ b/src/include/replication/slot.h
@@ -216,7 +216,7 @@ extern bool ReplicationSlotsCountDBSlots(Oid dboid, int *nslots, int *nactive);
 extern void ReplicationSlotsDropDBSlots(Oid dboid);
 extern bool InvalidateObsoleteReplicationSlots(XLogSegNo oldestSegno);
 extern ReplicationSlot *SearchNamedReplicationSlot(const char *name, bool need_lock);
-extern int ReplicationSlotIndex(ReplicationSlot *slot);
+extern int	ReplicationSlotIndex(ReplicationSlot *slot);
 extern void ReplicationSlotNameForTablesync(Oid suboid, Oid relid, char *syncslotname, int szslot);
 extern void ReplicationSlotDropAtPubNode(WalReceiverConn *wrconn, char *slotname, bool missing_ok);
 
diff --git a/src/include/storage/latch.h b/src/include/storage/latch.h
index 0dd79d73fa2..68ab740f161 100644
--- a/src/include/storage/latch.h
+++ b/src/include/storage/latch.h
@@ -181,6 +181,6 @@ extern int	WaitLatchOrSocket(Latch *latch, int wakeEvents,
 							  pgsocket sock, long timeout, uint32 wait_event_info);
 extern void InitializeLatchWaitSet(void);
 extern int	GetNumRegisteredWaitEvents(WaitEventSet *set);
-extern bool	WaitEventSetCanReportClosed(void);
+extern bool WaitEventSetCanReportClosed(void);
 
 #endif							/* LATCH_H */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 87e408b7199..70d9dab25b8 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -46,9 +46,9 @@ extern PGDLLIMPORT int log_statement;
 extern List *pg_parse_query(const char *query_string);
 extern List *pg_rewrite_query(Query *query);
 extern List *pg_analyze_and_rewrite_fixedparams(RawStmt *parsetree,
-									const char *query_string,
-									const Oid *paramTypes, int numParams,
-									QueryEnvironment *queryEnv);
+												const char *query_string,
+												const Oid *paramTypes, int numParams,
+												QueryEnvironment *queryEnv);
 extern List *pg_analyze_and_rewrite_varparams(RawStmt *parsetree,
 											  const char *query_string,
 											  Oid **paramTypes,
diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h
index 0a22af80a21..f048eb0869d 100644
--- a/src/include/utils/formatting.h
+++ b/src/include/utils/formatting.h
@@ -32,6 +32,6 @@ extern char *asc_initcap(const char *buff, size_t nbytes);
 extern Datum parse_datetime(text *date_txt, text *fmt, Oid collid, bool strict,
 							Oid *typid, int32 *typmod, int *tz,
 							bool *have_error);
-extern int datetime_format_flags(const char *fmt_str, bool *have_error);
+extern int	datetime_format_flags(const char *fmt_str, bool *have_error);
 
 #endif
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 358b9eb6110..8e79b8dc9f0 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -263,8 +263,8 @@ typedef struct JsonPathVariableEvalContext
 	Oid			typid;
 	int32		typmod;
 	struct ExprContext *econtext;
-	struct ExprState  *estate;
-	MemoryContext mcxt;		/* memory context for cached value */
+	struct ExprState *estate;
+	MemoryContext mcxt;			/* memory context for cached value */
 	Datum		value;
 	bool		isnull;
 	bool		evaluated;
@@ -274,14 +274,14 @@ typedef struct JsonPathVariableEvalContext
 extern void JsonItemFromDatum(Datum val, Oid typid, int32 typmod,
 							  JsonbValue *res);
 
-extern bool  JsonPathExists(Datum jb, JsonPath *path, List *vars, bool *error);
+extern bool JsonPathExists(Datum jb, JsonPath *path, List *vars, bool *error);
 extern Datum JsonPathQuery(Datum jb, JsonPath *jp, JsonWrapper wrapper,
 						   bool *empty, bool *error, List *vars);
 extern JsonbValue *JsonPathValue(Datum jb, JsonPath *jp, bool *empty,
 								 bool *error, List *vars);
 
-extern int EvalJsonPathVar(void *vars, char *varName, int varNameLen,
-						   JsonbValue *val, JsonbValue *baseObject);
+extern int	EvalJsonPathVar(void *vars, char *varName, int varNameLen,
+							JsonbValue *val, JsonbValue *baseObject);
 
 extern PGDLLIMPORT const TableFuncRoutine JsonbTableRoutine;
 
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index eadbd009045..90b3c49bc12 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -159,7 +159,7 @@ typedef struct RelationData
 	Bitmapset  *rd_keyattr;		/* cols that can be ref'd by foreign keys */
 	Bitmapset  *rd_pkattr;		/* cols included in primary key */
 	Bitmapset  *rd_idattr;		/* included in replica identity index */
-	Bitmapset  *rd_hotblockingattr;	/* cols blocking HOT update */
+	Bitmapset  *rd_hotblockingattr; /* cols blocking HOT update */
 
 	PublicationDesc *rd_pubdesc;	/* publication descriptor, or NULL */
 
@@ -246,7 +246,7 @@ typedef struct RelationData
 	 */
 	Oid			rd_toastoid;	/* Real TOAST table's OID, or InvalidOid */
 
-	bool		pgstat_enabled;	/* should relation stats be counted */
+	bool		pgstat_enabled; /* should relation stats be counted */
 	/* use "struct" here to avoid needing to include pgstat.h: */
 	struct PgStat_TableStatus *pgstat_info; /* statistics collection area */
 } RelationData;
diff --git a/src/include/utils/relmapper.h b/src/include/utils/relmapper.h
index f10353e1390..557f77e35a9 100644
--- a/src/include/utils/relmapper.h
+++ b/src/include/utils/relmapper.h
@@ -38,7 +38,7 @@ typedef struct xl_relmap_update
 extern Oid	RelationMapOidToFilenode(Oid relationId, bool shared);
 
 extern Oid	RelationMapFilenodeToOid(Oid relationId, bool shared);
-extern Oid RelationMapOidToFilenodeForDatabase(char *dbpath, Oid relationId);
+extern Oid	RelationMapOidToFilenodeForDatabase(char *dbpath, Oid relationId);
 extern void RelationMapCopy(Oid dbid, Oid tsid, char *srcdbpath,
 							char *dstdbpath);
 extern void RelationMapUpdateMap(Oid relationId, Oid fileNode, bool shared,
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index c313a08d541..d485b9bfcd9 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -215,9 +215,9 @@ extern double estimate_num_groups(PlannerInfo *root, List *groupExprs,
 								  EstimationInfo *estinfo);
 
 extern double estimate_num_groups_incremental(PlannerInfo *root, List *groupExprs,
-					double input_rows, List **pgset,
-					EstimationInfo *estinfo,
-					List **cache_varinfos, int prevNExprs);
+											  double input_rows, List **pgset,
+											  EstimationInfo *estinfo,
+											  List **cache_varinfos, int prevNExprs);
 
 extern void estimate_hash_bucket_stats(PlannerInfo *root,
 									   Node *hashkey, double nbuckets,
diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h
index 140a9f9ffc4..8c36cf8d82c 100644
--- a/src/include/utils/sortsupport.h
+++ b/src/include/utils/sortsupport.h
@@ -375,11 +375,11 @@ ApplySortAbbrevFullComparator(Datum datum1, bool isNull1,
  * Datatypes that install these as their comparator or abbrevated comparator
  * are eligible for faster sorting.
  */
-extern int ssup_datum_unsigned_cmp(Datum x, Datum y, SortSupport ssup);
+extern int	ssup_datum_unsigned_cmp(Datum x, Datum y, SortSupport ssup);
 #if SIZEOF_DATUM >= 8
-extern int ssup_datum_signed_cmp(Datum x, Datum y, SortSupport ssup);
+extern int	ssup_datum_signed_cmp(Datum x, Datum y, SortSupport ssup);
 #endif
-extern int ssup_datum_int32_cmp(Datum x, Datum y, SortSupport ssup);
+extern int	ssup_datum_int32_cmp(Datum x, Datum y, SortSupport ssup);
 
 /* Other functions in utils/sort/sortsupport.c */
 extern void PrepareSortSupportComparisonShim(Oid cmpFunc, SortSupport ssup);