Pre-beta mechanical code beautification.

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

9 files changed, 197 insertions, 89 deletions

diff --git a/src/tools/PerfectHash.pm b/src/tools/PerfectHash.pm
index 0803698d579..4ffb6bd5474 100644
--- a/src/tools/PerfectHash.pm
+++ b/src/tools/PerfectHash.pm
@@ -89,6 +89,7 @@ sub generate_hash_function
   FIND_PARAMS:
 	for ($hash_seed1 = 0; $hash_seed1 < 10; $hash_seed1++)
 	{
+
 		for ($hash_seed2 = 0; $hash_seed2 < 10; $hash_seed2++)
 		{
 			foreach (17, 31, 127, 8191)
diff --git a/src/tools/ci/windows_build_config.pl b/src/tools/ci/windows_build_config.pl
index b0d4360c748..59268a0bb60 100644
--- a/src/tools/ci/windows_build_config.pl
+++ b/src/tools/ci/windows_build_config.pl
@@ -4,10 +4,10 @@ use warnings;
 our $config;
 
 $config->{"tap_tests"} = 1;
-$config->{"asserts"} = 1;
+$config->{"asserts"}   = 1;
 
 $config->{"openssl"} = "c:/openssl/1.1/";
-$config->{"perl"} = "c:/strawberry/$ENV{DEFAULT_PERL_VERSION}/perl/";
-$config->{"python"} = "c:/python/";
+$config->{"perl"}    = "c:/strawberry/$ENV{DEFAULT_PERL_VERSION}/perl/";
+$config->{"python"}  = "c:/python/";
 
 1;
diff --git a/src/tools/mark_pgdllimport.pl b/src/tools/mark_pgdllimport.pl
index 834fcac5b54..7b51ae3c201 100755
--- a/src/tools/mark_pgdllimport.pl
+++ b/src/tools/mark_pgdllimport.pl
@@ -28,17 +28,18 @@ use warnings;
 for my $include_file (@ARGV)
 {
 	open(my $rfh, '<', $include_file) || die "$include_file: $!";
-	my $buffer = '';
+	my $buffer                = '';
 	my $num_pgdllimport_added = 0;
 
 	while (my $raw_line = <$rfh>)
 	{
-		my	$needs_pgdllimport = 1;
+		my $needs_pgdllimport = 1;
 
 		# By convention we declare global variables explicitly extern. We're
 		# looking for those not already marked with PGDLLIMPORT.
-		$needs_pgdllimport = 0 if $raw_line !~ /^extern\s+/
-			|| $raw_line =~ /PGDLLIMPORT/;
+		$needs_pgdllimport = 0
+		  if $raw_line !~ /^extern\s+/
+		  || $raw_line =~ /PGDLLIMPORT/;
 
 		# Make a copy of the line and perform a simple-minded comment strip.
 		# Also strip trailing whitespace.
@@ -48,8 +49,9 @@ for my $include_file (@ARGV)
 
 		# Variable declarations should end in a semicolon. If we see an
 		# opening parenthesis, it's probably a function declaration.
-		$needs_pgdllimport = 0 if $stripped_line !~ /;$/
-			|| $stripped_line =~ /\(/;
+		$needs_pgdllimport = 0
+		  if $stripped_line !~ /;$/
+		  || $stripped_line =~ /\(/;
 
 		# Add PGDLLIMPORT marker, if required.
 		if ($needs_pgdllimport)
@@ -68,7 +70,7 @@ for my $include_file (@ARGV)
 	if ($num_pgdllimport_added > 0)
 	{
 		printf "%s: adding %d PGDLLIMPORT markers\n",
-			$include_file, $num_pgdllimport_added;
+		  $include_file, $num_pgdllimport_added;
 		open(my $wfh, '>', $include_file) || die "$include_file: $!";
 		print $wfh $buffer;
 		close($wfh);
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index 5e312d232e9..f24d9e53482 100644
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -313,7 +313,7 @@ sub WriteItemDefinitionGroup
 	my $targetmachine =
 	  $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64';
 
-	my $includes = join ';', @{$self->{includes}}, "";
+	my $includes = join ';', @{ $self->{includes} }, "";
 
 	print $f <<EOF;
   <ItemDefinitionGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'">
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index c3058399d49..e4feda10fd8 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -35,22 +35,22 @@ my $libpq;
 my @unlink_on_exit;
 
 # Set of variables for modules in contrib/ and src/test/modules/
-my $contrib_defines = {};
-my @contrib_uselibpq = ();
+my $contrib_defines        = {};
+my @contrib_uselibpq       = ();
 my @contrib_uselibpgport   = ();
 my @contrib_uselibpgcommon = ();
-my $contrib_extralibs     = { 'libpq_pipeline' => ['ws2_32.lib'] };
+my $contrib_extralibs      = { 'libpq_pipeline' => ['ws2_32.lib'] };
 my $contrib_extraincludes  = {};
 my $contrib_extrasource    = {};
-my @contrib_excludes = (
-	'bool_plperl',      'commit_ts',
-	'hstore_plperl',    'hstore_plpython',
-	'intagg',           'jsonb_plperl',
-	'jsonb_plpython',   'ltree_plpython',
-	'sepgsql',
-	'brin',             'test_extensions',
-	'test_misc',        'test_pg_dump',
-	'snapshot_too_old', 'unsafe_tests');
+my @contrib_excludes       = (
+	'bool_plperl',     'commit_ts',
+	'hstore_plperl',   'hstore_plpython',
+	'intagg',          'jsonb_plperl',
+	'jsonb_plpython',  'ltree_plpython',
+	'sepgsql',         'brin',
+	'test_extensions', 'test_misc',
+	'test_pg_dump',    'snapshot_too_old',
+	'unsafe_tests');
 
 # Set of variables for frontend modules
 my $frontend_defines = { 'initdb' => 'FRONTEND' };
@@ -286,16 +286,18 @@ sub mkvcbuild
 
 	my $libpq_testclient =
 	  $solution->AddProject('libpq_testclient', 'exe', 'misc',
-							'src/interfaces/libpq/test');
-	$libpq_testclient->AddFile('src/interfaces/libpq/test/libpq_testclient.c');
+		'src/interfaces/libpq/test');
+	$libpq_testclient->AddFile(
+		'src/interfaces/libpq/test/libpq_testclient.c');
 	$libpq_testclient->AddIncludeDir('src/interfaces/libpq');
 	$libpq_testclient->AddReference($libpgport, $libpq);
 	$libpq_testclient->AddLibrary('ws2_32.lib');
 
 	my $libpq_uri_regress =
 	  $solution->AddProject('libpq_uri_regress', 'exe', 'misc',
-							'src/interfaces/libpq/test');
-	$libpq_uri_regress->AddFile('src/interfaces/libpq/test/libpq_uri_regress.c');
+		'src/interfaces/libpq/test');
+	$libpq_uri_regress->AddFile(
+		'src/interfaces/libpq/test/libpq_uri_regress.c');
 	$libpq_uri_regress->AddIncludeDir('src/interfaces/libpq');
 	$libpq_uri_regress->AddReference($libpgport, $libpq);
 	$libpq_uri_regress->AddLibrary('ws2_32.lib');
@@ -464,7 +466,8 @@ sub mkvcbuild
 
 	if (!$solution->{options}->{openssl})
 	{
-		push @contrib_excludes, 'sslinfo', 'ssl_passphrase_callback', 'pgcrypto';
+		push @contrib_excludes, 'sslinfo', 'ssl_passphrase_callback',
+		  'pgcrypto';
 	}
 
 	if (!$solution->{options}->{uuid})
@@ -508,7 +511,8 @@ sub mkvcbuild
 
 		my $pymajorver = substr($pyver, 0, 1);
 
-		die "Python version $pyver is too old (version 3 or later is required)"
+		die
+		  "Python version $pyver is too old (version 3 or later is required)"
 		  if int($pymajorver) < 3;
 
 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
@@ -926,7 +930,7 @@ sub AddTransformModule
 	# Add PL dependencies
 	$p->AddIncludeDir($pl_src);
 	$p->AddReference($pl_proj);
-	$p->AddIncludeDir($_) for @{$pl_proj->{includes}};
+	$p->AddIncludeDir($_) for @{ $pl_proj->{includes} };
 	foreach my $pl_lib (@{ $pl_proj->{libraries} })
 	{
 		$p->AddLibrary($pl_lib);
@@ -936,7 +940,7 @@ sub AddTransformModule
 	if ($type_proj)
 	{
 		$p->AddIncludeDir($type_src);
-		$p->AddIncludeDir($_) for @{$type_proj->{includes}};
+		$p->AddIncludeDir($_) for @{ $type_proj->{includes} };
 		foreach my $type_lib (@{ $type_proj->{libraries} })
 		{
 			$p->AddLibrary($type_lib);
@@ -950,9 +954,9 @@ sub AddTransformModule
 # Add a simple contrib project
 sub AddContrib
 {
-	my $subdir = shift;
-	my $n      = shift;
-	my $mf     = Project::read_file("$subdir/$n/Makefile");
+	my $subdir   = shift;
+	my $n        = shift;
+	my $mf       = Project::read_file("$subdir/$n/Makefile");
 	my @projects = ();
 
 	if ($mf =~ /^MODULE_big\s*=\s*(.*)$/mg)
@@ -988,7 +992,8 @@ sub AddContrib
 	}
 
 	# Process custom compiler flags
-	if ($mf =~ /^PG_CPPFLAGS\s*=\s*(.*)$/mg || $mf =~ /^override\s*CPPFLAGS\s*[+:]?=\s*(.*)$/mg)
+	if (   $mf =~ /^PG_CPPFLAGS\s*=\s*(.*)$/mg
+		|| $mf =~ /^override\s*CPPFLAGS\s*[+:]?=\s*(.*)$/mg)
 	{
 		foreach my $flag (split /\s+/, $1)
 		{
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index d39c502f30a..570bab563a7 100644
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -76,11 +76,11 @@ sub AddFiles
 # name but a different file extension and add those files too.
 sub FindAndAddAdditionalFiles
 {
-	my $self = shift;
+	my $self  = shift;
 	my $fname = shift;
 	$fname =~ /(.*)(\.[^.]+)$/;
 	my $filenoext = $1;
-	my $fileext = $2;
+	my $fileext   = $2;
 
 	# For .c files, check if either a .l or .y file of the same name
 	# exists and add that too.
@@ -161,7 +161,7 @@ sub AddReference
 
 	while (my $ref = shift)
 	{
-		if (! grep { $_ eq $ref} @{ $self->{references} })
+		if (!grep { $_ eq $ref } @{ $self->{references} })
 		{
 			push @{ $self->{references} }, $ref;
 		}
@@ -181,7 +181,7 @@ sub AddLibrary
 		$lib = '&quot;' . $lib . "&quot;";
 	}
 
-	if (! grep { $_ eq $lib} @{ $self->{libraries} })
+	if (!grep { $_ eq $lib } @{ $self->{libraries} })
 	{
 		push @{ $self->{libraries} }, $lib;
 	}
@@ -199,7 +199,7 @@ sub AddIncludeDir
 
 	foreach my $inc (split(/;/, $incstr))
 	{
-		if (! grep { $_ eq $inc} @{ $self->{includes} })
+		if (!grep { $_ eq $inc } @{ $self->{includes} })
 		{
 			push @{ $self->{includes} }, $inc;
 		}
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 03357095b20..d30e8fcb117 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -349,7 +349,7 @@ sub GenerateFiles
 		HAVE_READLINE_READLINE_H    => undef,
 		HAVE_READLINK               => undef,
 		HAVE_READV                  => undef,
-		HAVE_RL_COMPLETION_MATCHES               => undef,
+		HAVE_RL_COMPLETION_MATCHES  => undef,
 		HAVE_RL_COMPLETION_SUPPRESS_QUOTE        => undef,
 		HAVE_RL_FILENAME_COMPLETION_FUNCTION     => undef,
 		HAVE_RL_FILENAME_QUOTE_CHARACTERS        => undef,
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 65b7be795c3..c3729f6be5e 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -70,10 +70,10 @@ copy("$Config/regress/regress.dll",               "src/test/regress");
 copy("$Config/dummy_seclabel/dummy_seclabel.dll", "src/test/regress");
 
 # Configuration settings used by TAP tests
-$ENV{with_ssl} = $config->{openssl} ? 'openssl' : 'no';
-$ENV{with_ldap} = $config->{ldap} ? 'yes' : 'no';
-$ENV{with_icu} = $config->{icu} ? 'yes' : 'no';
-$ENV{with_gssapi} = $config->{gss} ? 'yes' : 'no';
+$ENV{with_ssl}    = $config->{openssl} ? 'openssl' : 'no';
+$ENV{with_ldap}   = $config->{ldap}    ? 'yes'     : 'no';
+$ENV{with_icu}    = $config->{icu}     ? 'yes'     : 'no';
+$ENV{with_gssapi} = $config->{gss}     ? 'yes'     : 'no';
 $ENV{with_krb_srvnam} = $config->{krb_srvnam} || 'postgres';
 $ENV{with_readline} = 'no';
 
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 87ee7bf8662..dd1214977a8 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -4,6 +4,7 @@ ACL_SIZE_INFORMATION
 AFFIX
 ASN1_INTEGER
 ASN1_OBJECT
+ASN1_OCTET_STRING
 ASN1_STRING
 AV
 A_ArrayExpr
@@ -63,6 +64,7 @@ AllocSetFreeList
 AllocateDesc
 AllocateDescKind
 AlterCollationStmt
+AlterDatabaseRefreshCollStmt
 AlterDatabaseSetStmt
 AlterDatabaseStmt
 AlterDefaultPrivilegesStmt
@@ -80,6 +82,7 @@ AlterOpFamilyStmt
 AlterOperatorStmt
 AlterOwnerStmt
 AlterPolicyStmt
+AlterPublicationAction
 AlterPublicationStmt
 AlterRoleSetStmt
 AlterRoleStmt
@@ -117,11 +120,17 @@ ApplyErrorCallbackArg
 ApplyExecutionData
 ApplySubXactData
 Archive
+ArchiveCheckConfiguredCB
 ArchiveEntryPtrType
+ArchiveFileCB
 ArchiveFormat
 ArchiveHandle
 ArchiveMode
+ArchiveModuleCallbacks
+ArchiveModuleInit
 ArchiveOpts
+ArchiveShutdownCB
+ArchiveStreamState
 ArchiverOutput
 ArchiverStage
 ArrayAnalyzeExtraData
@@ -226,6 +235,8 @@ BackgroundWorkerHandle
 BackgroundWorkerSlot
 Barrier
 BaseBackupCmd
+BaseBackupTargetHandle
+BaseBackupTargetType
 BeginDirectModify_function
 BeginForeignInsert_function
 BeginForeignModify_function
@@ -237,6 +248,7 @@ BgwHandleStatus
 BinaryArithmFunc
 BindParamCbData
 BipartiteMatchState
+BitString
 BitmapAnd
 BitmapAndPath
 BitmapAndState
@@ -271,11 +283,11 @@ BloomScanOpaqueData
 BloomSignatureWord
 BloomState
 BloomTuple
-BlowfishContext
 BoolAggState
 BoolExpr
 BoolExprType
 BoolTestType
+Boolean
 BooleanTest
 BpChar
 BrinBuildState
@@ -336,6 +348,7 @@ CachedPlanSource
 CallContext
 CallStmt
 CancelRequestPacket
+Cardinality
 CaseExpr
 CaseTestExpr
 CaseWhen
@@ -346,6 +359,7 @@ CatCTup
 CatCache
 CatCacheHeader
 CatalogId
+CatalogIdMapEntry
 CatalogIndexState
 ChangeVarNodes_context
 CheckPoint
@@ -413,6 +427,7 @@ CompositeIOData
 CompositeTypeStmt
 CompoundAffixFlag
 CompressionAlgorithm
+CompressionLocation
 CompressorState
 ComputeXidHorizonsResult
 ConditionVariable
@@ -426,7 +441,6 @@ ConnParams
 ConnStatusType
 ConnType
 ConnectionStateEnum
-ConnsAllowedState
 ConsiderSplitContext
 Const
 ConstrCheck
@@ -446,6 +460,7 @@ CopyDest
 CopyFormatOptions
 CopyFromState
 CopyFromStateData
+CopyHeaderChoice
 CopyInsertMethod
 CopyMultiInsertBuffer
 CopyMultiInsertInfo
@@ -582,8 +597,10 @@ DumpComponents
 DumpId
 DumpOptions
 DumpSignalInformation
+DumpableAcl
 DumpableObject
 DumpableObjectType
+DumpableObjectWithAcl
 DynamicFileList
 DynamicZoneAbbrev
 EC_KEY
@@ -594,6 +611,7 @@ EOM_get_flat_size_method
 EPQState
 EPlan
 EState
+EStatus
 EVP_CIPHER
 EVP_CIPHER_CTX
 EVP_MD
@@ -635,9 +653,9 @@ EventTriggerInfo
 EventTriggerQueryState
 ExceptionLabelMap
 ExceptionMap
-ExclusiveBackupState
 ExecAuxRowMark
 ExecEvalBoolSubroutine
+ExecEvalJsonExprContext
 ExecEvalSubroutine
 ExecForeignBatchInsert_function
 ExecForeignDelete_function
@@ -690,14 +708,12 @@ ExtensibleNodeEntry
 ExtensibleNodeMethods
 ExtensionControlFile
 ExtensionInfo
-ExtensionMemberId
 ExtensionVersionInfo
 FDWCollateState
 FD_SET
 FILE
 FILETIME
-FILE_INFORMATION_CLASS
-FILE_STANDARD_INFORMATION
+FPI
 FSMAddress
 FSMPage
 FSMPageData
@@ -724,6 +740,7 @@ FixedParallelExecutorState
 FixedParallelState
 FixedParamState
 FlagMode
+Float
 FlushPosition
 FmgrBuiltin
 FmgrHookEventType
@@ -793,6 +810,7 @@ FormData_pg_sequence_data
 FormData_pg_shdepend
 FormData_pg_statistic
 FormData_pg_statistic_ext
+FormData_pg_statistic_ext_data
 FormData_pg_subscription
 FormData_pg_subscription_rel
 FormData_pg_tablespace
@@ -850,6 +868,7 @@ Form_pg_sequence_data
 Form_pg_shdepend
 Form_pg_statistic
 Form_pg_statistic_ext
+Form_pg_statistic_ext_data
 Form_pg_subscription
 Form_pg_subscription_rel
 Form_pg_tablespace
@@ -916,6 +935,7 @@ GISTSearchItem
 GISTTYPE
 GIST_SPLITVEC
 GMReaderTupleBuffer
+GROUP
 GV
 Gather
 GatherMerge
@@ -980,6 +1000,7 @@ GistSplitVector
 GistTsVectorOptions
 GistVacState
 GlobalTransaction
+GlobalVisHorizonKind
 GlobalVisState
 GrantRoleStmt
 GrantStmt
@@ -1020,7 +1041,6 @@ HASHELEMENT
 HASHHDR
 HASHSEGMENT
 HASH_SEQ_STATUS
-HCRYPTPROV
 HE
 HEntry
 HIST_ENTRY
@@ -1063,7 +1083,6 @@ HashScanPosData
 HashScanPosItem
 HashSkewBucket
 HashState
-HashTapeInfo
 HashValueFunc
 HbaLine
 HeadlineJsonState
@@ -1087,7 +1106,6 @@ INFIX
 INT128
 INTERFACE_INFO
 IOFuncSelector
-IO_STATUS_BLOCK
 IPCompareMethod
 ITEM
 IV
@@ -1158,13 +1176,14 @@ Instrumentation
 Int128AggState
 Int8TransTypeData
 IntRBTreeNode
+Integer
 IntegerSet
 InternalDefaultACL
 InternalGrant
 Interval
 IntoClause
-InvalidationChunk
-InvalidationListHeader
+InvalMessageArray
+InvalidationMsgsGroup
 IpcMemoryId
 IpcMemoryKey
 IpcMemoryState
@@ -1206,10 +1225,31 @@ JoinState
 JoinType
 JsObject
 JsValue
+JsonAggConstructor
 JsonAggState
+JsonArgument
+JsonArrayAgg
+JsonArrayConstructor
+JsonArrayQueryConstructor
 JsonBaseObjectInfo
+JsonBehavior
+JsonBehaviorType
+JsonCoercion
+JsonCommon
+JsonConstructorExpr
+JsonConstructorType
+JsonEncoding
+JsonExpr
+JsonExprOp
+JsonFormat
+JsonFormatType
+JsonFunc
+JsonFuncExpr
 JsonHashEntry
+JsonIsPredicate
+JsonItemCoercions
 JsonIterateStringValuesAction
+JsonKeyValue
 JsonLexContext
 JsonLikeRegexContext
 JsonManifestFileField
@@ -1217,10 +1257,15 @@ JsonManifestParseContext
 JsonManifestParseState
 JsonManifestSemanticState
 JsonManifestWALRangeField
+JsonObjectAgg
+JsonObjectConstructor
+JsonOutput
 JsonParseContext
 JsonParseErrorType
+JsonParseExpr
 JsonPath
 JsonPathBool
+JsonPathDatatypeStatus
 JsonPathExecContext
 JsonPathExecResult
 JsonPathGinAddPathItemFunc
@@ -1233,11 +1278,18 @@ JsonPathGinPathItem
 JsonPathItem
 JsonPathItemType
 JsonPathKeyword
+JsonPathMutableContext
 JsonPathParseItem
 JsonPathParseResult
 JsonPathPredicateCallback
 JsonPathString
+JsonPathVarCallback
+JsonPathVariableEvalContext
+JsonQuotes
+JsonReturning
+JsonScalarExpr
 JsonSemAction
+JsonSerializeExpr
 JsonTable
 JsonTableColumn
 JsonTableColumnType
@@ -1252,8 +1304,16 @@ JsonTableSibling
 JsonTokenType
 JsonTransformStringValuesAction
 JsonTypeCategory
+JsonUniqueBuilderState
+JsonUniqueCheckState
+JsonUniqueHashEntry
+JsonUniqueParsingState
+JsonUniqueStackEntry
+JsonValueExpr
 JsonValueList
 JsonValueListIterator
+JsonValueType
+JsonWrapper
 Jsonb
 JsonbAggState
 JsonbContainer
@@ -1268,6 +1328,8 @@ JsonbTypeCategory
 JsonbValue
 JumbleState
 JunkFilter
+KeyAction
+KeyActions
 KeyArray
 KeySuffix
 KeyWord
@@ -1311,6 +1373,7 @@ LPBYTE
 LPCTSTR
 LPCWSTR
 LPDWORD
+LPFILETIME
 LPSECURITY_ATTRIBUTES
 LPSERVICE_STATUS
 LPSTR
@@ -1327,6 +1390,11 @@ LWLock
 LWLockHandle
 LWLockMode
 LWLockPadded
+LZ4F_compressionContext_t
+LZ4F_decompressOptions_t
+LZ4F_decompressionContext_t
+LZ4F_errorCode_t
+LZ4F_preferences_t
 LabelProvider
 LagTracker
 LargeObjectDesc
@@ -1431,6 +1499,7 @@ MBuf
 MCVItem
 MCVList
 MEMORY_BASIC_INFORMATION
+MGVTBL
 MINIDUMPWRITEDUMP
 MINIDUMP_TYPE
 MJEvalResult
@@ -1484,6 +1553,7 @@ ModifyTable
 ModifyTableContext
 ModifyTablePath
 ModifyTableState
+MonotonicFunction
 MorphOpaque
 MsgType
 MultiAssignRef
@@ -1530,6 +1600,7 @@ NotificationHash
 NotificationList
 NotifyStmt
 Nsrt
+NtDllRoutine
 NullIfExpr
 NullTest
 NullTestType
@@ -1604,8 +1675,9 @@ PACL
 PATH
 PBOOL
 PCtxtHandle
+PERL_CONTEXT
+PERL_SI
 PFN
-PFN_NTQUERYINFORMATIONFILE
 PGAlignedBlock
 PGAlignedXLogBlock
 PGAsyncStatusType
@@ -1663,7 +1735,6 @@ PGresParamDesc
 PGresult
 PGresult_data
 PHANDLE
-PIO_STATUS_BLOCK
 PLAINTREE
 PLAssignStmt
 PLUID_AND_ATTRIBUTES
@@ -1793,9 +1864,10 @@ PTEntryArray
 PTIterationArray
 PTOKEN_PRIVILEGES
 PTOKEN_USER
+PULONG
 PUTENVPROC
 PVIndStats
-PvIndVacStatus
+PVIndVacStatus
 PVOID
 PVShared
 PX_Alias
@@ -1897,8 +1969,11 @@ PathClauseUsage
 PathCostComparison
 PathHashStack
 PathKey
+PathKeyInfo
 PathKeysComparison
 PathTarget
+PathkeyMutatorState
+PathkeySortCost
 PatternInfo
 PatternInfoArray
 Pattern_Prefix_Status
@@ -1908,8 +1983,8 @@ PendingRelDelete
 PendingRelSync
 PendingUnlinkEntry
 PendingWriteback
+PerLockTagEntry
 PerlInterpreter
-Perl_check_t
 Perl_ppaddr_t
 Permutation
 PermutationStep
@@ -1964,7 +2039,6 @@ PgStat_Kind
 PgStat_KindInfo
 PgStat_LocalState
 PgStat_PendingDroppedStatsItem
-PgStat_ReplSlotStats
 PgStat_SLRUStats
 PgStat_ShmemControl
 PgStat_Snapshot
@@ -2054,6 +2128,7 @@ ProjectSetPath
 ProjectSetState
 ProjectionInfo
 ProjectionPath
+PromptInterruptContext
 ProtocolVersion
 PrsStorage
 PruneState
@@ -2080,7 +2155,6 @@ PushFilter
 PushFilterOps
 PushFunction
 PyCFunction
-PyCodeObject
 PyMappingMethods
 PyMethodDef
 PyModuleDef
@@ -2125,7 +2199,6 @@ RI_QueryKey
 RTEKind
 RWConflict
 RWConflictPoolHeader
-RandomState
 Range
 RangeBound
 RangeBox
@@ -2153,6 +2226,7 @@ ReadBufferMode
 ReadBytePtrType
 ReadExtraTocPtrType
 ReadFunc
+ReadLocalXLogPageNoWaitPrivate
 ReadReplicationSlotCmd
 ReassignOwnedStmt
 RecheckForeignScan_function
@@ -2199,6 +2273,7 @@ RelationInfo
 RelationPtr
 RelationSyncEntry
 RelcacheCallbackFunction
+ReleaseMatchCB
 RelfilenodeMapEntry
 RelfilenodeMapKey
 Relids
@@ -2275,7 +2350,7 @@ RewriteState
 RmgrData
 RmgrDescData
 RmgrId
-RmgrIds
+RoleNameItem
 RoleSpec
 RoleSpecType
 RoleStmtType
@@ -2288,6 +2363,7 @@ RowMarkClause
 RowMarkType
 RowSecurityDesc
 RowSecurityPolicy
+RtlGetLastNtStatus_t
 RuleInfo
 RuleLock
 RuleStmt
@@ -2325,7 +2401,6 @@ SPLITCOST
 SPNode
 SPNodeData
 SPPageDesc
-SQLCmd
 SQLDropObject
 SQLFunctionCache
 SQLFunctionCachePtr
@@ -2343,7 +2418,7 @@ SYNCHRONIZATION_BARRIER
 SampleScan
 SampleScanGetSampleSize_function
 SampleScanState
-SamplerRandomState
+SavedTransactionCharacteristics
 ScalarArrayOpExpr
 ScalarArrayOpExprHashEntry
 ScalarArrayOpExprHashTable
@@ -2525,7 +2600,6 @@ StatEntry
 StatExtEntry
 StateFileChunk
 StatisticExtInfo
-Stats
 StatsBuildData
 StatsData
 StatsElem
@@ -2537,7 +2611,7 @@ Step
 StopList
 StrategyNumber
 StreamCtl
-StreamXidHash
+String
 StringInfo
 StringInfoData
 StripnullState
@@ -2555,6 +2629,7 @@ SubXactInfo
 SubqueryScan
 SubqueryScanPath
 SubqueryScanState
+SubqueryScanStatus
 SubscriptExecSetup
 SubscriptExecSteps
 SubscriptRoutines
@@ -2569,6 +2644,7 @@ SupportRequestIndexCondition
 SupportRequestRows
 SupportRequestSelectivity
 SupportRequestSimplify
+SupportRequestWFuncMonotonic
 Syn
 SyncOps
 SyncRepConfigData
@@ -2631,6 +2707,7 @@ TSVectorData
 TSVectorParseState
 TSVectorStat
 TState
+TStatus
 TStoreState
 TXNEntryFile
 TYPCATEGORY
@@ -2801,7 +2878,6 @@ UniquePath
 UniquePathMethod
 UniqueState
 UnlistenStmt
-UnpackTarState
 UnresolvedTup
 UnresolvedTupData
 UpdateContext
@@ -2820,7 +2896,6 @@ VacuumParams
 VacuumRelation
 VacuumStmt
 ValidateIndexState
-Value
 ValuesScan
 ValuesScanState
 Var
@@ -2839,6 +2914,7 @@ VariableShowStmt
 VariableSpace
 VariableStatData
 VariableSubstituteHook
+Variables
 VersionedQuery
 Vfd
 ViewCheckOption
@@ -2878,7 +2954,6 @@ WaitEventTimeout
 WaitPMResult
 WalCloseMethod
 WalCompression
-WalCompressionMethod
 WalLevel
 WalRcvData
 WalRcvExecResult
@@ -2898,6 +2973,7 @@ Walfile
 WindowAgg
 WindowAggPath
 WindowAggState
+WindowAggStatus
 WindowClause
 WindowClauseSortData
 WindowDef
@@ -2944,7 +3020,6 @@ XLogCtlData
 XLogCtlInsert
 XLogDumpConfig
 XLogDumpPrivate
-XLogDumpStats
 XLogLongPageHeader
 XLogLongPageHeaderData
 XLogPageHeader
@@ -2952,13 +3027,14 @@ XLogPageHeaderData
 XLogPageReadCB
 XLogPageReadPrivate
 XLogPageReadResult
+XLogPrefetchStats
 XLogPrefetcher
 XLogPrefetcherFilter
-XLogPrefetchStats
 XLogReaderRoutine
 XLogReaderState
 XLogRecData
 XLogRecPtr
+XLogRecStats
 XLogRecord
 XLogRecordBlockCompressHeader
 XLogRecordBlockHeader
@@ -2968,8 +3044,10 @@ XLogRecoveryCtlData
 XLogRedoAction
 XLogSegNo
 XLogSource
+XLogStats
 XLogwrtResult
 XLogwrtRqst
+XPV
 XPVIV
 XPVMG
 XactCallback
@@ -2988,6 +3066,10 @@ XmlTableBuilderData
 YYLTYPE
 YYSTYPE
 YY_BUFFER_STATE
+ZSTD_CCtx
+ZSTD_DCtx
+ZSTD_inBuffer
+ZSTD_outBuffer
 _SPI_connection
 _SPI_plan
 __AssignProcessToJobObject
@@ -2999,6 +3081,7 @@ __SetInformationJobObject
 __time64_t
 _dev_t
 _ino_t
+_locale_t
 _resultmap
 _stringlist
 acquireLocksOnSubLinks_context
@@ -3041,6 +3124,29 @@ backup_manifest_info
 backup_manifest_option
 base_yy_extra_type
 basebackup_options
+bbsink
+bbsink_copystream
+bbsink_gzip
+bbsink_lz4
+bbsink_ops
+bbsink_server
+bbsink_shell
+bbsink_state
+bbsink_throttle
+bbsink_zstd
+bbstreamer
+bbstreamer_archive_context
+bbstreamer_extractor
+bbstreamer_gzip_decompressor
+bbstreamer_gzip_writer
+bbstreamer_lz4_frame
+bbstreamer_member
+bbstreamer_ops
+bbstreamer_plain_writer
+bbstreamer_recovery_injector
+bbstreamer_tar_archiver
+bbstreamer_tar_parser
+bbstreamer_zstd_frame
 bgworker_main_type
 binaryheap
 binaryheap_comparator
@@ -3049,11 +3155,14 @@ bits16
 bits32
 bits8
 bloom_filter
+boolKEY
 brin_column_state
 brin_serialize_callback_type
 bytea
 cached_re_str
+canonicalize_state
 cashKEY
+catalogid_hash
 cfp
 check_agg_arguments_context
 check_function_callback
@@ -3064,9 +3173,7 @@ check_ungrouped_columns_context
 chr
 clock_t
 cmpEntriesArg
-cmpfunc
 codes_t
-coercion
 collation_cache_entry
 color
 colormaprange
@@ -3159,6 +3266,7 @@ find_expr_references_context
 fix_join_expr_context
 fix_scan_expr_context
 fix_upper_expr_context
+fix_windowagg_cond_context
 flatten_join_alias_vars_context
 float4
 float4KEY
@@ -3239,7 +3347,6 @@ init_function
 inline_cte_walker_context
 inline_error_callback_arg
 ino_t
-inquiry
 instr_time
 int128
 int16
@@ -3319,16 +3426,8 @@ mix_data_t
 mixedStruct
 mode_t
 movedb_failure_params
-mp_digit
-mp_int
-mp_result
-mp_sign
-mp_size
-mp_small
-mp_usmall
-mp_word
-mpz_t
 multirange_bsearch_comparison
+multirange_unnest_fctx
 mxact
 mxtruncinfo
 needs_fmgr_hook_type
@@ -3338,6 +3437,7 @@ normal_rand_fctx
 ntile_context
 numeric
 object_access_hook_type
+object_access_hook_type_str
 off_t
 oidKEY
 oidvector
@@ -3391,6 +3491,7 @@ pg_locale_t
 pg_mb_radix_tree
 pg_md5_ctx
 pg_on_exit_callback
+pg_prng_state
 pg_re_flags
 pg_saslprep_rc
 pg_sha1_ctx
@@ -3426,7 +3527,9 @@ pgssSharedState
 pgssStoreKind
 pgssVersion
 pgstat_entry_ref_hash_hash
+pgstat_entry_ref_hash_iterator
 pgstat_page
+pgstat_snapshot_hash
 pgstattuple_type
 pgthreadlock_t
 pid_t
@@ -3529,7 +3632,6 @@ ret_type
 rewind_source
 rewrite_event
 rf_context
-rijndael_ctx
 rm_detail_t
 role_auth_extra
 row_security_policy_hook_type
@@ -3561,6 +3663,7 @@ slist_mutable_iter
 slist_node
 slock_t
 socket_set
+socklen_t
 spgBulkDeleteState
 spgChooseIn
 spgChooseOut
@@ -3603,7 +3706,6 @@ string
 substitute_actual_parameters_context
 substitute_actual_srf_parameters_context
 substitute_phv_relids_context
-svtype
 symbol
 tablespaceinfo
 teSection
@@ -3635,8 +3737,6 @@ tuplehash_hash
 tuplehash_iterator
 type
 tzEntry
-u1byte
-u4byte
 u_char
 u_int
 uchr