Skip to content

Commit 97d85be

Browse files
peterepetere
committed
Make the order of the header file includes consistent
Similar to commit 7e73503. Author: Richard Guo <guofenglinux@gmail.com> Reviewed-by: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/CAMbWs4-WhpCFMbXCjtJ%2BFzmjfPrp7Hw1pk4p%2BZpU95Kh3ofZ1A%40mail.gmail.com
1 parent 97d4262 commit 97d85be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+69
-69
lines changed

‎contrib/pageinspect/gistfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "storage/itemptr.h"
2222
#include "utils/array.h"
2323
#include "utils/builtins.h"
24-
#include "utils/pg_lsn.h"
2524
#include "utils/lsyscache.h"
25+
#include "utils/pg_lsn.h"
2626
#include "utils/rel.h"
2727
#include "utils/ruleutils.h"
2828
#include "utils/varlena.h"

‎contrib/postgres_fdw/deparse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include "catalog/pg_ts_dict.h"
4848
#include "catalog/pg_type.h"
4949
#include "commands/defrem.h"
50+
#include "commands/tablecmds.h"
5051
#include "nodes/makefuncs.h"
5152
#include "nodes/nodeFuncs.h"
5253
#include "nodes/plannodes.h"
@@ -60,7 +61,6 @@
6061
#include "utils/rel.h"
6162
#include "utils/syscache.h"
6263
#include "utils/typcache.h"
63-
#include "commands/tablecmds.h"
6464

6565
/*
6666
* Global context for foreign_expr_walker's search of an expression tree.

‎contrib/uuid-ossp/uuid-ossp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
#include "postgres.h"
1515

16-
#include "fmgr.h"
1716
#include "common/cryptohash.h"
1817
#include "common/sha1.h"
18+
#include "fmgr.h"
1919
#include "port/pg_bswap.h"
2020
#include "utils/builtins.h"
2121
#include "utils/uuid.h"

‎src/backend/access/brin/brin_bloom.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@
114114
*/
115115
#include "postgres.h"
116116

117-
#include "access/genam.h"
117+
#include <math.h>
118+
118119
#include "access/brin.h"
119120
#include "access/brin_internal.h"
120121
#include "access/brin_page.h"
121122
#include "access/brin_tuple.h"
123+
#include "access/genam.h"
122124
#include "access/htup_details.h"
123125
#include "access/reloptions.h"
124126
#include "catalog/pg_am.h"
125-
#include "catalog/pg_type.h"
126127
#include "catalog/pg_amop.h"
128+
#include "catalog/pg_type.h"
127129
#include "common/hashfn.h"
128130
#include "utils/fmgrprotos.h"
129131
#include "utils/rel.h"
130132

131-
#include <math.h>
132-
133133
#define BloomEqualStrategyNumber 1
134134

135135
/*

‎src/backend/access/brin/brin_minmax_multi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@
5959
/* needed for PGSQL_AF_INET */
6060
#include <sys/socket.h>
6161

62-
#include "access/genam.h"
6362
#include "access/brin.h"
6463
#include "access/brin_internal.h"
6564
#include "access/brin_tuple.h"
65+
#include "access/genam.h"
66+
#include "access/htup_details.h"
6667
#include "access/reloptions.h"
6768
#include "access/stratnum.h"
68-
#include "access/htup_details.h"
69-
#include "catalog/pg_type.h"
7069
#include "catalog/pg_am.h"
7170
#include "catalog/pg_amop.h"
71+
#include "catalog/pg_type.h"
7272
#include "utils/array.h"
7373
#include "utils/builtins.h"
7474
#include "utils/date.h"

‎src/backend/access/common/printsimple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#include "access/printsimple.h"
2222
#include "catalog/pg_type.h"
23-
#include "libpq/protocol.h"
2423
#include "libpq/pqformat.h"
24+
#include "libpq/protocol.h"
2525
#include "utils/builtins.h"
2626

