Sync typedefs.list with the buildfarm.

Our maintenance of typedefs.list has been a little haphazard
(and apparently we can't alphabetize worth a darn).  Replace
the file with the authoritative list from our buildfarm, and
run pgindent using that.

I also updated the additions/exclusions lists in pgindent where
necessary to keep pgindent from messing things up significantly.
Notably, now that regex_t and some related names are macros not real
typedefs, we have to whitelist them explicitly.  The exclusions list
has also drifted noticeably, presumably due to changes of system
headers on the buildfarm animals that contribute to the list.

Unlike in prior years, I've not manually added typedef names that
are missing from the buildfarm's list because they are not used to
declare any variables or fields.  So there are a few places where
the typedef declaration itself is formatted worse than before,
e.g. typedef enum IoMethod.  I could preserve the names that were
manually added to the list previously, but I'd really prefer to find
a less manual way of dealing with these cases.  A quick grep finds
about 75 such symbols, most of which have never gotten any special
treatment.

Per discussion among pgsql-release, doing this now seems appropriate
even though we're still a week or two away from making the v18 branch.

diff --git a/src/backend/utils/adt/mcxtfuncs.c b/src/backend/utils/adt/mcxtfuncs.c
index 396c2f223b4e1d5a2c2cbe16a32d965505c71fed..fe6dce9cba3ec775dc6024842ea6401db4b81447 100644 (file)
--- a/src/backend/utils/adt/mcxtfuncs.c
+++ b/src/backend/utils/adt/mcxtfuncs.c
@@ -38,7 +38,7 @@ typedef struct MemoryContextId
 {
    MemoryContext context;
    int         context_id;
-}          MemoryContextId;
+} MemoryContextId;
 
 /*
  * int_list_to_array

diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index e48fe434cd393eb0e62141a7e6203c51822f0f44..3a9424c19c9aec40e2acb7a0dea7b40aa557b5a2 100644 (file)
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -96,7 +96,7 @@ typedef struct HeapScanDescData
    uint32      rs_cindex;      /* current tuple's index in vistuples */
    uint32      rs_ntuples;     /* number of visible tuples on page */
    OffsetNumber rs_vistuples[MaxHeapTuplesPerPage];    /* their offsets */
-}          HeapScanDescData;
+} HeapScanDescData;
 typedef struct HeapScanDescData *HeapScanDesc;
 
 typedef struct BitmapHeapScanDescData

diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 34b82d0f5d17d15aaf3c2a6c701c0ff1a5bb31da..6c4891bbaeb49e95d0f0c210712bc8e55acbd6cf 100644 (file)
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -264,7 +264,7 @@ typedef struct AggStatePerGroupData
     * NULL and not auto-replace it with a later input value. Only the first
     * non-NULL input will be auto-substituted.
     */
-} AggStatePerGroupData;
+}          AggStatePerGroupData;
 
 /*
  * AggStatePerPhaseData - per-grouping-set-phase state

diff --git a/src/include/storage/aio.h b/src/include/storage/aio.h
index f3726bc3dc511bf5f1671ae4edb3e1abddb7463d..e7a0a234b6cf2b698cb22c8e99784a89af0438a7 100644 (file)
--- a/src/include/storage/aio.h
+++ b/src/include/storage/aio.h
@@ -36,7 +36,7 @@ typedef enum IoMethod
 #ifdef IOMETHOD_IO_URING_ENABLED
    IOMETHOD_IO_URING,
 #endif
-} IoMethod;
+}          IoMethod;
 
 /* We'll default to worker based execution. */
 #define DEFAULT_IO_METHOD IOMETHOD_WORKER

diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
index 940d74462d129c0f1c6067ff26b45f9822d773c9..f1d7beeed1a3d4657aeaf41e69bb15ac29be1ac6 100644 (file)
--- a/src/include/storage/copydir.h
+++ b/src/include/storage/copydir.h
@@ -17,7 +17,7 @@ typedef enum FileCopyMethod
 {
    FILE_COPY_METHOD_COPY,
    FILE_COPY_METHOD_CLONE,
-} FileCopyMethod;
+}          FileCopyMethod;
 
 /* GUC parameters */
 extern PGDLLIMPORT int file_copy_method;

diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 5dc5aafe5c9ff0a51dab5ecad760080112300d20..845a5851b574e489575204a5ec7197b0069b34ea 100644 (file)
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -119,7 +119,7 @@ typedef struct
    Oid         dbId;           /* database ID */
    Oid         relid;          /* relation ID, or 0 if whole
                                 * RelationSyncCache */
-}          SharedInvalRelSyncMsg;
+} SharedInvalRelSyncMsg;
 
 typedef union
 {

diff --git a/src/include/tcop/backend_startup.h b/src/include/tcop/backend_startup.h
index dcb9d056643f2890aed1ad4a52708abee033a876..e8639688c00bcfd3139e6e3a6e41f7e00799a1d9 100644 (file)
--- a/src/include/tcop/backend_startup.h
+++ b/src/include/tcop/backend_startup.h
@@ -86,7 +86,7 @@ typedef enum LogConnectionOption
        LOG_CONNECTION_AUTHENTICATION |
        LOG_CONNECTION_AUTHORIZATION |
        LOG_CONNECTION_SETUP_DURATIONS,
-} LogConnectionOption;
+}          LogConnectionOption;
 
 /*
  * A collection of timings of various stages of connection establishment and

diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 5eac0e16970c3ab306321634caa75899d52b1d8c..675f4f5f4694dd395bd3d3c016e0a20fc762fe3d 100644 (file)
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -485,7 +485,7 @@ typedef enum
    PGERROR_TERSE,              /* single-line error messages */
    PGERROR_DEFAULT,            /* recommended style */
    PGERROR_VERBOSE,            /* all the facts, ma'am */
-} PGErrorVerbosity;
+}          PGErrorVerbosity;
 
 extern PGDLLIMPORT int Log_error_verbosity;
 extern PGDLLIMPORT char *Log_line_prefix;

diff --git a/src/include/utils/skipsupport.h b/src/include/utils/skipsupport.h
index bc51847cf617a2e5c3d73db15aaad55e8a5451e0..c42be001fb546c4af2b5d85b00a7bf1360a4b024 100644 (file)
--- a/src/include/utils/skipsupport.h
+++ b/src/include/utils/skipsupport.h
@@ -90,7 +90,7 @@ typedef struct SkipSupportData
     */
    SkipSupportIncDec decrement;
    SkipSupportIncDec increment;
-} SkipSupportData;
+}          SkipSupportData;
 
 extern SkipSupport PrepareSkipSupportFromOpclass(Oid opfamily, Oid opcintype,
                                                 bool reverse);

diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index 37d7efca77ce5cbaf34c231e1d45437cf1ea9c58..cc74c4df6ba67dbd545879a78dc9bb5ef1df486a 100644 (file)
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -58,9 +58,9 @@ static PyType_Slot PLyCursor_slots[] =
 static PyType_Spec PLyCursor_spec =
 {
    .name = "PLyCursor",
-       .basicsize = sizeof(PLyCursorObject),
-       .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .slots = PLyCursor_slots,
+   .basicsize = sizeof(PLyCursorObject),
+   .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+   .slots = PLyCursor_slots,
 };
 
 static PyTypeObject *PLy_CursorType;

diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
index 6044893afdd1373456ea1f88484e1e2a982b62d3..edfb76c877020d9e50c40b6781bc711f678fa79e 100644 (file)
--- a/src/pl/plpython/plpy_planobject.c
+++ b/src/pl/plpython/plpy_planobject.c
@@ -45,9 +45,9 @@ static PyType_Slot PLyPlan_slots[] =
 static PyType_Spec PLyPlan_spec =
 {
    .name = "PLyPlan",
-       .basicsize = sizeof(PLyPlanObject),
-       .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .slots = PLyPlan_slots,
+   .basicsize = sizeof(PLyPlanObject),
+   .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+   .slots = PLyPlan_slots,
 };
 
 static PyTypeObject *PLy_PlanType;

diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
index 0d9997cbaa32cd0872bd28d593236a537a38f948..d433929b36039727119e2bdfda477e2d8977560a 100644 (file)
--- a/src/pl/plpython/plpy_resultobject.c
+++ b/src/pl/plpython/plpy_resultobject.c
@@ -70,9 +70,9 @@ static PyType_Slot PLyResult_slots[] =
 static PyType_Spec PLyResult_spec =
 {
    .name = "PLyResult",
-       .basicsize = sizeof(PLyResultObject),
-       .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .slots = PLyResult_slots,
+   .basicsize = sizeof(PLyResultObject),
+   .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+   .slots = PLyResult_slots,
 };
 
 static PyTypeObject *PLy_ResultType;

diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index c2484a99b4ae31dd31a215d957de18d28b3702a0..c225b652ab4a546acab7b092baf7793b65cea10b 100644 (file)
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -46,9 +46,9 @@ static PyType_Slot PLySubtransaction_slots[] =
 static PyType_Spec PLySubtransaction_spec =
 {
    .name = "PLySubtransaction",
-       .basicsize = sizeof(PLySubtransactionObject),
-       .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .slots = PLySubtransaction_slots,
+   .basicsize = sizeof(PLySubtransactionObject),
+   .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+   .slots = PLySubtransaction_slots,
 };
 
 static PyTypeObject *PLy_SubtransactionType;

diff --git a/src/test/modules/test_aio/test_aio.c b/src/test/modules/test_aio/test_aio.c
index 5cdfb89210b28f233b3090b45d96662bd210ea25..c55cf6c0aac05cf784fd11e3d2c7fc58f9754d6e 100644 (file)
--- a/src/test/modules/test_aio/test_aio.c
+++ b/src/test/modules/test_aio/test_aio.c
@@ -42,9 +42,9 @@ typedef struct InjIoErrorState
 
    bool        short_read_result_set;
    int         short_read_result;
-}          InjIoErrorState;
+} InjIoErrorState;
 
-static InjIoErrorState * inj_io_error_state;
+static InjIoErrorState *inj_io_error_state;
 
 /* Shared memory init callbacks */
 static shmem_request_hook_type prev_shmem_request_hook = NULL;

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 54e138b598dfe525b511b47b87ff3ff36db49070..b7d718089248e64676aa73d88fc89b69b8449f48 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -73,11 +73,14 @@ if ($sourcedir)
 # might make them so.  For the moment we just hardwire a list of names
 # to add and a list of names to exclude; eventually this may need to be
 # easier to configure.  Note that the typedefs need trailing newlines.
-my @additional = ("bool\n");
+my @additional = map { "$_\n" } qw(
+  bool regex_t regmatch_t regoff
+);
 
 my %excluded = map { +"$_\n" => 1 } qw(
-  ANY FD_SET U abs allocfunc boolean date digit ilist interval iterator other
-  pointer printfunc reference string timestamp type wrap
+  FD_SET LookupSet boolean date duration
+  element_type inquiry iterator other
+  pointer reference rep string timestamp type wrap
 );
 
 # globals

diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index a8346cda633ac6262660c64cc7c948e1f4eae2f8..32d6e718adca041c6f1d7b5cf7fb64e9c0d1dcc0 100644 (file)
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -6,6 +6,7 @@ ASN1_INTEGER
 ASN1_OBJECT
 ASN1_OCTET_STRING
 ASN1_STRING
+ATAlterConstraint
 AV
 A_ArrayExpr
 A_Const
@@ -47,7 +48,6 @@ AggSplit
 AggState
 AggStatePerAgg
 AggStatePerGroup
-AggStatePerGroupData
 AggStatePerHash
 AggStatePerPhase
 AggStatePerTrans
@@ -161,7 +161,6 @@ ArrayType
 AsyncQueueControl
 AsyncQueueEntry
 AsyncRequest
-ATAlterConstraint
 AttInMetadata
 AttStatsSlot
 AttoptCacheEntry
@@ -174,8 +173,8 @@ AttrNumber
 AttributeOpts
 AuthRequest
 AuthToken
-AutoPrewarmSharedState
 AutoPrewarmReadStreamData
+AutoPrewarmSharedState
 AutoVacOpts
 AutoVacuumShmemStruct
 AutoVacuumWorkItem
@@ -222,7 +221,6 @@ BTScanInsertData
 BTScanKeyPreproc
 BTScanOpaque
 BTScanOpaqueData
-BTScanPos
 BTScanPosData
 BTScanPosItem
 BTShared
@@ -270,8 +268,8 @@ BitmapAndPath
 BitmapAndState
 BitmapHeapPath
 BitmapHeapScan
-BitmapHeapScanInstrumentation
 BitmapHeapScanDesc
+BitmapHeapScanInstrumentation
 BitmapHeapScanState
 BitmapIndexScan
 BitmapIndexScanState
@@ -341,8 +339,8 @@ BufFile
 Buffer
 BufferAccessStrategy
 BufferAccessStrategyType
-BufferCacheNumaRec
 BufferCacheNumaContext
+BufferCacheNumaRec
 BufferCachePagesContext
 BufferCachePagesRec
 BufferDesc
@@ -382,6 +380,9 @@ CTEMaterialize
 CTESearchClause
 CURL
 CURLM
+CURLMcode
+CURLMsg
+CURLcode
 CURLoption
 CV
 CachedExpression
@@ -628,6 +629,7 @@ DefElem
 DefElemAction
 DefaultACLInfo
 DefineStmt
+DefnDumperPtr
 DeleteStmt
 DependencyGenerator
 DependencyGeneratorData
@@ -677,9 +679,8 @@ DumpableObjectType
 DumpableObjectWithAcl
 DynamicFileList
 DynamicZoneAbbrev
-EC_KEY
-ECDerivesKey
 ECDerivesEntry
+ECDerivesKey
 EDGE
 ENGINE
 EOM_flatten_into_method
@@ -761,10 +762,12 @@ ExpandedRange
 ExpandedRecordFieldInfo
 ExpandedRecordHeader
 ExplainDirectModify_function
+ExplainExtensionOption
 ExplainForeignModify_function
 ExplainForeignScan_function
 ExplainFormat
 ExplainOneQuery_hook_type
+ExplainOptionHandler
 ExplainSerializeOption
 ExplainState
 ExplainStmt
@@ -792,6 +795,7 @@ FDWCollateState
 FD_SET
 FILE
 FILETIME
+FPI
 FSMAddress
 FSMPage
 FSMPageData
@@ -806,7 +810,6 @@ FieldSelect
 FieldStore
 File
 FileBackupMethod
-FileCopyMethod
 FileFdwExecutionState
 FileFdwPlanState
 FileNameMap
@@ -1190,6 +1193,7 @@ HeapCheckContext
 HeapCheckReadStreamData
 HeapPageFreeze
 HeapScanDesc
+HeapScanDescData
 HeapTuple
 HeapTupleData
 HeapTupleFields
@@ -1249,6 +1253,7 @@ IndexClause
 IndexClauseSet
 IndexDeleteCounts
 IndexDeletePrefetchState
+IndexDoCheckCallback
 IndexElem
 IndexFetchHeapData
 IndexFetchTableData
@@ -1279,13 +1284,14 @@ InheritableSocket
 InitSampleScan_function
 InitializeDSMForeignScan_function
 InitializeWorkerForeignScan_function
+InjIoErrorState
 InjectionPointCacheEntry
 InjectionPointCallback
 InjectionPointCondition
 InjectionPointConditionType
 InjectionPointEntry
-InjectionPointsCtl
 InjectionPointSharedState
+InjectionPointsCtl
 InlineCodeBlock
 InsertStmt
 Instrumentation
@@ -1302,7 +1308,6 @@ IntoClause
 InvalMessageArray
 InvalidationInfo
 InvalidationMsgsGroup
-IoMethod
 IoMethodOps
 IpcMemoryId
 IpcMemoryKey
@@ -1492,8 +1497,7 @@ LLVMOrcResourceTrackerRef
 LLVMOrcSymbolStringPoolRef
 LLVMOrcThreadSafeContextRef
 LLVMOrcThreadSafeModuleRef
-LLVMPassManagerBuilderRef
-LLVMPassManagerRef
+LLVMPassBuilderOptionsRef
 LLVMTargetMachineRef
 LLVMTargetRef
 LLVMTypeRef
@@ -1563,6 +1567,7 @@ LoadStmt
 LocalBufferLookupEnt
 LocalPgBackendStatus
 LocalTransactionId
+Location
 LocationIndex
 LocationLen
 LockAcquireResult
@@ -1582,7 +1587,6 @@ LockTupleMode
 LockViewRecurse_context
 LockWaitPolicy
 LockingClause
-LogConnectionOption
 LogOpts
 LogStmtLevel
 LogicalDecodeBeginCB
@@ -1633,6 +1637,7 @@ LogicalSlotInfo
 LogicalSlotInfoArr
 LogicalTape
 LogicalTapeSet
+LookupSet
 LsnReadQueue
 LsnReadQueueNextFun
 LsnReadQueueNextStatus
@@ -1657,8 +1662,8 @@ ManyTestResourceKind
 Material
 MaterialPath
 MaterialState
-MdfdVec
 MdPathStr
+MdfdVec
 Memoize
 MemoizeEntry
 MemoizeInstrumentation
