public inbox for [email protected]help / color / mirror / Atom feed
[PATCH v24 03/10] Add default_toast_compression GUC 4+ messages / 3 participants [nested] [flat]
* [PATCH v24 03/10] Add default_toast_compression GUC @ 2021-01-30 03:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 4+ messages in thread From: Justin Pryzby @ 2021-01-30 03:37 UTC (permalink / raw) --- src/backend/access/common/tupdesc.c | 2 +- src/backend/bootstrap/bootstrap.c | 3 +- src/backend/commands/amcmds.c | 143 +++++++++++++++++++++++++++- src/backend/commands/tablecmds.c | 4 +- src/backend/utils/init/postinit.c | 4 + src/backend/utils/misc/guc.c | 12 +++ src/include/access/amapi.h | 2 + src/include/access/compressamapi.h | 12 ++- 8 files changed, 176 insertions(+), 6 deletions(-) diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index ca26fab487..7afaea000b 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -668,7 +668,7 @@ TupleDescInitEntry(TupleDesc desc, att->attcollation = typeForm->typcollation; if (IsStorageCompressible(typeForm->typstorage)) - att->attcompression = DefaultCompressionOid; + att->attcompression = GetDefaultToastCompression(); else att->attcompression = InvalidOid; diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 9b451eaa71..ec3376cf8a 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -732,8 +732,9 @@ DefineAttr(char *name, char *type, int attnum, int nullness) attrtypes[attnum]->attcacheoff = -1; attrtypes[attnum]->atttypmod = -1; attrtypes[attnum]->attislocal = true; + if (IsStorageCompressible(attrtypes[attnum]->attstorage)) - attrtypes[attnum]->attcompression = DefaultCompressionOid; + attrtypes[attnum]->attcompression = GetDefaultToastCompression(); else attrtypes[attnum]->attcompression = InvalidOid; diff --git a/src/backend/commands/amcmds.c b/src/backend/commands/amcmds.c index 3ad4a61739..1682afd2a4 100644 --- a/src/backend/commands/amcmds.c +++ b/src/backend/commands/amcmds.c @@ -13,8 +13,11 @@ */ #include "postgres.h" +#include "access/amapi.h" +#include "access/compressamapi.h" #include "access/htup_details.h" #include "access/table.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" @@ -27,13 +30,20 @@ #include "parser/parse_func.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/guc.h" +#include "utils/inval.h" #include "utils/rel.h" #include "utils/syscache.h" - static Oid lookup_am_handler_func(List *handler_name, char amtype); static const char *get_am_type_string(char amtype); +/* Compile-time default */ +char *default_toast_compression = DEFAULT_TOAST_COMPRESSION; // maybe needs pg_dump support ? +/* Invalid means need to lookup the text value in the catalog */ +static Oid default_toast_compression_oid = InvalidOid; + +static void AccessMethodCallback(Datum arg, int cacheid, uint32 hashvalue); /* * CreateAccessMethod @@ -277,3 +287,134 @@ lookup_am_handler_func(List *handler_name, char amtype) return handlerOid; } + +/* check_hook: validate new default_toast_compression */ +bool +check_default_toast_compression(char **newval, void **extra, GucSource source) +{ + if (**newval == '\0') + { + GUC_check_errdetail("%s cannot be empty.", + "default_toast_compression"); + return false; + } + + if (strlen(*newval) >= NAMEDATALEN) + { + GUC_check_errdetail("%s is too long (maximum %d characters).", + "default_toast_compression", NAMEDATALEN - 1); + return false; + } + + /* + * If we aren't inside a transaction, or not connected to a database, we + * cannot do the catalog access necessary to verify the method. Must + * accept the value on faith. + */ + if (IsTransactionState() && MyDatabaseId != InvalidOid) + { + if (!OidIsValid(get_compression_am_oid(*newval, true))) + { + /* + * When source == PGC_S_TEST, don't throw a hard error for a + * nonexistent table access method, only a NOTICE. See comments in + * guc.h. + */ + if (source == PGC_S_TEST) + { + ereport(NOTICE, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("compression access method \"%s\" does not exist", + *newval))); + } + else + { + GUC_check_errdetail("Compression access method \"%s\" does not exist.", + *newval); + return false; + } + } + } + + return true; +} + +/* + * assign_default_toast_compression: GUC assign_hook for default_toast_compression + */ +void +assign_default_toast_compression(const char *newval, void *extra) +{ + /* + * Invalidate setting, forcing it to be looked up as needed. + * This avoids trying to do database access during GUC initialization, + * or outside a transaction. + */ + + default_toast_compression = NULL; +fprintf(stderr, "set to null\n"); +} + + +/* + * GetDefaultToastCompression -- get the OID of the current toast compression + * + * This exists to hide and optimize the use of the default_toast_compression + * GUC variable. + */ +Oid +GetDefaultToastCompression(void) +{ + /* Avoid catalog access during bootstrap, and for default compression */ + if (strcmp(default_toast_compression, DEFAULT_TOAST_COMPRESSION) == 0) + return PGLZ_COMPRESSION_AM_OID; + + /* Cannot call get_compression_am_oid this early */ + // if (IsBootstrapProcessingMode()) + // return PGLZ_COMPRESSION_AM_OID; + Assert(!IsBootstrapProcessingMode()); + + /* + * If cached value isn't valid, look up the current default value, caching + * the result + */ + if (!OidIsValid(default_toast_compression_oid)) + default_toast_compression_oid = + get_am_type_oid(default_toast_compression, AMTYPE_COMPRESSION, + false); + + return default_toast_compression_oid; +} + +/* + * InitializeAccessMethods: initialize module during InitPostgres. + * + * This is called after we are up enough to be able to do catalog lookups. + */ +void +InitializeAccessMethods(void) +{ + if (IsBootstrapProcessingMode()) + return; + + /* + * In normal mode, arrange for a callback on any syscache invalidation + * of pg_am rows. + */ + CacheRegisterSyscacheCallback(AMOID, + AccessMethodCallback, + (Datum) 0); + /* Force cached default access method to be recomputed on next use */ + // default_toast_compression_oid = InvalidOid; +} + +/* + * AccessMethodCallback + * Syscache inval callback function + */ +static void +AccessMethodCallback(Datum arg, int cacheid, uint32 hashvalue) +{ + /* Force look up of compression oid on next use */ + default_toast_compression_oid = false; +} diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index dd81d5bf4e..72ba017814 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -11925,7 +11925,7 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, if (!IsStorageCompressible(tform->typstorage)) attTup->attcompression = InvalidOid; else if (!OidIsValid(attTup->attcompression)) - attTup->attcompression = DefaultCompressionOid; + attTup->attcompression = GetDefaultToastCompression(); } else attTup->attcompression = InvalidOid; @@ -17762,7 +17762,7 @@ GetAttributeCompression(Form_pg_attribute att, char *compression) /* fallback to default compression if it's not specified */ if (compression == NULL) - return DefaultCompressionOid; + return GetDefaultToastCompression(); amoid = get_compression_am_oid(compression, false); diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index e5965bc517..6a02bbd377 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -25,6 +25,7 @@ #include "access/session.h" #include "access/sysattr.h" #include "access/tableam.h" +#include "access/amapi.h" #include "access/xact.h" #include "access/xlog.h" #include "catalog/catalog.h" @@ -1060,6 +1061,9 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username, /* set default namespace search path */ InitializeSearchPath(); + /* set callback for changes to pg_am */ + InitializeAccessMethods(); + /* initialize client encoding */ InitializeClientEncoding(); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index eafdb1118e..3a2b33fcd1 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -30,6 +30,7 @@ #include <unistd.h> #include "access/commit_ts.h" +#include "access/compressamapi.h" #include "access/gin.h" #include "access/rmgr.h" #include "access/tableam.h" @@ -3915,6 +3916,17 @@ static struct config_string ConfigureNamesString[] = check_default_table_access_method, NULL, NULL }, + { + {"default_toast_compression", PGC_USERSET, CLIENT_CONN_STATEMENT, + gettext_noop("Sets the default compression for new columns."), + NULL, + GUC_IS_NAME + }, + &default_toast_compression, + DEFAULT_TOAST_COMPRESSION, + check_default_toast_compression, assign_default_toast_compression, NULL, NULL + }, + { {"default_tablespace", PGC_USERSET, CLIENT_CONN_STATEMENT, gettext_noop("Sets the default tablespace to create tables and indexes in."), diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h index d357ebb559..1513cafcf4 100644 --- a/src/include/access/amapi.h +++ b/src/include/access/amapi.h @@ -287,4 +287,6 @@ typedef struct IndexAmRoutine extern IndexAmRoutine *GetIndexAmRoutine(Oid amhandler); extern IndexAmRoutine *GetIndexAmRoutineByAmId(Oid amoid, bool noerror); +void InitializeAccessMethods(void); + #endif /* AMAPI_H */ diff --git a/src/include/access/compressamapi.h b/src/include/access/compressamapi.h index 5a8e23d926..d75a8e9df2 100644 --- a/src/include/access/compressamapi.h +++ b/src/include/access/compressamapi.h @@ -17,6 +17,7 @@ #include "catalog/pg_am_d.h" #include "nodes/nodes.h" +#include "utils/guc.h" /* * Built-in compression method-id. The toast compression header will store @@ -29,8 +30,17 @@ typedef enum CompressionId LZ4_COMPRESSION_ID = 1 } CompressionId; -/* Use default compression method if it is not specified. */ +/* Default compression method if not specified. */ +#define DEFAULT_TOAST_COMPRESSION "pglz" #define DefaultCompressionOid PGLZ_COMPRESSION_AM_OID + +/* GUC */ +extern char *default_toast_compression; +extern void assign_default_toast_compression(const char *newval, void *extra); +extern bool check_default_toast_compression(char **newval, void **extra, GucSource source); + +extern Oid GetDefaultToastCompression(void); + #define IsStorageCompressible(storage) ((storage) != TYPSTORAGE_PLAIN && \ (storage) != TYPSTORAGE_EXTERNAL) /* compression handler routines */ -- 2.17.0 --m51xatjYGsM+13rf Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v24-0004-default-to-with-lz4.patch" ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Regarding the order of the header file includes @ 2024-03-12 11:47 Richard Guo <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Richard Guo @ 2024-03-12 11:47 UTC (permalink / raw) To: pgsql-hackers On Wed, Mar 6, 2024 at 5:32 PM Richard Guo <[email protected]> wrote: > Please note that this patch only addresses the order of header file > includes in backend modules (and might not be thorough). It is possible > that other modules may have a similar issue, but I have not evaluated > them yet. > Attached is v2, which also includes the 0002 patch that addresses the order of header file includes in non-backend modules. Thanks Richard Attachments: [application/octet-stream] v2-0001-Make-the-order-of-the-header-file-includes-consistent-in-backend-modules.patch (22.7K, ../../CAMbWs48Ff43mBt6hV6_icorw1wkj9ggHgCDYz9B+VHoPJ4mRYw@mail.gmail.com/3-v2-0001-Make-the-order-of-the-header-file-includes-consistent-in-backend-modules.patch) download | inline diff: From 7e57cced184f756c7c93b5a32ea0e2d4d6f9afe1 Mon Sep 17 00:00:00 2001 From: Richard Guo <[email protected]> Date: Wed, 6 Mar 2024 15:47:30 +0800 Subject: [PATCH v2 1/2] Make the order of the header file includes consistent in backend modules --- src/backend/access/brin/brin_bloom.c | 8 ++++---- src/backend/access/brin/brin_minmax_multi.c | 6 +++--- src/backend/access/common/printsimple.c | 2 +- src/backend/access/hash/hash.c | 2 +- src/backend/access/heap/pruneheap.c | 2 +- src/backend/access/spgist/spgtextproc.c | 2 +- src/backend/access/transam/xlogarchive.c | 2 +- src/backend/access/transam/xlogprefetcher.c | 4 ++-- src/backend/backup/basebackup_incremental.c | 2 +- src/backend/catalog/pg_publication.c | 2 +- src/backend/commands/statscmds.c | 2 +- src/backend/commands/vacuum.c | 2 +- src/backend/optimizer/util/relnode.c | 2 +- src/backend/parser/parse_merge.c | 4 ++-- src/backend/parser/parser.c | 2 +- src/backend/postmaster/walsummarizer.c | 2 +- src/backend/replication/logical/tablesync.c | 4 ++-- src/backend/rewrite/rewriteSearchCycle.c | 2 +- src/backend/statistics/extended_stats.c | 2 +- src/backend/storage/ipc/procsignal.c | 4 ++-- src/backend/storage/sync/sync.c | 2 +- src/backend/utils/activity/pgstat_database.c | 2 +- src/backend/utils/activity/pgstat_relation.c | 2 +- src/backend/utils/activity/pgstat_wal.c | 2 +- src/backend/utils/adt/array_userfuncs.c | 4 ++-- src/backend/utils/adt/jsonbsubs.c | 2 +- src/backend/utils/adt/jsonpath.c | 2 +- src/backend/utils/adt/multirangetypes.c | 4 ++-- src/backend/utils/adt/multirangetypes_selfuncs.c | 2 +- src/backend/utils/adt/numutils.c | 2 +- src/backend/utils/adt/rangetypes_typanalyze.c | 2 +- src/backend/utils/error/elog.c | 2 +- src/backend/utils/mb/stringinfo_mb.c | 2 +- src/backend/utils/misc/guc_tables.c | 2 +- src/backend/utils/misc/tzparser.c | 2 +- src/backend/utils/mmgr/aset.c | 2 +- src/backend/utils/mmgr/generation.c | 2 +- src/backend/utils/mmgr/slab.c | 2 +- src/backend/utils/sort/tuplesortvariants.c | 2 +- 39 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/backend/access/brin/brin_bloom.c b/src/backend/access/brin/brin_bloom.c index 32de039161..ebf3301627 100644 --- a/src/backend/access/brin/brin_bloom.c +++ b/src/backend/access/brin/brin_bloom.c @@ -114,22 +114,22 @@ */ #include "postgres.h" -#include "access/genam.h" +#include <math.h> + #include "access/brin.h" #include "access/brin_internal.h" #include "access/brin_page.h" #include "access/brin_tuple.h" +#include "access/genam.h" #include "access/htup_details.h" #include "access/reloptions.h" #include "catalog/pg_am.h" -#include "catalog/pg_type.h" #include "catalog/pg_amop.h" +#include "catalog/pg_type.h" #include "common/hashfn.h" #include "utils/fmgrprotos.h" #include "utils/rel.h" -#include <math.h> - #define BloomEqualStrategyNumber 1 /* diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index 207a5a15b3..c5962c00d6 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -59,16 +59,16 @@ /* needed for PGSQL_AF_INET */ #include <sys/socket.h> -#include "access/genam.h" #include "access/brin.h" #include "access/brin_internal.h" #include "access/brin_tuple.h" +#include "access/genam.h" +#include "access/htup_details.h" #include "access/reloptions.h" #include "access/stratnum.h" -#include "access/htup_details.h" -#include "catalog/pg_type.h" #include "catalog/pg_am.h" #include "catalog/pg_amop.h" +#include "catalog/pg_type.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/date.h" diff --git a/src/backend/access/common/printsimple.c b/src/backend/access/common/printsimple.c index 8134c3be0c..4c5eedcdc1 100644 --- a/src/backend/access/common/printsimple.c +++ b/src/backend/access/common/printsimple.c @@ -20,8 +20,8 @@ #include "access/printsimple.h" #include "catalog/pg_type.h" -#include "libpq/protocol.h" #include "libpq/pqformat.h" +#include "libpq/protocol.h" #include "utils/builtins.h" /* diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 75bb02dfd7..01d06b7c32 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -27,8 +27,8 @@ #include "commands/vacuum.h" #include "miscadmin.h" #include "nodes/execnodes.h" -#include "pgstat.h" #include "optimizer/plancat.h" +#include "pgstat.h" #include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index e2f2c37f4d..4f12413b8b 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -23,8 +23,8 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" -#include "utils/snapmgr.h" #include "utils/rel.h" +#include "utils/snapmgr.h" /* Working data for heap_page_prune and subroutines */ typedef struct diff --git a/src/backend/access/spgist/spgtextproc.c b/src/backend/access/spgist/spgtextproc.c index 06042feb11..3f08d330b6 100644 --- a/src/backend/access/spgist/spgtextproc.c +++ b/src/backend/access/spgist/spgtextproc.c @@ -40,8 +40,8 @@ #include "postgres.h" #include "access/spgist.h" -#include "common/int.h" #include "catalog/pg_type.h" +#include "common/int.h" #include "mb/pg_wchar.h" #include "utils/datum.h" #include "utils/fmgrprotos.h" diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c index 977a2fe06b..caa1f03d93 100644 --- a/src/backend/access/transam/xlogarchive.c +++ b/src/backend/access/transam/xlogarchive.c @@ -26,8 +26,8 @@ #include "common/percentrepl.h" #include "miscadmin.h" #include "pgstat.h" -#include "postmaster/startup.h" #include "postmaster/pgarch.h" +#include "postmaster/startup.h" #include "replication/walsender.h" #include "storage/fd.h" #include "storage/ipc.h" diff --git a/src/backend/access/transam/xlogprefetcher.c b/src/backend/access/transam/xlogprefetcher.c index c3f52a8bd1..fc80c37e55 100644 --- a/src/backend/access/transam/xlogprefetcher.c +++ b/src/backend/access/transam/xlogprefetcher.c @@ -32,16 +32,16 @@ #include "catalog/pg_control.h" #include "catalog/storage_xlog.h" #include "commands/dbcommands_xlog.h" -#include "utils/fmgrprotos.h" -#include "utils/timestamp.h" #include "funcapi.h" #include "miscadmin.h" #include "port/atomics.h" #include "storage/bufmgr.h" #include "storage/shmem.h" #include "storage/smgr.h" +#include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" #include "utils/hsearch.h" +#include "utils/timestamp.h" /* * Every time we process this much WAL, we'll update the values in diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index ebc41f28be..2a522e4aea 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -23,9 +23,9 @@ #include "backup/basebackup_incremental.h" #include "backup/walsummary.h" #include "common/blkreftable.h" -#include "common/parse_manifest.h" #include "common/hashfn.h" #include "common/int.h" +#include "common/parse_manifest.h" #include "datatype/timestamp.h" #include "postmaster/walsummarizer.h" #include "utils/timestamp.h" diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c index ac05dc057f..0602398a54 100644 --- a/src/backend/catalog/pg_publication.c +++ b/src/backend/catalog/pg_publication.c @@ -22,8 +22,8 @@ #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/namespace.h" -#include "catalog/partition.h" #include "catalog/objectaddress.h" +#include "catalog/partition.h" #include "catalog/pg_inherits.h" #include "catalog/pg_namespace.h" #include "catalog/pg_publication.h" diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c index 6fa840fada..a855f750c7 100644 --- a/src/backend/commands/statscmds.c +++ b/src/backend/commands/statscmds.c @@ -32,8 +32,8 @@ #include "statistics/statistics.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/inval.h" +#include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 25281bbed9..223d33728d 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -34,8 +34,8 @@ #include "access/tableam.h" #include "access/transam.h" #include "access/xact.h" -#include "catalog/namespace.h" #include "catalog/index.h" +#include "catalog/namespace.h" #include "catalog/pg_database.h" #include "catalog/pg_inherits.h" #include "commands/cluster.h" diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index e5f4062bfb..d791c4108d 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -29,8 +29,8 @@ #include "optimizer/plancat.h" #include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" -#include "rewrite/rewriteManip.h" #include "parser/parse_relation.h" +#include "rewrite/rewriteManip.h" #include "utils/hsearch.h" #include "utils/lsyscache.h" diff --git a/src/backend/parser/parse_merge.c b/src/backend/parser/parse_merge.c index 6b99f55688..a7d8ba7e98 100644 --- a/src/backend/parser/parse_merge.c +++ b/src/backend/parser/parse_merge.c @@ -18,14 +18,14 @@ #include "access/sysattr.h" #include "nodes/makefuncs.h" #include "parser/analyze.h" -#include "parser/parse_collate.h" -#include "parser/parsetree.h" #include "parser/parse_clause.h" +#include "parser/parse_collate.h" #include "parser/parse_cte.h" #include "parser/parse_expr.h" #include "parser/parse_merge.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parsetree.h" #include "utils/rel.h" static void setNamespaceForMergeWhen(ParseState *pstate, diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index 3a1fa91c1b..118488c3f3 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -21,8 +21,8 @@ #include "postgres.h" -#include "mb/pg_wchar.h" #include "gramparse.h" +#include "mb/pg_wchar.h" #include "parser/parser.h" #include "parser/scansup.h" diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c index 8bf8a03471..ec2874c18c 100644 --- a/src/backend/postmaster/walsummarizer.c +++ b/src/backend/postmaster/walsummarizer.c @@ -38,8 +38,8 @@ #include "replication/walreceiver.h" #include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.h" #include "storage/latch.h" +#include "storage/lwlock.h" #include "storage/proc.h" #include "storage/procsignal.h" #include "storage/shmem.h" diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c index ee06629088..1061d5b61b 100644 --- a/src/backend/replication/logical/tablesync.c +++ b/src/backend/replication/logical/tablesync.c @@ -107,10 +107,10 @@ #include "replication/logicallauncher.h" #include "replication/logicalrelation.h" #include "replication/logicalworker.h" +#include "replication/origin.h" +#include "replication/slot.h" #include "replication/walreceiver.h" #include "replication/worker_internal.h" -#include "replication/slot.h" -#include "replication/origin.h" #include "storage/ipc.h" #include "storage/lmgr.h" #include "utils/acl.h" diff --git a/src/backend/rewrite/rewriteSearchCycle.c b/src/backend/rewrite/rewriteSearchCycle.c index 911a901808..1c58003f9d 100644 --- a/src/backend/rewrite/rewriteSearchCycle.c +++ b/src/backend/rewrite/rewriteSearchCycle.c @@ -16,8 +16,8 @@ #include "catalog/pg_operator_d.h" #include "catalog/pg_type_d.h" #include "nodes/makefuncs.h" -#include "nodes/pg_list.h" #include "nodes/parsenodes.h" +#include "nodes/pg_list.h" #include "nodes/primnodes.h" #include "parser/analyze.h" #include "parser/parsetree.h" diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 5d7bdc9d12..f21bdc2ab9 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -23,9 +23,9 @@ #include "catalog/indexing.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" -#include "executor/executor.h" #include "commands/defrem.h" #include "commands/progress.h" +#include "executor/executor.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c index ca41b56952..4ed9cedcdd 100644 --- a/src/backend/storage/ipc/procsignal.c +++ b/src/backend/storage/ipc/procsignal.c @@ -18,18 +18,18 @@ #include <unistd.h> #include "access/parallel.h" -#include "port/pg_bitutils.h" #include "commands/async.h" #include "miscadmin.h" #include "pgstat.h" +#include "port/pg_bitutils.h" #include "replication/logicalworker.h" #include "replication/walsender.h" #include "storage/condition_variable.h" #include "storage/ipc.h" #include "storage/latch.h" #include "storage/shmem.h" -#include "storage/smgr.h" #include "storage/sinval.h" +#include "storage/smgr.h" #include "tcop/tcopprot.h" #include "utils/memutils.h" diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c index 4764e26f70..ab7137d0ff 100644 --- a/src/backend/storage/sync/sync.c +++ b/src/backend/storage/sync/sync.c @@ -18,8 +18,8 @@ #include <fcntl.h> #include <sys/file.h> -#include "access/commit_ts.h" #include "access/clog.h" +#include "access/commit_ts.h" #include "access/multixact.h" #include "access/xlog.h" #include "miscadmin.h" diff --git a/src/backend/utils/activity/pgstat_database.c b/src/backend/utils/activity/pgstat_database.c index 1203c4cbd1..29bc090974 100644 --- a/src/backend/utils/activity/pgstat_database.c +++ b/src/backend/utils/activity/pgstat_database.c @@ -17,9 +17,9 @@ #include "postgres.h" +#include "storage/procsignal.h" #include "utils/pgstat_internal.h" #include "utils/timestamp.h" -#include "storage/procsignal.h" static bool pgstat_should_report_connstat(void); diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c index 40241e26d6..8a3f7d434c 100644 --- a/src/backend/utils/activity/pgstat_relation.c +++ b/src/backend/utils/activity/pgstat_relation.c @@ -19,12 +19,12 @@ #include "access/twophase_rmgr.h" #include "access/xact.h" +#include "catalog/catalog.h" #include "postmaster/autovacuum.h" #include "utils/memutils.h" #include "utils/pgstat_internal.h" #include "utils/rel.h" #include "utils/timestamp.h" -#include "catalog/catalog.h" /* Record that's written to 2PC state file when pgstat state is persisted */ diff --git a/src/backend/utils/activity/pgstat_wal.c b/src/backend/utils/activity/pgstat_wal.c index 1a3c0e1a66..0e374f133a 100644 --- a/src/backend/utils/activity/pgstat_wal.c +++ b/src/backend/utils/activity/pgstat_wal.c @@ -17,8 +17,8 @@ #include "postgres.h" -#include "utils/pgstat_internal.h" #include "executor/instrument.h" +#include "utils/pgstat_internal.h" PgStat_PendingWalStats PendingWalStats = {0}; diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index a643f2169a..6599be2ec5 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -13,13 +13,13 @@ #include "postgres.h" #include "catalog/pg_type.h" -#include "libpq/pqformat.h" #include "common/int.h" #include "common/pg_prng.h" +#include "libpq/pqformat.h" #include "port/pg_bitutils.h" #include "utils/array.h" -#include "utils/datum.h" #include "utils/builtins.h" +#include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/jsonbsubs.c b/src/backend/utils/adt/jsonbsubs.c index d3edb010ed..2b037131c9 100644 --- a/src/backend/utils/adt/jsonbsubs.c +++ b/src/backend/utils/adt/jsonbsubs.c @@ -19,8 +19,8 @@ #include "nodes/subscripting.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" -#include "utils/jsonb.h" #include "utils/builtins.h" +#include "utils/jsonb.h" /* SubscriptingRefState.workspace for jsonb subscripting execution */ diff --git a/src/backend/utils/adt/jsonpath.c b/src/backend/utils/adt/jsonpath.c index f4a5d00767..786a2b65c6 100644 --- a/src/backend/utils/adt/jsonpath.c +++ b/src/backend/utils/adt/jsonpath.c @@ -65,8 +65,8 @@ #include "lib/stringinfo.h" #include "libpq/pqformat.h" -#include "nodes/miscnodes.h" #include "miscadmin.h" +#include "nodes/miscnodes.h" #include "utils/fmgrprotos.h" #include "utils/json.h" #include "utils/jsonpath.h" diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c index a6c959a4e1..8f12c953ca 100644 --- a/src/backend/utils/adt/multirangetypes.c +++ b/src/backend/utils/adt/multirangetypes.c @@ -39,11 +39,11 @@ #include "libpq/pqformat.h" #include "nodes/nodes.h" #include "port/pg_bitutils.h" +#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/rangetypes.h" #include "utils/multirangetypes.h" -#include "utils/array.h" +#include "utils/rangetypes.h" /* fn_extra cache entry for one of the range I/O functions */ typedef struct MultirangeIOData diff --git a/src/backend/utils/adt/multirangetypes_selfuncs.c b/src/backend/utils/adt/multirangetypes_selfuncs.c index f97ff575f0..9e8558b599 100644 --- a/src/backend/utils/adt/multirangetypes_selfuncs.c +++ b/src/backend/utils/adt/multirangetypes_selfuncs.c @@ -25,8 +25,8 @@ #include "utils/float.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" -#include "utils/rangetypes.h" #include "utils/multirangetypes.h" +#include "utils/rangetypes.h" #include "utils/selfuncs.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index c08eea452c..adc1e8a4cb 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -18,8 +18,8 @@ #include <limits.h> #include <ctype.h> -#include "utils/builtins.h" #include "port/pg_bitutils.h" +#include "utils/builtins.h" /* * A table of all two-digit numbers. This is used to speed up decimal digit diff --git a/src/backend/utils/adt/rangetypes_typanalyze.c b/src/backend/utils/adt/rangetypes_typanalyze.c index 47fc21b90f..3773f98115 100644 --- a/src/backend/utils/adt/rangetypes_typanalyze.c +++ b/src/backend/utils/adt/rangetypes_typanalyze.c @@ -29,8 +29,8 @@ #include "utils/float.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" -#include "utils/rangetypes.h" #include "utils/multirangetypes.h" +#include "utils/rangetypes.h" #include "varatt.h" static int float8_qsort_cmp(const void *a1, const void *a2, void *arg); diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index ed8aa5c9fa..52bc01058c 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -70,8 +70,8 @@ #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "mb/pg_wchar.h" -#include "nodes/miscnodes.h" #include "miscadmin.h" +#include "nodes/miscnodes.h" #include "pgstat.h" #include "postmaster/bgworker.h" #include "postmaster/postmaster.h" diff --git a/src/backend/utils/mb/stringinfo_mb.c b/src/backend/utils/mb/stringinfo_mb.c index f4af3909e8..241a6c2562 100644 --- a/src/backend/utils/mb/stringinfo_mb.c +++ b/src/backend/utils/mb/stringinfo_mb.c @@ -19,8 +19,8 @@ */ #include "postgres.h" -#include "mb/stringinfo_mb.h" #include "mb/pg_wchar.h" +#include "mb/stringinfo_mb.h" /* diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index d77214795d..57d9de4dd9 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -82,11 +82,11 @@ #include "utils/float.h" #include "utils/guc_hooks.h" #include "utils/guc_tables.h" +#include "utils/inval.h" #include "utils/memutils.h" #include "utils/pg_locale.h" #include "utils/plancache.h" #include "utils/ps_status.h" -#include "utils/inval.h" #include "utils/xml.h" /* This value is normally passed in from the Makefile */ diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c index ad892ee3c3..21fd866d6d 100644 --- a/src/backend/utils/misc/tzparser.c +++ b/src/backend/utils/misc/tzparser.c @@ -26,10 +26,10 @@ #include "miscadmin.h" #include "storage/fd.h" +#include "utils/datetime.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/tzparser.h" -#include "utils/datetime.h" #define WHITESPACE " \t\n\r" diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index d2dcf526d6..751cc3408c 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -49,8 +49,8 @@ #include "port/pg_bitutils.h" #include "utils/memdebug.h" #include "utils/memutils.h" -#include "utils/memutils_memorychunk.h" #include "utils/memutils_internal.h" +#include "utils/memutils_memorychunk.h" /*-------------------- * Chunk freelist k holds chunks of size 1 << (k + ALLOC_MINBITS), diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c index 9124d9b952..5d81af1f94 100644 --- a/src/backend/utils/mmgr/generation.c +++ b/src/backend/utils/mmgr/generation.c @@ -39,8 +39,8 @@ #include "port/pg_bitutils.h" #include "utils/memdebug.h" #include "utils/memutils.h" -#include "utils/memutils_memorychunk.h" #include "utils/memutils_internal.h" +#include "utils/memutils_memorychunk.h" #define Generation_BLOCKHDRSZ MAXALIGN(sizeof(GenerationBlock)) diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index 516e1c95aa..3e15d59683 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -71,8 +71,8 @@ #include "lib/ilist.h" #include "utils/memdebug.h" #include "utils/memutils.h" -#include "utils/memutils_memorychunk.h" #include "utils/memutils_internal.h" +#include "utils/memutils_memorychunk.h" #define Slab_BLOCKHDRSZ MAXALIGN(sizeof(SlabBlock)) diff --git a/src/backend/utils/sort/tuplesortvariants.c b/src/backend/utils/sort/tuplesortvariants.c index 08f9f16262..11de12d745 100644 --- a/src/backend/utils/sort/tuplesortvariants.c +++ b/src/backend/utils/sort/tuplesortvariants.c @@ -27,8 +27,8 @@ #include "executor/executor.h" #include "pg_trace.h" #include "utils/datum.h" -#include "utils/lsyscache.h" #include "utils/guc.h" +#include "utils/lsyscache.h" #include "utils/tuplesort.h" -- 2.31.0 [application/octet-stream] v2-0002-Make-the-order-of-the-header-file-includes-consistent-in-non-backend-modules.patch (9.9K, ../../CAMbWs48Ff43mBt6hV6_icorw1wkj9ggHgCDYz9B+VHoPJ4mRYw@mail.gmail.com/4-v2-0002-Make-the-order-of-the-header-file-includes-consistent-in-non-backend-modules.patch) download | inline diff: From 6dd78caf22aba4ac57bca2edd8bc09bdd467413f Mon Sep 17 00:00:00 2001 From: Richard Guo <[email protected]> Date: Tue, 12 Mar 2024 17:27:08 +0800 Subject: [PATCH v2 2/2] Make the order of the header file includes consistent in non-backend modules --- contrib/pageinspect/gistfuncs.c | 2 +- contrib/postgres_fdw/deparse.c | 2 +- contrib/uuid-ossp/uuid-ossp.c | 2 +- src/bin/pg_basebackup/bbstreamer_file.c | 2 +- src/bin/pg_basebackup/bbstreamer_gzip.c | 2 +- src/bin/pg_basebackup/bbstreamer_lz4.c | 2 +- src/bin/pg_combinebackup/backup_label.c | 2 +- src/bin/pg_combinebackup/pg_combinebackup.c | 2 +- src/bin/pg_combinebackup/reconstruct.c | 2 +- src/bin/pg_dump/compress_lz4.c | 2 +- src/bin/pg_dump/compress_zstd.c | 2 +- src/bin/pg_upgrade/controldata.c | 2 +- src/bin/pg_walsummary/pg_walsummary.c | 2 +- src/interfaces/ecpg/test/pg_regress_ecpg.c | 2 +- src/pl/plpython/plpy_procedure.c | 2 +- src/test/modules/injection_points/injection_points.c | 2 +- src/test/modules/ldap_password_func/ldap_password_func.c | 2 +- src/test/modules/test_dsa/test_dsa.c | 2 +- src/test/modules/worker_spi/worker_spi.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/contrib/pageinspect/gistfuncs.c b/contrib/pageinspect/gistfuncs.c index 8a81038bcb..b38f1d32f7 100644 --- a/contrib/pageinspect/gistfuncs.c +++ b/contrib/pageinspect/gistfuncs.c @@ -21,8 +21,8 @@ #include "storage/itemptr.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/pg_lsn.h" #include "utils/lsyscache.h" +#include "utils/pg_lsn.h" #include "utils/rel.h" #include "utils/ruleutils.h" #include "utils/varlena.h" diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 8787c00d3e..ce765ecc90 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -47,6 +47,7 @@ #include "catalog/pg_ts_dict.h" #include "catalog/pg_type.h" #include "commands/defrem.h" +#include "commands/tablecmds.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/plannodes.h" @@ -60,7 +61,6 @@ #include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" -#include "commands/tablecmds.h" /* * Global context for foreign_expr_walker's search of an expression tree. diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c index ee5d785cad..3172714eb6 100644 --- a/contrib/uuid-ossp/uuid-ossp.c +++ b/contrib/uuid-ossp/uuid-ossp.c @@ -13,9 +13,9 @@ #include "postgres.h" -#include "fmgr.h" #include "common/cryptohash.h" #include "common/sha1.h" +#include "fmgr.h" #include "port/pg_bswap.h" #include "utils/builtins.h" #include "utils/uuid.h" diff --git a/src/bin/pg_basebackup/bbstreamer_file.c b/src/bin/pg_basebackup/bbstreamer_file.c index fd89012487..0be39dddc9 100644 --- a/src/bin/pg_basebackup/bbstreamer_file.c +++ b/src/bin/pg_basebackup/bbstreamer_file.c @@ -14,8 +14,8 @@ #include <unistd.h> #include "bbstreamer.h" -#include "common/logging.h" #include "common/file_perm.h" +#include "common/logging.h" #include "common/string.h" typedef struct bbstreamer_plain_writer diff --git a/src/bin/pg_basebackup/bbstreamer_gzip.c b/src/bin/pg_basebackup/bbstreamer_gzip.c index 2fd704031d..4659314afd 100644 --- a/src/bin/pg_basebackup/bbstreamer_gzip.c +++ b/src/bin/pg_basebackup/bbstreamer_gzip.c @@ -18,8 +18,8 @@ #endif #include "bbstreamer.h" -#include "common/logging.h" #include "common/file_perm.h" +#include "common/logging.h" #include "common/string.h" #ifdef HAVE_LIBZ diff --git a/src/bin/pg_basebackup/bbstreamer_lz4.c b/src/bin/pg_basebackup/bbstreamer_lz4.c index ab1209fd1a..eda62caede 100644 --- a/src/bin/pg_basebackup/bbstreamer_lz4.c +++ b/src/bin/pg_basebackup/bbstreamer_lz4.c @@ -18,8 +18,8 @@ #endif #include "bbstreamer.h" -#include "common/logging.h" #include "common/file_perm.h" +#include "common/logging.h" #include "common/string.h" #ifdef USE_LZ4 diff --git a/src/bin/pg_combinebackup/backup_label.c b/src/bin/pg_combinebackup/backup_label.c index 9c1a6e2db2..b962927e70 100644 --- a/src/bin/pg_combinebackup/backup_label.c +++ b/src/bin/pg_combinebackup/backup_label.c @@ -15,8 +15,8 @@ #include "access/xlogdefs.h" #include "backup_label.h" -#include "common/logging.h" #include "common/file_perm.h" +#include "common/logging.h" #include "write_manifest.h" static int get_eol_offset(StringInfo buf); diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index 31ead7f405..860d8d3a26 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -25,9 +25,9 @@ #include "common/logging.h" #include "copy_file.h" #include "fe_utils/option_utils.h" +#include "getopt_long.h" #include "lib/stringinfo.h" #include "load_manifest.h" -#include "getopt_long.h" #include "reconstruct.h" #include "write_manifest.h" diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c index 873d307902..f5db1f2377 100644 --- a/src/bin/pg_combinebackup/reconstruct.c +++ b/src/bin/pg_combinebackup/reconstruct.c @@ -15,8 +15,8 @@ #include <unistd.h> #include "backup/basebackup_incremental.h" -#include "common/logging.h" #include "common/file_perm.h" +#include "common/logging.h" #include "copy_file.h" #include "lib/stringinfo.h" #include "reconstruct.h" diff --git a/src/bin/pg_dump/compress_lz4.c b/src/bin/pg_dump/compress_lz4.c index 8a01d31f74..7f72492bea 100644 --- a/src/bin/pg_dump/compress_lz4.c +++ b/src/bin/pg_dump/compress_lz4.c @@ -12,9 +12,9 @@ *------------------------------------------------------------------------- */ #include "postgres_fe.h" -#include "pg_backup_utils.h" #include "compress_lz4.h" +#include "pg_backup_utils.h" #ifdef USE_LZ4 #include <lz4frame.h> diff --git a/src/bin/pg_dump/compress_zstd.c b/src/bin/pg_dump/compress_zstd.c index d6a3bb68ba..aa5aff2fee 100644 --- a/src/bin/pg_dump/compress_zstd.c +++ b/src/bin/pg_dump/compress_zstd.c @@ -14,8 +14,8 @@ #include "postgres_fe.h" -#include "pg_backup_utils.h" #include "compress_zstd.h" +#include "pg_backup_utils.h" #ifndef USE_ZSTD diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index 3c836c7c13..1f0ccea3ed 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -11,8 +11,8 @@ #include <ctype.h> -#include "pg_upgrade.h" #include "common/string.h" +#include "pg_upgrade.h" /* diff --git a/src/bin/pg_walsummary/pg_walsummary.c b/src/bin/pg_walsummary/pg_walsummary.c index 485c72d939..5e41b376d7 100644 --- a/src/bin/pg_walsummary/pg_walsummary.c +++ b/src/bin/pg_walsummary/pg_walsummary.c @@ -19,8 +19,8 @@ #include "common/int.h" #include "common/logging.h" #include "fe_utils/option_utils.h" -#include "lib/stringinfo.h" #include "getopt_long.h" +#include "lib/stringinfo.h" typedef struct ws_options { diff --git a/src/interfaces/ecpg/test/pg_regress_ecpg.c b/src/interfaces/ecpg/test/pg_regress_ecpg.c index 644fc64068..c9960b8d20 100644 --- a/src/interfaces/ecpg/test/pg_regress_ecpg.c +++ b/src/interfaces/ecpg/test/pg_regress_ecpg.c @@ -18,9 +18,9 @@ #include "postgres_fe.h" -#include "pg_regress.h" #include "common/string.h" #include "lib/stringinfo.h" +#include "pg_regress.h" /* diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c index 79b6ef6a44..9cbbe7e3c8 100644 --- a/src/pl/plpython/plpy_procedure.c +++ b/src/pl/plpython/plpy_procedure.c @@ -8,9 +8,9 @@ #include "access/htup_details.h" #include "access/transam.h" -#include "funcapi.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" +#include "funcapi.h" #include "plpy_elog.h" #include "plpy_main.h" #include "plpy_procedure.h" diff --git a/src/test/modules/injection_points/injection_points.c b/src/test/modules/injection_points/injection_points.c index 7f52d758c5..0730254d54 100644 --- a/src/test/modules/injection_points/injection_points.c +++ b/src/test/modules/injection_points/injection_points.c @@ -19,9 +19,9 @@ #include "fmgr.h" #include "storage/condition_variable.h" +#include "storage/dsm_registry.h" #include "storage/lwlock.h" #include "storage/shmem.h" -#include "storage/dsm_registry.h" #include "utils/builtins.h" #include "utils/injection_point.h" #include "utils/wait_event.h" diff --git a/src/test/modules/ldap_password_func/ldap_password_func.c b/src/test/modules/ldap_password_func/ldap_password_func.c index f3d7994738..99c18a8f1c 100644 --- a/src/test/modules/ldap_password_func/ldap_password_func.c +++ b/src/test/modules/ldap_password_func/ldap_password_func.c @@ -15,9 +15,9 @@ #include <float.h> #include <stdio.h> +#include "libpq/auth.h" #include "libpq/libpq.h" #include "libpq/libpq-be.h" -#include "libpq/auth.h" #include "utils/guc.h" PG_MODULE_MAGIC; diff --git a/src/test/modules/test_dsa/test_dsa.c b/src/test/modules/test_dsa/test_dsa.c index 844316dec2..c78af68f61 100644 --- a/src/test/modules/test_dsa/test_dsa.c +++ b/src/test/modules/test_dsa/test_dsa.c @@ -13,8 +13,8 @@ #include "postgres.h" #include "fmgr.h" -#include "utils/dsa.h" #include "storage/lwlock.h" +#include "utils/dsa.h" #include "utils/resowner.h" PG_MODULE_MAGIC; diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index 770e87ae47..22177cf2b5 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -39,10 +39,10 @@ #include "fmgr.h" #include "lib/stringinfo.h" #include "pgstat.h" +#include "tcop/utility.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/snapmgr.h" -#include "tcop/utility.h" PG_MODULE_MAGIC; -- 2.31.0 ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Regarding the order of the header file includes @ 2024-03-13 14:07 Peter Eisentraut <[email protected]> parent: Richard Guo <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Peter Eisentraut @ 2024-03-13 14:07 UTC (permalink / raw) To: Richard Guo <[email protected]>; pgsql-hackers On 12.03.24 12:47, Richard Guo wrote: > > On Wed, Mar 6, 2024 at 5:32 PM Richard Guo <[email protected] > <mailto:[email protected]>> wrote: > > Please note that this patch only addresses the order of header file > includes in backend modules (and might not be thorough). It is possible > that other modules may have a similar issue, but I have not evaluated > them yet. > > > Attached is v2, which also includes the 0002 patch that addresses the > order of header file includes in non-backend modules. committed (as one patch) ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Regarding the order of the header file includes @ 2024-03-18 00:39 Richard Guo <[email protected]> parent: Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 4+ messages in thread From: Richard Guo @ 2024-03-18 00:39 UTC (permalink / raw) To: Peter Eisentraut <[email protected]>; +Cc: pgsql-hackers On Wed, Mar 13, 2024 at 10:07 PM Peter Eisentraut <[email protected]> wrote: > On 12.03.24 12:47, Richard Guo wrote: > > > > On Wed, Mar 6, 2024 at 5:32 PM Richard Guo <[email protected] > > <mailto:[email protected]>> wrote: > > > > Please note that this patch only addresses the order of header file > > includes in backend modules (and might not be thorough). It is > possible > > that other modules may have a similar issue, but I have not evaluated > > them yet. > > > > > > Attached is v2, which also includes the 0002 patch that addresses the > > order of header file includes in non-backend modules. > > committed (as one patch) Thanks for pushing! Thanks Richard ^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2024-03-18 00:39 UTC | newest] Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2021-01-30 03:37 [PATCH v24 03/10] Add default_toast_compression GUC Justin Pryzby <[email protected]> 2024-03-12 11:47 Re: Regarding the order of the header file includes Richard Guo <[email protected]> 2024-03-13 14:07 ` Re: Regarding the order of the header file includes Peter Eisentraut <[email protected]> 2024-03-18 00:39 ` Re: Regarding the order of the header file includes Richard Guo <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox