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

Commit 111944c

Browse files
anarazelanarazel
committed
Replace heapam.h includes with {table, relation}.h where applicable.
A lot of files only included heapam.h for relation_open, heap_open etc - replace the heapam.h include in those files with the narrower header. Author: Andres Freund Discussion: https://postgr.es/m/20190111000539.xbv7s6w7ilcvm7dp@alap3.anarazel.de
1 parent 4b21acf commit 111944c

Some content is hidden

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

97 files changed

+116
-99
lines changed

‎contrib/dblink/dblink.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
3737
#include "libpq-fe.h"
3838

3939
#include "access/htup_details.h"
40+
#include "access/relation.h"
4041
#include "access/reloptions.h"
41-
#include "access/heapam.h"
42+
#include "access/table.h"
4243
#include "catalog/indexing.h"
4344
#include "catalog/namespace.h"
4445
#include "catalog/pg_foreign_data_wrapper.h"

‎contrib/file_fdw/file_fdw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "access/htup_details.h"
1919
#include "access/reloptions.h"
2020
#include "access/sysattr.h"
21-
#include "access/heapam.h"
21+
#include "access/table.h"
2222
#include "catalog/pg_authid.h"
2323
#include "catalog/pg_foreign_table.h"
2424
#include "commands/copy.h"

‎contrib/pageinspect/btreefuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "pageinspect.h"
3131

3232
#include "access/nbtree.h"
33-
#include "access/heapam.h"
33+
#include "access/relation.h"
3434
#include "catalog/namespace.h"
3535
#include "catalog/pg_am.h"
3636
#include "funcapi.h"

‎contrib/pageinspect/heapfuncs.c

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

2828
#include "pageinspect.h"
2929

30-
#include "access/heapam.h"
3130
#include "access/htup_details.h"
31+
#include "access/relation.h"
3232
#include "funcapi.h"
3333
#include "catalog/pg_type.h"
3434
#include "miscadmin.h"

‎contrib/pageinspect/rawpage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "pageinspect.h"
1919

2020
#include "access/htup_details.h"
21-
#include "access/heapam.h"
21+
#include "access/relation.h"
2222
#include "catalog/namespace.h"
2323
#include "catalog/pg_type.h"
2424
#include "funcapi.h"

‎contrib/pg_freespacemap/pg_freespacemap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
#include "postgres.h"
1010

11-
#include "access/heapam.h"
11+
#include "access/relation.h"
1212
#include "funcapi.h"
1313
#include "storage/freespace.h"
1414

‎contrib/pg_prewarm/autoprewarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <unistd.h>
3030

31-
#include "access/heapam.h"
31+
#include "access/relation.h"
3232
#include "access/xact.h"
3333
#include "catalog/pg_class.h"
3434
#include "catalog/pg_type.h"

‎contrib/pg_prewarm/pg_prewarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <sys/stat.h>
1616
#include <unistd.h>
1717

18-
#include "access/heapam.h"
18+
#include "access/relation.h"
1919
#include "fmgr.h"
2020
#include "miscadmin.h"
2121
#include "storage/bufmgr.h"

‎contrib/pgstattuple/pgstatapprox.c

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

15-
#include "access/visibilitymap.h"
16-
#include "access/heapam.h"
15+
#include "access/relation.h"
1716
#include "access/transam.h"
17+
#include "access/visibilitymap.h"
1818
#include "access/xact.h"
1919
#include "access/multixact.h"
2020
#include "access/htup_details.h"

‎contrib/pgstattuple/pgstatindex.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
#include "postgres.h"
2929

3030
#include "access/gin_private.h"
31-
#include "access/heapam.h"
3231
#include "access/hash.h"
3332
#include "access/htup_details.h"
3433
#include "access/nbtree.h"
34+
#include "access/relation.h"
35+
#include "access/table.h"
3536
#include "catalog/namespace.h"
3637
#include "catalog/pg_am.h"
3738
#include "funcapi.h"

‎contrib/postgres_fdw/deparse.c

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

3636
#include "postgres_fdw.h"
3737

38-
#include "access/heapam.h"
3938
#include "access/htup_details.h"
4039
#include "access/sysattr.h"
40+
#include "access/table.h"
4141
#include "catalog/pg_aggregate.h"
4242
#include "catalog/pg_collation.h"
4343
#include "catalog/pg_namespace.h"