@@ -1672,6 +1677,7 @@ MemoryContextCallback
 MemoryContextCallbackFunction
 MemoryContextCounters
 MemoryContextData
+MemoryContextId
 MemoryContextMethodID
 MemoryContextMethods
 MemoryStatsPrintFunc
@@ -1765,6 +1771,7 @@ NumericSortSupport
 NumericSumAccum
 NumericVar
 OAuthValidatorCallbacks
+OAuthValidatorModuleInit
 OM_uint32
 OP
 OSAPerGroupState
@@ -1834,7 +1841,6 @@ PGCALL2
 PGCRYPTO_SHA_t
 PGChecksummablePage
 PGContextVisibility
-PGErrorVerbosity
 PGEvent
 PGEventConnDestroy
 PGEventConnReset
@@ -1904,7 +1910,6 @@ PLpgSQL_exception
 PLpgSQL_exception_block
 PLpgSQL_execstate
 PLpgSQL_expr
-PLpgSQL_func_hashkey
 PLpgSQL_function
 PLpgSQL_getdiag_kind
 PLpgSQL_if_elsif
@@ -2155,10 +2160,10 @@ PermutationStepBlockerType
 PgAioBackend
 PgAioCtl
 PgAioHandle
-PgAioHandleCallbackID
-PgAioHandleCallbackStage
 PgAioHandleCallbackComplete
+PgAioHandleCallbackID
 PgAioHandleCallbackReport
+PgAioHandleCallbackStage
 PgAioHandleCallbacks
 PgAioHandleCallbacksEntry
 PgAioHandleFlags
@@ -2203,9 +2208,9 @@ PgStatShared_Common
 PgStatShared_Database
 PgStatShared_Function
 PgStatShared_HashEntry
+PgStatShared_IO
 PgStatShared_InjectionPoint
 PgStatShared_InjectionPointFixed
-PgStatShared_IO
 PgStatShared_Relation
 PgStatShared_ReplSlot
 PgStatShared_SLRU
@@ -2226,7 +2231,6 @@ PgStat_FunctionCallUsage
 PgStat_FunctionCounts
 PgStat_HashKey
 PgStat_IO
-PgStat_Kind
 PgStat_KindInfo
 PgStat_LocalState
 PgStat_PendingDroppedStatsItem
@@ -2354,12 +2358,12 @@ PushFilter
 PushFilterOps
 PushFunction
 PyCFunction
-PyMappingMethods
 PyMethodDef
 PyModuleDef
 PyObject
-PySequenceMethods
 PyTypeObject
+PyType_Slot
+PyType_Spec
 Py_ssize_t
 QPRS_STATE
 QTN2QTState
@@ -2473,6 +2477,7 @@ RelOptInfo
 RelOptKind
 RelPathStr
 RelStatsInfo
+RelSyncCallbackFunction
 RelToCheck
 RelToCluster
 RelabelType
@@ -2625,7 +2630,6 @@ SQLDropObject
 SQLFunctionCache
 SQLFunctionCachePtr
 SQLFunctionHashEntry
-SQLFunctionLink
 SQLFunctionParseInfo
 SQLFunctionParseInfoPtr
 SQLValueFunction
@@ -2637,6 +2641,7 @@ STARTUPINFO
 STRLEN
 SV
 SYNCHRONIZATION_BARRIER
+SYSTEM_INFO
 SampleScan
 SampleScanGetSampleSize_function
 SampleScanState
@@ -2724,6 +2729,7 @@ SharedIncrementalSortInfo
 SharedIndexScanInstrumentation
 SharedInvalCatalogMsg
 SharedInvalCatcacheMsg
+SharedInvalRelSyncMsg
 SharedInvalRelcacheMsg
 SharedInvalRelmapMsg
 SharedInvalSmgrMsg
@@ -2763,7 +2769,7 @@ SingleBoundSortItem
 Size
 SkipPages
 SkipSupport
-SkipSupportData
+SkipSupportIncDec
 SlabBlock
 SlabContext
 SlabSlot
@@ -2989,6 +2995,7 @@ TarMethodData
 TarMethodFile
 TargetEntry
 TclExceptionNameMap
+Tcl_CmdInfo
 Tcl_DString
 Tcl_FileProc
 Tcl_HashEntry
@@ -2996,6 +3003,7 @@ Tcl_HashTable
 Tcl_Interp
 Tcl_NotifierProcs
 Tcl_Obj