2727
/*

‎src/backend/access/hash/hash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "commands/vacuum.h"
2828
#include "miscadmin.h"
2929
#include "nodes/execnodes.h"
30-
#include "pgstat.h"
3130
#include "optimizer/plancat.h"
31+
#include "pgstat.h"
3232
#include "utils/fmgrprotos.h"
3333
#include "utils/index_selfuncs.h"
3434
#include "utils/rel.h"

‎src/backend/access/heap/pruneheap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "miscadmin.h"
2424
#include "pgstat.h"
2525
#include "storage/bufmgr.h"
26-
#include "utils/snapmgr.h"
2726
#include "utils/rel.h"
27+
#include "utils/snapmgr.h"
2828

2929
/* Working data for heap_page_prune and subroutines */
3030
typedef struct

‎src/backend/access/spgist/spgtextproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
#include "postgres.h"
4141

4242
#include "access/spgist.h"
43-
#include "common/int.h"
4443
#include "catalog/pg_type.h"
44+
#include "common/int.h"
4545
#include "mb/pg_wchar.h"
4646
#include "utils/datum.h"
4747
#include "utils/fmgrprotos.h"

‎src/backend/access/transam/xlogarchive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include "common/percentrepl.h"
2727
#include "miscadmin.h"
2828
#include "pgstat.h"
29-
#include "postmaster/startup.h"
3029
#include "postmaster/pgarch.h"
30+
#include "postmaster/startup.h"
3131
#include "replication/walsender.h"
3232
#include "storage/fd.h"
3333
#include "storage/ipc.h"

‎src/backend/access/transam/xlogprefetcher.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
#include "catalog/pg_control.h"
3333
#include "catalog/storage_xlog.h"
3434
#include "commands/dbcommands_xlog.h"
35-
#include "utils/fmgrprotos.h"
36-
#include "utils/timestamp.h"
3735
#include "funcapi.h"
3836
#include "miscadmin.h"
3937
#include "port/atomics.h"
4038
#include "storage/bufmgr.h"
4139
#include "storage/shmem.h"
4240
#include "storage/smgr.h"
41+
#include "utils/fmgrprotos.h"
4342
#include "utils/guc_hooks.h"
4443
#include "utils/hsearch.h"
44+
#include "utils/timestamp.h"
4545

