Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit dbbca2c

Browse files
committed
Remove unused #include's from backend .c files
as determined by include-what-you-use (IWYU) While IWYU also suggests to *add* a bunch of #include's (which is its main purpose), this patch does not do that. In some cases, a more specific #include replaces another less specific one. Some manual adjustments of the automatic result: - IWYU currently doesn't know about includes that provide global variable declarations (like -Wmissing-variable-declarations), so those includes are being kept manually. - All includes for port(ability) headers are being kept for now, to play it safe. - No changes of catalog/pg_foo.h to catalog/pg_foo_d.h, to keep the patch from exploding in size. Note that this patch touches just *.c files, so nothing declared in header files changes in hidden ways. As a small example, in src/backend/access/transam/rmgr.c, some IWYU pragma annotations are added to handle a special case there. Discussion: https://www.postgresql.org/message-id/flat/af837490-6b2f-46df-ba05-37ea6a6653fc%40eisentraut.org
1 parent 24eebc6 commit dbbca2c

File tree

425 files changed

+230
-994
lines changed

Some content is hidden

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

425 files changed

+230
-994
lines changed

src/backend/access/brin/brin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "storage/freespace.h"
3636
#include "tcop/tcopprot.h" /* pgrminclude ignore */
3737
#include "utils/acl.h"
38-
#include "utils/builtins.h"
3938
#include "utils/datum.h"
39+
#include "utils/fmgrprotos.h"
4040
#include "utils/guc.h"
4141
#include "utils/index_selfuncs.h"
4242
#include "utils/memutils.h"

src/backend/access/brin/brin_bloom.c

+3-6
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,14 @@
119119
#include "access/brin_internal.h"
120120
#include "access/brin_page.h"
121121
#include "access/brin_tuple.h"
122-
#include "access/hash.h"
123122
#include "access/htup_details.h"
124123
#include "access/reloptions.h"
125-
#include "access/stratnum.h"
124+
#include "catalog/pg_am.h"
126125
#include "catalog/pg_type.h"
127126
#include "catalog/pg_amop.h"
128-
#include "utils/builtins.h"
129-
#include "utils/datum.h"
130-
#include "utils/lsyscache.h"
127+
#include "common/hashfn.h"
128+
#include "utils/fmgrprotos.h"
131129
#include "utils/rel.h"
132-
#include "utils/syscache.h"
133130

134131
#include <math.h>
135132

src/backend/access/brin/brin_inclusion.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "access/skey.h"
3131
#include "catalog/pg_amop.h"
3232
#include "catalog/pg_type.h"
33-
#include "utils/builtins.h"
3433
#include "utils/datum.h"
34+
#include "utils/fmgrprotos.h"
3535
#include "utils/lsyscache.h"
3636
#include "utils/rel.h"
3737
#include "utils/syscache.h"

src/backend/access/brin/brin_minmax.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212

1313
#include "access/brin_internal.h"
1414
#include "access/brin_tuple.h"
15-
#include "access/genam.h"
1615
#include "access/stratnum.h"
1716
#include "catalog/pg_amop.h"
18-
#include "catalog/pg_type.h"
19-
#include "utils/builtins.h"
2017
#include "utils/datum.h"
18+
#include "utils/fmgrprotos.h"
2119
#include "utils/lsyscache.h"
2220
#include "utils/rel.h"
2321
#include "utils/syscache.h"

src/backend/access/brin/brin_minmax_multi.c

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
#include "utils/inet.h"
7878
#include "utils/lsyscache.h"
7979
#include "utils/memutils.h"
80-
#include "utils/numeric.h"
8180
#include "utils/pg_lsn.h"
8281
#include "utils/rel.h"
8382
#include "utils/syscache.h"

src/backend/access/brin/brin_pageops.c

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "storage/bufmgr.h"
2020
#include "storage/freespace.h"
2121
#include "storage/lmgr.h"
22-
#include "storage/smgr.h"
2322
#include "utils/rel.h"
2423

2524
/*

src/backend/access/brin/brin_revmap.c

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "access/xloginsert.h"
3030
#include "miscadmin.h"
3131
#include "storage/bufmgr.h"
32-
#include "storage/lmgr.h"
3332
#include "utils/rel.h"
3433

3534

src/backend/access/common/attmap.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "postgres.h"
2424

2525
#include "access/attmap.h"
26-
#include "access/htup_details.h"
2726
#include "utils/builtins.h"
2827

2928

src/backend/access/common/heaptuple.c

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
#include "access/sysattr.h"
6262
#include "access/tupdesc_details.h"
6363
#include "common/hashfn.h"
64-
#include "executor/tuptable.h"
6564
#include "utils/datum.h"
6665
#include "utils/expandeddatum.h"
6766
#include "utils/hsearch.h"

src/backend/access/common/printtup.c

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "postgres.h"
1717

1818
#include "access/printtup.h"
19-
#include "libpq/libpq.h"
2019
#include "libpq/pqformat.h"
2120
#include "tcop/pquery.h"
2221
#include "utils/lsyscache.h"

src/backend/access/common/relation.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "access/relation.h"
2424
#include "access/xact.h"
2525
#include "catalog/namespace.h"
26-
#include "miscadmin.h"
2726
#include "pgstat.h"
2827
#include "storage/lmgr.h"
2928
#include "utils/inval.h"

src/backend/access/common/reloptions.c

-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
#include "catalog/pg_type.h"
2828
#include "commands/defrem.h"
2929
#include "commands/tablespace.h"
30-
#include "commands/view.h"
3130
#include "nodes/makefuncs.h"
32-
#include "postmaster/postmaster.h"
3331
#include "utils/array.h"
3432
#include "utils/attoptcache.h"
3533
#include "utils/builtins.h"

src/backend/access/common/toast_compression.c

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include "access/detoast.h"
2121
#include "access/toast_compression.h"
2222
#include "common/pg_lzcompress.h"
23-
#include "fmgr.h"
24-
#include "utils/builtins.h"
2523
#include "varatt.h"
2624

2725
/* GUC */

src/backend/access/common/toast_internals.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "access/toast_internals.h"
2222
#include "access/xact.h"
2323
#include "catalog/catalog.h"
24-
#include "common/pg_lzcompress.h"
2524
#include "miscadmin.h"
2625
#include "utils/fmgroids.h"
2726
#include "utils/rel.h"

src/backend/access/gin/ginarrayproc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "access/gin.h"
1717
#include "access/stratnum.h"
1818
#include "utils/array.h"
19-
#include "utils/builtins.h"
19+
#include "utils/fmgrprotos.h"
2020
#include "utils/lsyscache.h"
2121

2222

src/backend/access/gin/ginentrypage.c

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "access/gin_private.h"
1818
#include "access/ginxlog.h"
1919
#include "access/xloginsert.h"
20-
#include "miscadmin.h"
2120
#include "utils/rel.h"
2221

2322
static void entrySplitPage(GinBtree btree, Buffer origbuf,

src/backend/access/gin/ginfast.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "storage/lmgr.h"
3232
#include "storage/predicate.h"
3333
#include "utils/acl.h"
34-
#include "utils/builtins.h"
34+
#include "utils/fmgrprotos.h"
3535
#include "utils/memutils.h"
3636
#include "utils/rel.h"
3737

src/backend/access/gin/gininsert.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
#include "postgres.h"
1616

1717
#include "access/gin_private.h"
18-
#include "access/ginxlog.h"
1918
#include "access/tableam.h"
2019
#include "access/xloginsert.h"
21-
#include "catalog/index.h"
2220
#include "miscadmin.h"
21+
#include "nodes/execnodes.h"
2322
#include "storage/bufmgr.h"
24-
#include "storage/indexfsm.h"
2523
#include "storage/predicate.h"
26-
#include "storage/smgr.h"
2724
#include "utils/memutils.h"
2825
#include "utils/rel.h"
2926

src/backend/access/gin/ginlogic.c

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
#include "postgres.h"
3636

3737
#include "access/gin_private.h"
38-
#include "access/reloptions.h"
39-
#include "catalog/pg_collation.h"
40-
#include "catalog/pg_type.h"
41-
#include "miscadmin.h"
42-
#include "storage/indexfsm.h"
43-
#include "storage/lmgr.h"
4438

4539

4640
/*

src/backend/access/gin/ginutil.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
#include "commands/vacuum.h"
2424
#include "miscadmin.h"
2525
#include "storage/indexfsm.h"
26-
#include "storage/lmgr.h"
27-
#include "storage/predicate.h"
2826
#include "utils/builtins.h"
2927
#include "utils/index_selfuncs.h"
28+
#include "utils/rel.h"
3029
#include "utils/typcache.h"
3130

3231

src/backend/access/gin/ginvalidate.c

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "catalog/pg_opclass.h"
2222
#include "catalog/pg_opfamily.h"
2323
#include "catalog/pg_type.h"
24-
#include "utils/builtins.h"
25-
#include "utils/lsyscache.h"
2624
#include "utils/regproc.h"
2725
#include "utils/syscache.h"
2826

src/backend/access/gist/gist.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
#include "commands/vacuum.h"
2222
#include "miscadmin.h"
2323
#include "nodes/execnodes.h"
24-
#include "storage/lmgr.h"
2524
#include "storage/predicate.h"
26-
#include "utils/builtins.h"
25+
#include "utils/fmgrprotos.h"
2726
#include "utils/index_selfuncs.h"
2827
#include "utils/memutils.h"
2928
#include "utils/rel.h"

src/backend/access/gist/gistbuild.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@
3636

3737
#include "access/genam.h"
3838
#include "access/gist_private.h"
39-
#include "access/gistxlog.h"
4039
#include "access/tableam.h"
4140
#include "access/xloginsert.h"
42-
#include "catalog/index.h"
4341
#include "miscadmin.h"
42+
#include "nodes/execnodes.h"
4443
#include "optimizer/optimizer.h"
4544
#include "storage/bufmgr.h"
4645
#include "storage/bulk_write.h"

src/backend/access/gist/gistbuildbuffers.c

-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
*/
1515
#include "postgres.h"
1616

17-
#include "access/genam.h"
1817
#include "access/gist_private.h"
19-
#include "catalog/index.h"
20-
#include "miscadmin.h"
2118
#include "storage/buffile.h"
2219
#include "storage/bufmgr.h"
23-
#include "utils/memutils.h"
2420
#include "utils/rel.h"
2521

2622
static GISTNodeBufferPage *gistAllocateNewPageBuffer(GISTBuildBuffers *gfbb);

src/backend/access/gist/gistget.c

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "lib/pairingheap.h"
2121
#include "miscadmin.h"
2222
#include "pgstat.h"
23-
#include "storage/lmgr.h"
2423
#include "storage/predicate.h"
2524
#include "utils/float.h"
2625
#include "utils/memutils.h"

src/backend/access/gist/gistproc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include "access/gist.h"
2323
#include "access/stratnum.h"
24-
#include "utils/builtins.h"
2524
#include "utils/float.h"
25+
#include "utils/fmgrprotos.h"
2626
#include "utils/geo_decls.h"
2727
#include "utils/sortsupport.h"
2828

src/backend/access/gist/gistutil.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818
#include "access/gist_private.h"
1919
#include "access/htup_details.h"
2020
#include "access/reloptions.h"
21-
#include "catalog/pg_opclass.h"
2221
#include "common/pg_prng.h"
2322
#include "storage/indexfsm.h"
24-
#include "storage/lmgr.h"
2523
#include "utils/float.h"
2624
#include "utils/fmgrprotos.h"
2725
#include "utils/lsyscache.h"
26+
#include "utils/rel.h"
2827
#include "utils/snapmgr.h"
2928
#include "utils/syscache.h"
3029

src/backend/access/gist/gistvalidate.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "catalog/pg_opclass.h"
2222
#include "catalog/pg_opfamily.h"
2323
#include "catalog/pg_type.h"
24-
#include "utils/builtins.h"
2524
#include "utils/lsyscache.h"
2625
#include "utils/regproc.h"
2726
#include "utils/syscache.h"

src/backend/access/gist/gistxlog.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
#include "access/bufmask.h"
1717
#include "access/gist_private.h"
1818
#include "access/gistxlog.h"
19-
#include "access/heapam_xlog.h"
2019
#include "access/transam.h"
2120
#include "access/xloginsert.h"
2221
#include "access/xlogutils.h"
23-
#include "miscadmin.h"
24-
#include "storage/procarray.h"
22+
#include "storage/standby.h"
2523
#include "utils/memutils.h"
2624
#include "utils/rel.h"
2725

src/backend/access/hash/hash.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include "access/relscan.h"
2424
#include "access/tableam.h"
2525
#include "access/xloginsert.h"
26-
#include "catalog/index.h"
2726
#include "commands/progress.h"
2827
#include "commands/vacuum.h"
2928
#include "miscadmin.h"
30-
#include "optimizer/plancat.h"
29+
#include "nodes/execnodes.h"
3130
#include "pgstat.h"
32-
#include "utils/builtins.h"
31+
#include "optimizer/plancat.h"
32+
#include "utils/fmgrprotos.h"
3333
#include "utils/index_selfuncs.h"
3434
#include "utils/rel.h"
3535

src/backend/access/hash/hash_xlog.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
#include "access/bufmask.h"
1818
#include "access/hash.h"
1919
#include "access/hash_xlog.h"
20-
#include "access/transam.h"
21-
#include "access/xlog.h"
2220
#include "access/xlogutils.h"
23-
#include "miscadmin.h"
24-
#include "storage/procarray.h"
21+
#include "storage/standby.h"
2522

2623
/*
2724
* replay a hash index meta page

src/backend/access/hash/hashfunc.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@
2626

2727
#include "postgres.h"
2828

29-
#include "access/hash.h"
30-
#include "catalog/pg_collation.h"
3129
#include "common/hashfn.h"
32-
#include "utils/builtins.h"
3330
#include "utils/float.h"
31+
#include "utils/fmgrprotos.h"
3432
#include "utils/pg_locale.h"
3533
#include "varatt.h"
3634

src/backend/access/hash/hashinsert.c

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include "access/hash_xlog.h"
2020
#include "access/xloginsert.h"
2121
#include "miscadmin.h"
22-
#include "storage/buf_internals.h"
23-
#include "storage/lwlock.h"
2422
#include "storage/predicate.h"
2523
#include "utils/rel.h"
2624

src/backend/access/hash/hashpage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#include "access/xloginsert.h"
3434
#include "miscadmin.h"
3535
#include "port/pg_bitutils.h"
36-
#include "storage/lmgr.h"
3736
#include "storage/predicate.h"
3837
#include "storage/smgr.h"
38+
#include "utils/rel.h"
3939

4040
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
4141
uint32 nblocks);

src/backend/access/hash/hashutil.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "access/reloptions.h"
1919
#include "access/relscan.h"
2020
#include "port/pg_bitutils.h"
21-
#include "storage/buf_internals.h"
2221
#include "utils/lsyscache.h"
2322
#include "utils/rel.h"
2423

src/backend/access/heap/heapam.c

-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "postgres.h"
3333

3434
#include "access/bufmask.h"
35-
#include "access/genam.h"
3635
#include "access/heapam.h"
3736
#include "access/heapam_xlog.h"
3837
#include "access/heaptoast.h"
@@ -62,12 +61,9 @@
6261
#include "storage/lmgr.h"
6362
#include "storage/predicate.h"
6463
#include "storage/procarray.h"
65-
#include "storage/smgr.h"
66-
#include "storage/spin.h"
6764
#include "storage/standby.h"
6865
#include "utils/datum.h"
6966
#include "utils/inval.h"
70-
#include "utils/lsyscache.h"
7167
#include "utils/relcache.h"
7268
#include "utils/snapmgr.h"
7369
#include "utils/spccache.h"

0 commit comments

Comments
 (0)