+Tcl_Size
 Tcl_Time
 TempNamespaceStatus
 TestDSMRegistryStruct
@@ -3141,6 +3149,7 @@ UnicodeNormalizationQC
 Unique
 UniquePath
 UniquePathMethod
+UniqueRelInfo
 UniqueState
 UnlistenStmt
 UnresolvedTup
@@ -3171,8 +3180,11 @@ VacuumRelation
 VacuumStmt
 ValidIOData
 ValidateIndexState
-ValidatorModuleState
 ValidatorModuleResult
+ValidatorModuleState
+ValidatorShutdownCB
+ValidatorStartupCB
+ValidatorValidateCB
 ValuesScan
 ValuesScanState
 Var
@@ -3377,10 +3389,9 @@ _resultmap
 _stringlist
 access_vector_t
 acquireLocksOnSubLinks_context
-add_nulling_relids_context
 addFkConstraintSides
+add_nulling_relids_context
 adjust_appendrel_attrs_context
-allocfunc
 amadjustmembers_function
 ambeginscan_function
 ambuild_function
@@ -3392,6 +3403,7 @@ amcostestimate_function
 amendscan_function
 amestimateparallelscan_function
 amgetbitmap_function
+amgettreeheight_function
 amgettuple_function
 aminitparallelscan_function
 aminsert_function
@@ -3402,13 +3414,27 @@ amparallelrescan_function
 amproperty_function
 amrescan_function
 amrestrpos_function
-amtranslate_strategy_function amtranslatestrategy;
-amtranslate_cmptype_function amtranslatecmptype;
+amtranslate_cmptype_function
+amtranslate_strategy_function
 amvacuumcleanup_function
 amvalidate_function
 array_iter
 array_unnest_fctx
 assign_collations_context
+astreamer
+astreamer_archive_context
+astreamer_extractor
+astreamer_gzip_decompressor
+astreamer_gzip_writer
+astreamer_lz4_frame
+astreamer_member
+astreamer_ops
+astreamer_plain_writer
+astreamer_recovery_injector
+astreamer_tar_archiver
+astreamer_tar_parser
+astreamer_verify
+astreamer_zstd_frame
 auth_password_hook_typ
 autovac_table
 av_relation
@@ -3435,20 +3461,6 @@ bbsink_shell
 bbsink_state
 bbsink_throttle
 bbsink_zstd
-astreamer
-astreamer_archive_context
-astreamer_extractor
-astreamer_gzip_decompressor
-astreamer_gzip_writer
-astreamer_lz4_frame
-astreamer_member
-astreamer_ops
-astreamer_plain_writer
-astreamer_recovery_injector
-astreamer_tar_archiver
-astreamer_tar_parser
-astreamer_verify
-astreamer_zstd_frame
 bgworker_main_type
 bh_node_type
 binaryheap
@@ -3488,6 +3500,13 @@ colormaprange
 compare_context
 config_handle
 config_var_value
+conn_errorMessage_func
+conn_oauth_client_id_func
+conn_oauth_client_secret_func
+conn_oauth_discovery_uri_func
+conn_oauth_issuer_id_func
+conn_oauth_scope_func
+conn_sasl_state_func
 contain_aggs_of_level_context
 contain_placeholder_references_context
 convert_testexpr_context
@@ -3504,6 +3523,9 @@ create_upper_paths_hook_type
 createdb_failure_params
 crosstab_HashEnt
 crosstab_cat_desc
+curl_infotype
+curl_socket_t
+curl_version_info_data
 datapagemap_iterator_t
 datapagemap_t
 dateKEY
@@ -3515,9 +3537,8 @@ deparse_columns
 deparse_context
 deparse_expr_cxt
 deparse_namespace
-destructor
+derives_hash
 dev_t
-digit
 disassembledLeaf
 dlist_head
 dlist_iter
@@ -3555,18 +3576,23 @@ dsm_handle
 dsm_op
 dsm_segment
 dsm_segment_detach_callback
+duration
 eLogType
 ean13
 eary
 ec_matches_callback_type
 ec_member_foreign_arg
 ec_member_matches_arg
+element_type
 emit_log_hook_type
 eval_const_expressions_context
 exec_thread_arg
 execution_state
 exit_function
 explain_get_index_name_hook_type
+explain_per_node_hook_type
+explain_per_plan_hook_type
+explain_validate_options_hook_type
 f_smgr
 fasthash_state
 fd_set