4646
/*
4747
* Every time we process this much WAL, we'll update the values in

‎src/backend/backup/basebackup_incremental.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include "backup/basebackup_incremental.h"
2424
#include "backup/walsummary.h"
2525
#include "common/blkreftable.h"
26-
#include "common/parse_manifest.h"
2726
#include "common/hashfn.h"
2827
#include "common/int.h"
28+
#include "common/parse_manifest.h"
2929
#include "datatype/timestamp.h"
3030
#include "postmaster/walsummarizer.h"
3131
#include "utils/timestamp.h"

‎src/backend/catalog/pg_publication.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "catalog/dependency.h"
2323
#include "catalog/indexing.h"
2424
#include "catalog/namespace.h"
25-
#include "catalog/partition.h"
2625
#include "catalog/objectaddress.h"
26+
#include "catalog/partition.h"
2727
#include "catalog/pg_inherits.h"
2828
#include "catalog/pg_namespace.h"
2929
#include "catalog/pg_publication.h"

‎src/backend/commands/statscmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "statistics/statistics.h"
3333
#include "utils/acl.h"
3434
#include "utils/builtins.h"
35-
#include "utils/lsyscache.h"
3635
#include "utils/inval.h"
36+
#include "utils/lsyscache.h"
3737
#include "utils/rel.h"
3838
#include "utils/syscache.h"
3939
#include "utils/typcache.h"

‎src/backend/commands/vacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "access/tableam.h"
3535
#include "access/transam.h"
3636
#include "access/xact.h"
37-
#include "catalog/namespace.h"
3837
#include "catalog/index.h"
38+
#include "catalog/namespace.h"
3939
#include "catalog/pg_database.h"
4040
#include "catalog/pg_inherits.h"
4141
#include "commands/cluster.h"

‎src/backend/optimizer/util/relnode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "optimizer/plancat.h"
3030
#include "optimizer/restrictinfo.h"
3131
#include "optimizer/tlist.h"
32-
#include "rewrite/rewriteManip.h"
3332
#include "parser/parse_relation.h"
33+
#include "rewrite/rewriteManip.h"
3434
#include "utils/hsearch.h"
3535
#include "utils/lsyscache.h"
3636

‎src/backend/parser/parse_merge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
#include "access/sysattr.h"
1919
#include "nodes/makefuncs.h"
2020
#include "parser/analyze.h"
21-
#include "parser/parse_collate.h"
22-
#include "parser/parsetree.h"
2321
#include "parser/parse_clause.h"
22+
#include "parser/parse_collate.h"
2423
#include "parser/parse_cte.h"
2524
#include "parser/parse_expr.h"
2625
#include "parser/parse_merge.h"
2726
#include "parser/parse_relation.h"
2827
#include "parser/parse_target.h"
28+
#include "parser/parsetree.h"
2929
#include "utils/rel.h"
3030

3131
static void setNamespaceForMergeWhen(ParseState *pstate,

‎src/backend/parser/parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include "postgres.h"
2323

24-
#include "mb/pg_wchar.h"
2524
#include "gramparse.h"
25+
#include "mb/pg_wchar.h"
2626
#include "parser/parser.h"
2727
#include "parser/scansup.h"
2828

‎src/backend/postmaster/walsummarizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
#include "replication/walreceiver.h"
3939
#include "storage/fd.h"
4040
#include "storage/ipc.h"
41-
#include "storage/lwlock.h"
4241
#include "storage/latch.h"
42+
#include "storage/lwlock.h"
4343
#include "storage/proc.h"
4444
#include "storage/procsignal.h"
4545
#include "storage/shmem.h"

‎src/backend/replication/logical/tablesync.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@
107107
#include "replication/logicallauncher.h"
108108
#include "replication/logicalrelation.h"
109109
#include "replication/logicalworker.h"
110+
#include "replication/origin.h"
111+
#include "replication/slot.h"
110112
#include "replication/walreceiver.h"
111113
#include "replication/worker_internal.h"
112-
#include "replication/slot.h"
113-
#include "replication/origin.h"
114114
#include "storage/ipc.h"
115115
#include "storage/lmgr.h"
116116
#include "utils/acl.h"

‎src/backend/rewrite/rewriteSearchCycle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "catalog/pg_operator_d.h"
1717
#include "catalog/pg_type_d.h"
1818
#include "nodes/makefuncs.h"
19-
#include "nodes/pg_list.h"
2019
#include "nodes/parsenodes.h"
20+
#include "nodes/pg_list.h"
2121
#include "nodes/primnodes.h"
2222
#include "parser/analyze.h"
2323
#include "parser/parsetree.h"

‎src/backend/statistics/extended_stats.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include "catalog/indexing.h"
2424
#include "catalog/pg_statistic_ext.h"
2525
#include "catalog/pg_statistic_ext_data.h"
26-
#include "executor/executor.h"
2726
#include "commands/defrem.h"
2827
#include "commands/progress.h"
28+
#include "executor/executor.h"
2929
#include "miscadmin.h"
3030
#include "nodes/nodeFuncs.h"
3131
#include "optimizer/optimizer.h"

‎src/backend/storage/ipc/procsignal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
#include <unistd.h>
1919

2020
#include "access/parallel.h"
21-
#include "port/pg_bitutils.h"
2221
#include "commands/async.h"
2322
#include "miscadmin.h"
2423
#include "pgstat.h"
24+
#include "port/pg_bitutils.h"
2525
#include "replication/logicalworker.h"
2626
#include "replication/walsender.h"
2727
#include "storage/condition_variable.h"
2828
#include "storage/ipc.h"
2929
#include "storage/latch.h"
3030
#include "storage/shmem.h"
31-
#include "storage/smgr.h"
3231
#include "storage/sinval.h"
32+
#include "storage/smgr.h"
3333
#include "tcop/tcopprot.h"
3434
#include "utils/memutils.h"
3535

‎src/backend/storage/sync/sync.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <fcntl.h>
1919
#include <sys/file.h>
2020

21-
#include "access/commit_ts.h"
2221
#include "access/clog.h"
22+
#include "access/commit_ts.h"
2323
#include "access/multixact.h"
2424
#include "access/xlog.h"
2525
#include "miscadmin.h"

‎src/backend/utils/activity/pgstat_database.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
#include "postgres.h"
1919

20+
#include "storage/procsignal.h"
2021
#include "utils/pgstat_internal.h"
2122
#include "utils/timestamp.h"
22-
#include "storage/procsignal.h"
2323

2424

2525
static bool pgstat_should_report_connstat(void);

‎src/backend/utils/activity/pgstat_relation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
#include "access/twophase_rmgr.h"
2121
#include "access/xact.h"
22+
#include "catalog/catalog.h"
2223
#include "postmaster/autovacuum.h"
2324
#include "utils/memutils.h"
2425
#include "utils/pgstat_internal.h"
2526
#include "utils/rel.h"
2627
#include "utils/timestamp.h"
27-
#include "catalog/catalog.h"
2828

2929

3030
/* Record that's written to 2PC state file when pgstat state is persisted */