‎contrib/postgres_fdw/postgres_fdw.c

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

1515
#include "postgres_fdw.h"
1616

17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
1918
#include "access/sysattr.h"
19+
#include "access/table.h"
2020
#include "catalog/pg_class.h"
2121
#include "commands/defrem.h"
2222
#include "commands/explain.h"

‎contrib/sepgsql/database.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "postgres.h"
1212

1313
#include "access/genam.h"
14-
#include "access/heapam.h"
1514
#include "access/htup_details.h"
1615
#include "access/sysattr.h"
16+
#include "access/table.h"
1717
#include "catalog/dependency.h"
1818
#include "catalog/pg_database.h"
1919
#include "catalog/indexing.h"

‎contrib/sepgsql/label.c

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

1313
#include <selinux/label.h>
1414

15-
#include "access/heapam.h"
1615
#include "access/htup_details.h"
1716
#include "access/genam.h"
17+
#include "access/table.h"
1818
#include "access/xact.h"
1919
#include "catalog/catalog.h"
2020
#include "catalog/dependency.h"

‎contrib/sepgsql/proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "postgres.h"
1212

1313
#include "access/genam.h"
14-
#include "access/heapam.h"
1514
#include "access/htup_details.h"
1615
#include "access/sysattr.h"
16+
#include "access/table.h"
1717
#include "catalog/dependency.h"
1818
#include "catalog/indexing.h"
1919
#include "catalog/pg_namespace.h"

‎contrib/sepgsql/relation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "postgres.h"
1212

1313
#include "access/genam.h"
14-
#include "access/heapam.h"
1514
#include "access/htup_details.h"
1615
#include "access/sysattr.h"
16+
#include "access/table.h"
1717
#include "catalog/indexing.h"
1818
#include "catalog/dependency.h"
1919
#include "catalog/pg_attribute.h"

‎contrib/sepgsql/schema.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "postgres.h"
1212

1313
#include "access/genam.h"
14-
#include "access/heapam.h"
1514
#include "access/htup_details.h"
1615
#include "access/sysattr.h"
16+
#include "access/table.h"
1717
#include "catalog/dependency.h"
1818
#include "catalog/indexing.h"
1919
#include "catalog/pg_database.h"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#include "access/brin_page.h"
2020
#include "access/brin_pageops.h"
2121
#include "access/brin_xlog.h"
22-
#include "access/heapam.h"
22+
#include "access/relation.h"
2323
#include "access/reloptions.h"
2424
#include "access/relscan.h"
25+
#include "access/table.h"
2526
#include "access/xloginsert.h"
2627
#include "catalog/index.h"
2728
#include "catalog/pg_am.h"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "access/hash.h"
1919
#include "access/hash_xlog.h"
20-
#include "access/heapam.h"
2120
#include "miscadmin.h"
2221
#include "utils/rel.h"
2322
#include "storage/lwlock.h"

‎src/backend/catalog/catalog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <unistd.h>
2222

2323
#include "access/genam.h"
24-
#include "access/heapam.h"
2524
#include "access/htup_details.h"
2625
#include "access/sysattr.h"
26+
#include "access/table.h"
2727
#include "access/transam.h"
2828
#include "catalog/catalog.h"
2929
#include "catalog/indexing.h"

‎src/backend/catalog/dependency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/htup_details.h"
19-
#include "access/heapam.h"
19+
#include "access/table.h"
2020
#include "access/xact.h"
2121
#include "catalog/dependency.h"
2222
#include "catalog/heap.h"

‎src/backend/catalog/heap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@
3030
#include "postgres.h"
3131

3232
#include "access/genam.h"
33-
#include "access/heapam.h"
3433
#include "access/htup_details.h"
3534
#include "access/multixact.h"
35+
#include "access/relation.h"
3636
#include "access/sysattr.h"
37+
#include "access/table.h"
3738
#include "access/transam.h"
3839
#include "access/xact.h"
3940
#include "access/xlog.h"

‎src/backend/catalog/objectaddress.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
#include "postgres.h"
1717

1818
#include "access/genam.h"
19-
#include "access/heapam.h"
2019
#include "access/htup_details.h"
20+
#include "access/relation.h"
2121
#include "access/sysattr.h"
22+
#include "access/table.h"
2223
#include "catalog/catalog.h"
2324
#include "catalog/indexing.h"
2425
#include "catalog/objectaddress.h"

‎src/backend/catalog/partition.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
19+
#include "access/table.h"
2020
#include "access/tupconvert.h"
2121
#include "access/sysattr.h"
2222
#include "catalog/indexing.h"

‎src/backend/catalog/pg_aggregate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
18+
#include "access/table.h"
1919
#include "catalog/dependency.h"
2020
#include "catalog/indexing.h"
2121
#include "catalog/pg_aggregate.h"

‎src/backend/catalog/pg_collation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
2019
#include "access/sysattr.h"
20+
#include "access/table.h"
2121
#include "catalog/catalog.h"
2222
#include "catalog/dependency.h"
2323
#include "catalog/indexing.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
2019
#include "access/sysattr.h"
20+
#include "access/table.h"
2121
#include "access/tupconvert.h"
2222
#include "access/xact.h"
2323
#include "catalog/catalog.h"

‎src/backend/catalog/pg_depend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
19+
#include "access/table.h"
2020
#include "catalog/dependency.h"
2121
#include "catalog/indexing.h"
2222
#include "catalog/pg_constraint.h"

‎src/backend/catalog/pg_enum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "postgres.h"
1515

1616
#include "access/genam.h"
17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
18+
#include "access/table.h"
1919
#include "access/xact.h"
2020
#include "catalog/binary_upgrade.h"
2121
#include "catalog/catalog.h"

‎src/backend/catalog/pg_inherits.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "postgres.h"
2121

2222
#include "access/genam.h"
23-
#include "access/heapam.h"
2423
#include "access/htup_details.h"
24+
#include "access/table.h"
2525
#include "catalog/indexing.h"
2626
#include "catalog/pg_inherits.h"
2727
#include "parser/parse_type.h"

‎src/backend/catalog/pg_largeobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
2019
#include "access/sysattr.h"
20+
#include "access/table.h"
2121
#include "catalog/catalog.h"
2222
#include "catalog/dependency.h"
2323
#include "catalog/indexing.h"

‎src/backend/catalog/pg_namespace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
18+
#include "access/table.h"
1919
#include "catalog/catalog.h"
2020
#include "catalog/dependency.h"
2121
#include "catalog/indexing.h"

‎src/backend/catalog/pg_operator.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 "access/heapam.h"
2120
#include "access/htup_details.h"
21+
#include "access/table.h"
2222
#include "access/xact.h"
2323
#include "catalog/catalog.h"
2424
#include "catalog/dependency.h"

‎src/backend/catalog/pg_proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "postgres.h"
1616

1717
#include "access/htup_details.h"
18-
#include "access/heapam.h"
18+
#include "access/table.h"
1919
#include "access/xact.h"
2020
#include "catalog/catalog.h"
2121
#include "catalog/dependency.h"

‎src/backend/catalog/pg_range.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
19+
#include "access/table.h"
2020
#include "catalog/dependency.h"
2121
#include "catalog/indexing.h"
2222
#include "catalog/pg_collation.h"

‎src/backend/catalog/pg_shdepend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "postgres.h"
1616

1717
#include "access/genam.h"
18-
#include "access/heapam.h"
1918
#include "access/htup_details.h"
19+
#include "access/table.h"
2020
#include "access/xact.h"
2121
#include "catalog/catalog.h"
2222
#include "catalog/dependency.h"

‎src/backend/catalog/pg_type.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
18+
#include "access/table.h"
1919
#include "access/xact.h"
2020
#include "catalog/catalog.h"
2121
#include "catalog/binary_upgrade.h"

‎src/backend/commands/alter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
*/
1515
#include "postgres.h"
1616

17-
#include "access/heapam.h"
1817
#include "access/htup_details.h"
18+
#include "access/relation.h"
1919
#include "access/sysattr.h"
20+
#include "access/table.h"
2021
#include "catalog/dependency.h"
2122
#include "catalog/indexing.h"
2223
#include "catalog/namespace.h"

0 commit comments

Comments
 (0)