@@ -3649,7 +3675,6 @@ gss_key_value_set_desc
 gss_name_t
 gtrgm_consistent_cache
 gzFile
-hashfunc
 hbaPort
 heap_page_items_state
 help_handler
@@ -3671,17 +3696,21 @@ init_function
 inline_cte_walker_context
 inline_error_callback_arg
 ino_t
+inquiry
 instr_time
 int128
 int16
 int16KEY
+int16_t
 int2vector
 int32
 int32KEY
 int32_t
 int64
 int64KEY
+int64_t
 int8
+int8_t
 int8x16_t
 internalPQconninfoOption
 intptr_t
@@ -3713,6 +3742,7 @@ lclContext
 lclTocEntry
 leafSegmentInfo
 leaf_item
+libpq_gettext_func
 libpq_source
 line_t
 lineno_t
@@ -3769,6 +3799,7 @@ mxact
 mxtruncinfo
 needs_fmgr_hook_type
 network_sortsupport_state
+nl_item
 nodeitem
 normal_rand_fctx
 nsphash_hash
@@ -3786,6 +3817,7 @@ openssl_tls_init_hook_typ
 ossl_EVP_cipher_func
 other
 output_type
+overexplain_options
 pagetable_hash
 pagetable_iterator
 pairingheap
@@ -3805,7 +3837,6 @@ pg_atomic_flag
 pg_atomic_uint32
 pg_atomic_uint64
 pg_be_sasl_mech
-pg_case_map
 pg_category_range
 pg_checksum_context
 pg_checksum_raw_context
@@ -3829,7 +3860,6 @@ pg_funcptr_t
 pg_gssinfo
 pg_hmac_ctx
 pg_hmac_errno
-pg_int64
 pg_local_to_utf_combined
 pg_locale_t
 pg_mb_radix_tree
@@ -3898,7 +3928,8 @@ plperl_query_entry
 plpgsql_CastExprHashEntry
 plpgsql_CastHashEntry
 plpgsql_CastHashKey
-plpgsql_HashEnt
+plpgsql_expr_walker_callback
+plpgsql_stmt_walker_callback
 pltcl_call_state
 pltcl_interp_desc
 pltcl_proc_desc
@@ -3921,7 +3952,6 @@ printTextLineFormat
 printTextLineWrap
 printTextRule
 printXheaderWidthType
-printfunc
 priv_map
 process_file_callback_t
 process_sublinks_context
@@ -3961,12 +3991,9 @@ reduce_outer_joins_pass1_state
 reduce_outer_joins_pass2_state
 reference
 regex_arc_t
-regex_t
 regexp
 regexp_matches_ctx
 registered_buffer
-regmatch_t
-regoff_t
 regproc
 relopt_bool
 relopt_enum
@@ -3985,6 +4012,7 @@ remoteConnHashEnt
 remoteDep
 remove_nulling_relids_context
 rendezvousHashEntry
+rep
 replace_rte_variables_callback
 replace_rte_variables_context
 report_error_fn
@@ -4003,6 +4031,7 @@ rt_node_class_test_elem
 rt_radix_tree
 saophash_hash
 save_buffer
+save_locale_t
 scram_state
 scram_state_enum
 script_error_callback_arg
@@ -4010,6 +4039,8 @@ security_class_t
 sem_t
 sepgsql_context_info_t
 sequence_magic
+set_conn_altsock_func
+set_conn_oauth_token_func
 set_join_pathlist_hook_type
 set_rel_pathlist_hook_type
 shared_ts_iter
@@ -4130,6 +4161,7 @@ uint32_t
 uint32x4_t
 uint64
 uint64_t
+uint64x2_t
 uint8
 uint8_t
 uint8x16_t
@@ -4139,7 +4171,6 @@ unicodeStyleColumnFormat
 unicodeStyleFormat
 unicodeStyleRowFormat
 unicode_linestyle
-UniqueRelInfo
 unit_conversion
 unlogged_relation_entry
 utf_local_conversion_func
@@ -4282,6 +4313,7 @@ xmlGenericErrorFunc
 xmlNodePtr
 xmlNodeSetPtr
 xmlParserCtxtPtr
+xmlParserErrors
 xmlParserInputPtr
 xmlSaveCtxt
 xmlSaveCtxtPtr
@@ -4302,6 +4334,3 @@ yyscan_t
 z_stream
 z_streamp
 zic_t
-ExplainExtensionOption
-ExplainOptionHandler
-overexplain_options