‎src/backend/utils/activity/pgstat_wal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "postgres.h"
1919

20-
#include "utils/pgstat_internal.h"
2120
#include "executor/instrument.h"
21+
#include "utils/pgstat_internal.h"
2222

2323

2424
PgStat_PendingWalStats PendingWalStats = {0};

‎src/backend/utils/adt/array_userfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#include "postgres.h"
1414

1515
#include "catalog/pg_type.h"
16-
#include "libpq/pqformat.h"
1716
#include "common/int.h"
1817
#include "common/pg_prng.h"
18+
#include "libpq/pqformat.h"
1919
#include "port/pg_bitutils.h"
2020
#include "utils/array.h"
21-
#include "utils/datum.h"
2221
#include "utils/builtins.h"
22+
#include "utils/datum.h"
2323
#include "utils/lsyscache.h"
2424
#include "utils/typcache.h"
2525

‎src/backend/utils/adt/jsonbsubs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "nodes/subscripting.h"
2020
#include "parser/parse_coerce.h"
2121
#include "parser/parse_expr.h"
22-
#include "utils/jsonb.h"
2322
#include "utils/builtins.h"
23+
#include "utils/jsonb.h"
2424

2525

2626
/* SubscriptingRefState.workspace for jsonb subscripting execution */

‎src/backend/utils/adt/jsonpath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565

6666
#include "lib/stringinfo.h"
6767
#include "libpq/pqformat.h"
68-
#include "nodes/miscnodes.h"
6968
#include "miscadmin.h"
69+
#include "nodes/miscnodes.h"
7070
#include "utils/fmgrprotos.h"
7171
#include "utils/json.h"
7272
#include "utils/jsonpath.h"

‎src/backend/utils/adt/multirangetypes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
#include "libpq/pqformat.h"
4040
#include "nodes/nodes.h"
4141
#include "port/pg_bitutils.h"
42+
#include "utils/array.h"
4243
#include "utils/builtins.h"
4344
#include "utils/lsyscache.h"
44-
#include "utils/rangetypes.h"
4545
#include "utils/multirangetypes.h"
46-
#include "utils/array.h"
46+
#include "utils/rangetypes.h"
4747

4848
/* fn_extra cache entry for one of the range I/O functions */
4949
typedef struct MultirangeIOData

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy