Skip to content

Commit 14aec03

Browse files
author
Amit Kapila
committed
Make the order of the header file includes consistent in backend modules.
Similar to commits 7e73503 and dddf4cd, this commit makes the order of header file inclusion consistent for backend modules. In the passing, removed a couple of duplicate inclusions. Author: Vignesh C Reviewed-by: Kuntal Ghosh and Amit Kapila Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
1 parent b6423e9 commit 14aec03

File tree

166 files changed

+281
-465
lines changed

Some content is hidden

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

166 files changed

+281
-465
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
*/
1111
#include "postgres.h"
1212

13-
#include "access/genam.h"
1413
#include "access/brin_internal.h"
1514
#include "access/brin_tuple.h"
15+
#include "access/genam.h"
1616
#include "access/stratnum.h"
17-
#include "catalog/pg_type.h"
1817
#include "catalog/pg_amop.h"
18+
#include "catalog/pg_type.h"
1919
#include "utils/builtins.h"
2020
#include "utils/datum.h"
2121
#include "utils/lsyscache.h"
2222
#include "utils/rel.h"
2323
#include "utils/syscache.h"
2424

25-
2625
typedef struct MinmaxOpaque
2726
{
2827
Oid cached_subtype;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
#include "postgres.h"
1212

13-
#include "access/brin_pageops.h"
1413
#include "access/brin_page.h"
14+
#include "access/brin_pageops.h"
1515
#include "access/brin_revmap.h"
1616
#include "access/brin_xlog.h"
1717
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
2222
#include "storage/smgr.h"
2323
#include "utils/rel.h"
2424

25-
2625
/*
2726
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
2827
* a single item per page, unlike other index AMs.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@
3131
*/
3232
#include "postgres.h"
3333

34-
#include "access/htup_details.h"
3534
#include "access/brin_tuple.h"
35+
#include "access/htup_details.h"
3636
#include "access/tupdesc.h"
3737
#include "access/tupmacs.h"
3838
#include "utils/datum.h"
3939
#include "utils/memutils.h"
4040

41-
4241
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
4342
char *tp, bits8 *nullbits, bool nulls,
4443
Datum *values, bool *allnulls, bool *hasnulls);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
#include "catalog/pg_opfamily.h"
2323
#include "catalog/pg_type.h"
2424
#include "utils/builtins.h"
25-
#include "utils/syscache.h"
2625
#include "utils/regproc.h"
27-
26+
#include "utils/syscache.h"
2827

2928
/*
3029
* Validator for a BRIN opclass.

‎src/backend/access/gin/ginbtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "access/gin_private.h"
1818
#include "access/ginxlog.h"
1919
#include "access/xloginsert.h"
20-
#include "storage/predicate.h"
2120
#include "miscadmin.h"
21+
#include "storage/predicate.h"
2222
#include "utils/memutils.h"
2323
#include "utils/rel.h"
2424

‎src/backend/access/gin/ginfast.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020

2121
#include "access/gin_private.h"
2222
#include "access/ginxlog.h"
23-
#include "access/xloginsert.h"
2423
#include "access/xlog.h"
25-
#include "commands/vacuum.h"
24+
#include "access/xloginsert.h"
2625
#include "catalog/pg_am.h"
26+
#include "commands/vacuum.h"
2727
#include "miscadmin.h"
28-
#include "utils/memutils.h"
29-
#include "utils/rel.h"
30-
#include "utils/acl.h"
3128
#include "postmaster/autovacuum.h"
3229
#include "storage/indexfsm.h"
3330
#include "storage/lmgr.h"
3431
#include "storage/predicate.h"
32+
#include "utils/acl.h"
3533
#include "utils/builtins.h"
34+
#include "utils/memutils.h"
35+
#include "utils/rel.h"
3636

3737
/* GUC parameter */
3838
int gin_pending_list_limit = 0;

‎src/backend/access/gin/gininsert.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@
1616

1717
#include "access/gin_private.h"
1818
#include "access/ginxlog.h"
19-
#include "access/xloginsert.h"
2019
#include "access/tableam.h"
20+
#include "access/xloginsert.h"
2121
#include "catalog/index.h"
2222
#include "miscadmin.h"
2323
#include "storage/bufmgr.h"
24-
#include "storage/smgr.h"
2524
#include "storage/indexfsm.h"
2625
#include "storage/predicate.h"
26+
#include "storage/smgr.h"
2727
#include "utils/memutils.h"
2828
#include "utils/rel.h"
2929

30-
3130
typedef struct
3231
{
3332
GinState ginstate;

‎src/backend/access/gin/ginvalidate.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
#include "catalog/pg_type.h"
2424
#include "utils/builtins.h"
2525
#include "utils/lsyscache.h"
26-
#include "utils/syscache.h"
2726
#include "utils/regproc.h"
28-
27+
#include "utils/syscache.h"
2928

3029
/*
3130
* Validator for a GIN opclass.

‎src/backend/access/gist/gist.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
#include "access/gistscan.h"
1919
#include "catalog/pg_collation.h"
2020
#include "miscadmin.h"
21+
#include "nodes/execnodes.h"
2122
#include "storage/lmgr.h"
2223
#include "storage/predicate.h"
23-
#include "nodes/execnodes.h"
2424
#include "utils/builtins.h"
2525
#include "utils/index_selfuncs.h"
2626
#include "utils/memutils.h"
2727
#include "utils/rel.h"
2828

29-
3029
/* non-export function prototypes */
3130
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
3231
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,

‎src/backend/access/gist/gistget.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include "access/genam.h"
1818
#include "access/gist_private.h"
1919
#include "access/relscan.h"
20+
#include "lib/pairingheap.h"
2021
#include "miscadmin.h"
22+
#include "pgstat.h"
2123
#include "storage/lmgr.h"
2224
#include "storage/predicate.h"
23-
#include "pgstat.h"
24-
#include "lib/pairingheap.h"
2525
#include "utils/float.h"
2626
#include "utils/memutils.h"
2727
#include "utils/rel.h"

‎src/backend/access/gist/gistutil.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
#include "storage/indexfsm.h"
2323
#include "storage/lmgr.h"
2424
#include "utils/float.h"
25-
#include "utils/syscache.h"
26-
#include "utils/snapmgr.h"
2725
#include "utils/lsyscache.h"
28-
26+
#include "utils/snapmgr.h"
27+
#include "utils/syscache.h"
2928

3029
/*
3130
* Write itup vector to page, has no control of free space.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include "utils/builtins.h"
3232
#include "utils/index_selfuncs.h"
3333
#include "utils/rel.h"
34-
#include "miscadmin.h"
35-
3634

3735
/* Working state for hashbuild and its callback */
3836
typedef struct

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include "access/bufmask.h"
1818
#include "access/hash.h"
1919
#include "access/hash_xlog.h"
20-
#include "access/xlogutils.h"
21-
#include "access/xlog.h"
2220
#include "access/transam.h"
23-
#include "storage/procarray.h"
21+
#include "access/xlog.h"
22+
#include "access/xlogutils.h"
2423
#include "miscadmin.h"
24+
#include "storage/procarray.h"
2525

2626
/*
2727
* replay a hash index meta page

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include "access/hash.h"
1919
#include "access/hash_xlog.h"
2020
#include "miscadmin.h"
21-
#include "utils/rel.h"
22-
#include "storage/lwlock.h"
2321
#include "storage/buf_internals.h"
22+
#include "storage/lwlock.h"
2423
#include "storage/predicate.h"
24+
#include "utils/rel.h"
2525

2626
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
2727
Buffer metabuf, Buffer buf);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
#include "access/hash_xlog.h"
3333
#include "miscadmin.h"
3434
#include "storage/lmgr.h"
35-
#include "storage/smgr.h"
3635
#include "storage/predicate.h"
37-
36+
#include "storage/smgr.h"
3837

3938
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
4039
uint32 nblocks);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "access/relscan.h"
1919
#include "miscadmin.h"
2020
#include "pgstat.h"
21-
#include "utils/rel.h"
2221
#include "storage/predicate.h"
22+
#include "utils/rel.h"
2323

2424
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
2525
ScanDirection dir);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "access/hash.h"
1818
#include "access/reloptions.h"
1919
#include "access/relscan.h"
20+
#include "storage/buf_internals.h"
2021
#include "utils/lsyscache.h"
2122
#include "utils/rel.h"
22-
#include "storage/buf_internals.h"
2323

2424
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
2525
old_bucket | (lowmask + 1)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
#include "postgres.h"
2121

22-
#include "miscadmin.h"
23-
2422
#include "access/genam.h"
2523
#include "access/heapam.h"
2624
#include "access/heaptoast.h"
@@ -35,18 +33,17 @@
3533
#include "catalog/storage_xlog.h"
3634
#include "commands/progress.h"
3735
#include "executor/executor.h"
36+
#include "miscadmin.h"
3837
#include "pgstat.h"
3938
#include "storage/bufmgr.h"
4039
#include "storage/bufpage.h"
41-
#include "storage/bufmgr.h"
4240
#include "storage/lmgr.h"
4341
#include "storage/predicate.h"
4442
#include "storage/procarray.h"
4543
#include "storage/smgr.h"
4644
#include "utils/builtins.h"
4745
#include "utils/rel.h"
4846

49-
5047
static void reform_and_rewrite_tuple(HeapTuple tuple,
5148
Relation OldHeap, Relation NewHeap,
5249
Datum *values, bool *isnull, RewriteState rwstate);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
#include "access/heapam.h"
1818
#include "access/heapam_xlog.h"
19-
#include "access/transam.h"
2019
#include "access/htup_details.h"
20+
#include "access/transam.h"
2121
#include "access/xlog.h"
2222
#include "catalog/catalog.h"
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/heap/rewriteheap.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,34 +105,26 @@
105105
#include <sys/stat.h>
106106
#include <unistd.h>
107107

108-
#include "miscadmin.h"
109-
110108
#include "access/heapam.h"
111109
#include "access/heapam_xlog.h"
112110
#include "access/heaptoast.h"
113111
#include "access/rewriteheap.h"
114112
#include "access/transam.h"
115113
#include "access/xact.h"
116114
#include "access/xloginsert.h"
117-
118115
#include "catalog/catalog.h"
119-
120116
#include "lib/ilist.h"
121-
117+
#include "miscadmin.h"
122118
#include "pgstat.h"
123-
124119
#include "replication/logical.h"
125120
#include "replication/slot.h"
126-
127121
#include "storage/bufmgr.h"
128122
#include "storage/fd.h"
123+
#include "storage/procarray.h"
129124
#include "storage/smgr.h"
130-
131125
#include "utils/memutils.h"
132126
#include "utils/rel.h"
133127

134-
#include "storage/procarray.h"
135-
136128
/*
137129
* State associated with a rewrite operation. This is opaque to the user
138130
* of the rewrite facility.

‎src/backend/access/nbtree/nbtxlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "access/transam.h"
2121
#include "access/xlog.h"
2222
#include "access/xlogutils.h"
23-
#include "storage/procarray.h"
2423
#include "miscadmin.h"
24+
#include "storage/procarray.h"
2525

2626
/*
2727
* _bt_restore_page -- re-enter all the index tuples on a page

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
#include "postgres.h"
1717

1818
#include "access/spgist.h"
19-
#include "access/stratnum.h"
2019
#include "access/spgist_private.h"
20+
#include "access/stratnum.h"
2121
#include "catalog/pg_type.h"
2222
#include "utils/builtins.h"
2323
#include "utils/float.h"
2424
#include "utils/geo_decls.h"
2525

26-
2726
Datum
2827
spg_quad_config(PG_FUNCTION_ARGS)
2928
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include "access/xloginsert.h"
4040
#include "access/xlogutils.h"
4141
#include "miscadmin.h"
42-
#include "pgstat.h"
4342
#include "pg_trace.h"
43+
#include "pgstat.h"
4444
#include "storage/proc.h"
4545

4646
/*

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include "access/session.h"
2020
#include "access/xact.h"
2121
#include "access/xlog.h"
22-
#include "catalog/pg_enum.h"
2322
#include "catalog/index.h"
2423
#include "catalog/namespace.h"
24+
#include "catalog/pg_enum.h"
2525
#include "commands/async.h"
2626
#include "executor/execParallel.h"
2727
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
4343
#include "utils/snapmgr.h"
4444
#include "utils/typcache.h"
4545

46-
4746
/*
4847
* We don't want to waste a lot of memory on an error queue which, most of
4948
* the time, will process only a handful of small messages. However, it is

0 commit comments

Comments
 (0)