From 34b55cc16fdcb421b2a96ee8bc12d9c5ff8e8643 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 12 Jan 2019 22:05:46 -0800 Subject: [PATCH v1 2/3] Replace heapam.h includes with relation.h / table.h where applicable. Author: Reviewed-By: Discussion: https://postgr.es/m/ Backpatch: --- contrib/dblink/dblink.c | 3 ++- contrib/file_fdw/file_fdw.c | 2 +- contrib/pageinspect/btreefuncs.c | 2 +- contrib/pageinspect/heapfuncs.c | 2 +- contrib/pageinspect/rawpage.c | 2 +- contrib/pg_freespacemap/pg_freespacemap.c | 2 +- contrib/pg_prewarm/autoprewarm.c | 2 +- contrib/pg_prewarm/pg_prewarm.c | 2 +- contrib/pgstattuple/pgstatapprox.c | 4 ++-- contrib/pgstattuple/pgstatindex.c | 3 ++- contrib/postgres_fdw/deparse.c | 2 +- contrib/postgres_fdw/postgres_fdw.c | 2 +- contrib/sepgsql/database.c | 2 +- contrib/sepgsql/label.c | 2 +- contrib/sepgsql/proc.c | 2 +- contrib/sepgsql/relation.c | 2 +- contrib/sepgsql/schema.c | 2 +- src/backend/access/brin/brin.c | 3 ++- src/backend/catalog/catalog.c | 2 +- src/backend/catalog/dependency.c | 2 +- src/backend/catalog/heap.c | 3 ++- src/backend/catalog/objectaddress.c | 3 ++- src/backend/catalog/partition.c | 2 +- src/backend/catalog/pg_aggregate.c | 2 +- src/backend/catalog/pg_collation.c | 2 +- src/backend/catalog/pg_constraint.c | 2 +- src/backend/catalog/pg_depend.c | 2 +- src/backend/catalog/pg_enum.c | 2 +- src/backend/catalog/pg_inherits.c | 2 +- src/backend/catalog/pg_largeobject.c | 2 +- src/backend/catalog/pg_namespace.c | 2 +- src/backend/catalog/pg_operator.c | 2 +- src/backend/catalog/pg_proc.c | 2 +- src/backend/catalog/pg_range.c | 2 +- src/backend/catalog/pg_shdepend.c | 2 +- src/backend/catalog/pg_type.c | 2 +- src/backend/commands/alter.c | 3 ++- src/backend/commands/amcmds.c | 2 +- src/backend/commands/analyze.c | 3 ++- src/backend/commands/collationcmds.c | 2 +- src/backend/commands/comment.c | 3 ++- src/backend/commands/dropcmds.c | 2 +- src/backend/commands/event_trigger.c | 2 +- src/backend/commands/extension.c | 3 ++- src/backend/commands/foreigncmds.c | 2 +- src/backend/commands/functioncmds.c | 2 +- src/backend/commands/lockcmds.c | 2 +- src/backend/commands/opclasscmds.c | 2 +- src/backend/commands/operatorcmds.c | 2 +- src/backend/commands/policy.c | 3 ++- src/backend/commands/proclang.c | 2 +- src/backend/commands/publicationcmds.c | 2 +- src/backend/commands/schemacmds.c | 2 +- src/backend/commands/seclabel.c | 3 ++- src/backend/commands/sequence.c | 3 ++- src/backend/commands/statscmds.c | 3 ++- src/backend/commands/subscriptioncmds.c | 2 +- src/backend/commands/tsearchcmds.c | 2 +- src/backend/commands/user.c | 2 +- src/backend/commands/view.c | 2 +- src/backend/executor/execPartition.c | 2 +- src/backend/executor/execUtils.c | 2 +- src/backend/optimizer/plan/planner.c | 2 +- src/backend/optimizer/prep/preptlist.c | 2 +- src/backend/optimizer/util/inherit.c | 2 +- src/backend/optimizer/util/plancat.c | 2 +- src/backend/parser/parse_clause.c | 2 +- src/backend/parser/parse_node.c | 2 +- src/backend/parser/parse_relation.c | 3 ++- src/backend/parser/parse_utilcmd.c | 3 ++- src/backend/replication/logical/origin.c | 2 +- src/backend/replication/logical/relation.c | 2 +- src/backend/replication/logical/tablesync.c | 2 +- src/backend/replication/logical/worker.c | 2 +- src/backend/rewrite/rewriteHandler.c | 3 ++- src/backend/rewrite/rewriteRemove.c | 2 +- src/backend/rewrite/rewriteSupport.c | 2 +- src/backend/rewrite/rowsecurity.c | 2 +- src/backend/statistics/extended_stats.c | 2 +- src/backend/storage/large_object/inv_api.c | 2 +- src/backend/utils/adt/dbsize.c | 2 +- src/backend/utils/adt/enum.c | 2 +- src/backend/utils/adt/misc.c | 2 +- src/backend/utils/adt/ri_triggers.c | 2 +- src/backend/utils/adt/ruleutils.c | 3 ++- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/adt/xml.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/cache/evtcache.c | 2 +- src/backend/utils/cache/partcache.c | 2 +- src/backend/utils/cache/relcache.c | 2 +- src/backend/utils/cache/relfilenodemap.c | 2 +- src/backend/utils/cache/ts_cache.c | 2 +- src/backend/utils/cache/typcache.c | 3 ++- src/backend/utils/fmgr/funcapi.c | 2 +- src/backend/utils/misc/queryenvironment.c | 2 +- 96 files changed, 115 insertions(+), 97 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 203f6fd3f01..5092aba3e42 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -37,8 +37,9 @@ #include "libpq-fe.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/reloptions.h" -#include "access/heapam.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_foreign_data_wrapper.h" diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index ad4da6b5ed4..9b73696e2a7 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -18,7 +18,7 @@ #include "access/htup_details.h" #include "access/reloptions.h" #include "access/sysattr.h" -#include "access/heapam.h" +#include "access/table.h" #include "catalog/pg_authid.h" #include "catalog/pg_foreign_table.h" #include "commands/copy.h" diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c index 454e488f86a..bfa0c04c2f1 100644 --- a/contrib/pageinspect/btreefuncs.c +++ b/contrib/pageinspect/btreefuncs.c @@ -30,7 +30,7 @@ #include "pageinspect.h" #include "access/nbtree.h" -#include "access/heapam.h" +#include "access/relation.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "funcapi.h" diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index b98c4881ac5..987d576c011 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -27,8 +27,8 @@ #include "pageinspect.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "funcapi.h" #include "catalog/pg_type.h" #include "miscadmin.h" diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c index 2d91954cb7d..03d6670d1fa 100644 --- a/contrib/pageinspect/rawpage.c +++ b/contrib/pageinspect/rawpage.c @@ -18,7 +18,7 @@ #include "pageinspect.h" #include "access/htup_details.h" -#include "access/heapam.h" +#include "access/relation.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "funcapi.h" diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c index 5ad68005573..b82cab2d97e 100644 --- a/contrib/pg_freespacemap/pg_freespacemap.c +++ b/contrib/pg_freespacemap/pg_freespacemap.c @@ -8,7 +8,7 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/relation.h" #include "funcapi.h" #include "storage/freespace.h" diff --git a/contrib/pg_prewarm/autoprewarm.c b/contrib/pg_prewarm/autoprewarm.c index 45a5a26337e..9cc4b2dc837 100644 --- a/contrib/pg_prewarm/autoprewarm.c +++ b/contrib/pg_prewarm/autoprewarm.c @@ -28,7 +28,7 @@ #include -#include "access/heapam.h" +#include "access/relation.h" #include "access/xact.h" #include "catalog/pg_class.h" #include "catalog/pg_type.h" diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c index f789aabfc62..f3deb47a97b 100644 --- a/contrib/pg_prewarm/pg_prewarm.c +++ b/contrib/pg_prewarm/pg_prewarm.c @@ -15,7 +15,7 @@ #include #include -#include "access/heapam.h" +#include "access/relation.h" #include "fmgr.h" #include "miscadmin.h" #include "storage/bufmgr.h" diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c index 9729d8eb1bd..4f449a26c15 100644 --- a/contrib/pgstattuple/pgstatapprox.c +++ b/contrib/pgstattuple/pgstatapprox.c @@ -12,9 +12,9 @@ */ #include "postgres.h" -#include "access/visibilitymap.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/transam.h" +#include "access/visibilitymap.h" #include "access/xact.h" #include "access/multixact.h" #include "access/htup_details.h" diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c index db396c8c4b7..2c807537266 100644 --- a/contrib/pgstattuple/pgstatindex.c +++ b/contrib/pgstattuple/pgstatindex.c @@ -28,10 +28,11 @@ #include "postgres.h" #include "access/gin_private.h" -#include "access/heapam.h" #include "access/hash.h" #include "access/htup_details.h" #include "access/nbtree.h" +#include "access/relation.h" +#include "access/table.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "funcapi.h" diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 307c0270bb5..20982daef68 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -35,9 +35,9 @@ #include "postgres_fdw.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_collation.h" #include "catalog/pg_namespace.h" diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 64efbdff082..6200b430200 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -14,9 +14,9 @@ #include "postgres_fdw.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/pg_class.h" #include "commands/defrem.h" #include "commands/explain.h" diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c index d49231a4b18..837728e07b0 100644 --- a/contrib/sepgsql/database.c +++ b/contrib/sepgsql/database.c @@ -11,9 +11,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/pg_database.h" #include "catalog/indexing.h" diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index db00b481228..19bbee328e3 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -12,9 +12,9 @@ #include -#include "access/heapam.h" #include "access/htup_details.h" #include "access/genam.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c index 94b9dbf6ecd..74487eda03a 100644 --- a/contrib/sepgsql/proc.c +++ b/contrib/sepgsql/proc.c @@ -11,9 +11,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_namespace.h" diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c index 42a4604f24b..12cfebecc64 100644 --- a/contrib/sepgsql/relation.c +++ b/contrib/sepgsql/relation.c @@ -11,9 +11,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/dependency.h" #include "catalog/pg_attribute.h" diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index 19ca6fa9b0f..752cd56a86a 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -11,9 +11,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_database.h" diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index 52144271c1c..34f82d46821 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -19,9 +19,10 @@ #include "access/brin_page.h" #include "access/brin_pageops.h" #include "access/brin_xlog.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/reloptions.h" #include "access/relscan.h" +#include "access/table.h" #include "access/xloginsert.h" #include "catalog/index.h" #include "catalog/pg_am.h" diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index eb474700f5d..48303926e48 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -21,9 +21,9 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/transam.h" #include "catalog/catalog.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 35290847bd9..014e49fe77c 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -16,7 +16,7 @@ #include "access/genam.h" #include "access/htup_details.h" -#include "access/heapam.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index d7ccf2bfbef..07e720df2fc 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -30,10 +30,11 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/multixact.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/transam.h" #include "access/xact.h" #include "access/xlog.h" diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index f9214f8b629..d68e28c9b43 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -16,9 +16,10 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/objectaddress.h" diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c index 11b48180375..83ec22cb0fd 100644 --- a/src/backend/catalog/partition.c +++ b/src/backend/catalog/partition.c @@ -15,8 +15,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/tupconvert.h" #include "access/sysattr.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index bf73599ba8b..fe953c95ae5 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_aggregate.h" diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c index 467ab5a5e56..57ce7d7205c 100644 --- a/src/backend/catalog/pg_collation.c +++ b/src/backend/catalog/pg_collation.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 3c960c9423a..a27bcfb3350 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tupconvert.h" #include "access/xact.h" #include "catalog/catalog.h" diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index fde7e170bed..6a46d2e5b18 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -15,8 +15,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_constraint.h" diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index 4921287f78d..77b1b9fb27f 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -14,8 +14,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/binary_upgrade.h" #include "catalog/catalog.h" diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c index 978ff20d877..d07bbba34d3 100644 --- a/src/backend/catalog/pg_inherits.c +++ b/src/backend/catalog/pg_inherits.c @@ -20,8 +20,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_inherits.h" #include "parser/parse_type.h" diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index 1b4ced47827..1d068ca0beb 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c index 349840b0ece..763a0b75ab1 100644 --- a/src/backend/catalog/pg_namespace.c +++ b/src/backend/catalog/pg_namespace.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 7a973216bd4..dbe89c51710 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -17,8 +17,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 8c2e42d7590..32887e548b8 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -15,7 +15,7 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/heapam.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/catalog/pg_range.c b/src/backend/catalog/pg_range.c index 8044807c2c0..dc83727d9dc 100644 --- a/src/backend/catalog/pg_range.c +++ b/src/backend/catalog/pg_range.c @@ -15,8 +15,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_collation.h" diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 8343fce408a..a8db901bcb8 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -15,8 +15,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index b69cf832994..b14beae9e13 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/binary_upgrade.h" diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 3c53178f75c..08c2cf3569f 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -14,9 +14,10 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/commands/amcmds.c b/src/backend/commands/amcmds.c index 1ab2e469ee7..a720d14df06 100644 --- a/src/backend/commands/amcmds.c +++ b/src/backend/commands/amcmds.c @@ -13,8 +13,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 99e3f2a672a..ac40bd793d1 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -17,9 +17,10 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/multixact.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/transam.h" #include "access/tupconvert.h" #include "access/tuptoaster.h" diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index e6a5c3a5554..d9a3088ac27 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 2327632a09d..d4714a5c1f8 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -15,8 +15,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/objectaddress.h" #include "catalog/pg_description.h" diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c index 1dc1c746f1f..7c31890ba51 100644 --- a/src/backend/commands/dropcmds.c +++ b/src/backend/commands/dropcmds.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/namespace.h" #include "catalog/objectaddress.h" diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index e5083349814..9735fde9711 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -13,8 +13,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index e381a307601..48dfbc33766 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -30,9 +30,10 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 5ada4a85940..03976f0454f 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -13,9 +13,9 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/reloptions.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 8b291cf1858..9a8d388909f 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -33,8 +33,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/sysattr.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index 1b33be18958..1470ffe1d17 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -14,6 +14,7 @@ */ #include "postgres.h" +#include "access/table.h" #include "catalog/namespace.h" #include "catalog/pg_inherits.h" #include "commands/lockcmds.h" @@ -24,7 +25,6 @@ #include "utils/lsyscache.h" #include "utils/syscache.h" #include "rewrite/rewriteHandler.h" -#include "access/heapam.h" #include "nodes/nodeFuncs.h" static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid); diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 5a160450260..e1b1a7e3169 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -19,10 +19,10 @@ #include "access/genam.h" #include "access/hash.h" -#include "access/heapam.h" #include "access/nbtree.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index f7c00e2f48e..9733d6c7bda 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -34,8 +34,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c index 0adae130432..8465de0e1dd 100644 --- a/src/backend/commands/policy.c +++ b/src/backend/commands/policy.c @@ -13,9 +13,10 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup.h" #include "access/htup_details.h" +#include "access/relation.h" +#include "access/table.h" #include "access/sysattr.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index b010d23466a..572a5d5bdea 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -14,8 +14,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 5dc84fe41ad..e431e58f0e6 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -19,8 +19,8 @@ #include "access/genam.h" #include "access/hash.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index c3029465255..8367261fbe8 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -15,7 +15,7 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/heapam.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c index 325bcaada19..1e31dc1f678 100644 --- a/src/backend/commands/seclabel.c +++ b/src/backend/commands/seclabel.c @@ -11,8 +11,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/pg_seclabel.h" diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 1df2df8ff55..5554e883d80 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -15,9 +15,10 @@ #include "postgres.h" #include "access/bufmask.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/multixact.h" +#include "access/relation.h" +#include "access/table.h" #include "access/transam.h" #include "access/xact.h" #include "access/xlog.h" diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c index 86a96ac05dc..970fdb712d6 100644 --- a/src/backend/commands/statscmds.c +++ b/src/backend/commands/statscmds.c @@ -14,8 +14,9 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/relscan.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 160c4fc6597..bd0f4cd1a15 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -16,8 +16,8 @@ #include "miscadmin.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index cda21675f02..3f727f2744c 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -18,8 +18,8 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 30399407f88..938c7d0ed0a 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -13,8 +13,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/binary_upgrade.h" #include "catalog/catalog.h" diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index c346630267c..65f4b40b38f 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -14,7 +14,7 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/xact.h" #include "catalog/namespace.h" #include "commands/defrem.h" diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 7415dfa45eb..93e4b287970 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -13,7 +13,7 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/table.h" #include "catalog/partition.h" #include "catalog/pg_inherits.h" #include "catalog/pg_type.h" diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index d914d4b5006..146ca6e0532 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -45,9 +45,9 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/parallel.h" #include "access/relscan.h" +#include "access/table.h" #include "access/transam.h" #include "executor/executor.h" #include "jit/jit.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 5ba612922f9..cce762515d7 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -19,10 +19,10 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/parallel.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/pg_constraint.h" #include "catalog/pg_proc.h" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index f8bc2dd257d..8d9315a4547 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -40,8 +40,8 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "optimizer/prep.h" diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c index 350e6afe270..52354eab5ba 100644 --- a/src/backend/optimizer/util/inherit.c +++ b/src/backend/optimizer/util/inherit.c @@ -14,7 +14,7 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/table.h" #include "catalog/partition.h" #include "catalog/pg_inherits.h" #include "miscadmin.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 48ffc5f2543..a6029f56373 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -18,10 +18,10 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/nbtree.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/transam.h" #include "access/xlog.h" #include "catalog/catalog.h" diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 6963922b0eb..2d740b5f52c 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -17,9 +17,9 @@ #include "miscadmin.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/nbtree.h" +#include "access/table.h" #include "access/tsmapi.h" #include "catalog/catalog.h" #include "catalog/heap.h" diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 8befe15e7d6..0562e6ecc80 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/pg_type.h" #include "mb/pg_wchar.h" #include "nodes/makefuncs.h" diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index e6af7a431f7..0f8175d39f3 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -16,9 +16,10 @@ #include -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/heap.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index bebee9d540b..ef3865d8ee7 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -27,9 +27,10 @@ #include "postgres.h" #include "access/amapi.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/reloptions.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index ca51318dbb4..0ca89911844 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -74,8 +74,8 @@ #include "miscadmin.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/indexing.h" diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c index 57ca4290682..81087ac9033 100644 --- a/src/backend/replication/logical/relation.c +++ b/src/backend/replication/logical/relation.c @@ -16,8 +16,8 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/namespace.h" #include "catalog/pg_subscription_rel.h" #include "executor/executor.h" diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c index d87cf8afe56..20ab1122064 100644 --- a/src/backend/replication/logical/tablesync.c +++ b/src/backend/replication/logical/tablesync.c @@ -88,7 +88,7 @@ #include "miscadmin.h" #include "pgstat.h" -#include "access/heapam.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/pg_subscription_rel.h" diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index de23ced9aff..0612e424dee 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -27,7 +27,7 @@ #include "pgstat.h" #include "funcapi.h" -#include "access/heapam.h" +#include "access/table.h" #include "access/xact.h" #include "access/xlog_internal.h" diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 4e5dcabf160..0fade10268a 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -20,8 +20,9 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/pg_type.h" #include "commands/trigger.h" diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 17919abd524..e6b4b9da284 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index c26147fb863..ec314051fa7 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -14,8 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_rewrite.h" #include "rewrite/rewriteSupport.h" diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c index b0d6e9af817..26a3ca3f7b9 100644 --- a/src/backend/rewrite/rowsecurity.c +++ b/src/backend/rewrite/rowsecurity.c @@ -34,9 +34,9 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/pg_class.h" #include "catalog/pg_inherits.h" #include "catalog/pg_policy.h" diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 9b3e819d61f..51659a51dde 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -17,8 +17,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_collation.h" #include "catalog/pg_statistic_ext.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index c51ec1f9a28..b0dddab47a3 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -33,8 +33,8 @@ #include #include "access/genam.h" -#include "access/heapam.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tuptoaster.h" #include "access/xact.h" #include "catalog/dependency.h" diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 0d89cbe18f6..a87e7214e9f 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -13,8 +13,8 @@ #include -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "catalog/catalog.h" #include "catalog/namespace.h" #include "catalog/pg_authid.h" diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 610685db4cf..de6a08ba555 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -14,8 +14,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_enum.h" #include "libpq/pqformat.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index f4d3eab2ea8..91de57e5ceb 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -19,8 +19,8 @@ #include #include -#include "access/heapam.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index e606eb342fd..049585f211c 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -30,9 +30,9 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 8ed72bd2683..97eeabc8f04 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -20,9 +20,10 @@ #include #include "access/amapi.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_aggregate.h" diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 27e5bfef36c..71cfe6499ca 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -103,9 +103,9 @@ #include "access/brin.h" #include "access/gin.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "catalog/index.h" #include "catalog/pg_am.h" #include "catalog/pg_collation.h" diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 1db560cd66d..7c04586ad5e 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -67,8 +67,8 @@ #endif #endif /* USE_LIBXML */ -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/namespace.h" #include "catalog/pg_class.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 8152f7e21e2..2123117f8b0 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -16,9 +16,9 @@ #include "access/genam.h" #include "access/hash.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tuptoaster.h" #include "access/valid.h" #include "access/xact.h" diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c index 37e2ebc9f58..88b0969b890 100644 --- a/src/backend/utils/cache/evtcache.c +++ b/src/backend/utils/cache/evtcache.c @@ -14,8 +14,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "catalog/pg_event_trigger.h" #include "catalog/indexing.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/cache/partcache.c b/src/backend/utils/cache/partcache.c index 2004f2d4676..2404073bc86 100644 --- a/src/backend/utils/cache/partcache.c +++ b/src/backend/utils/cache/partcache.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/hash.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/nbtree.h" +#include "access/relation.h" #include "catalog/partition.h" #include "catalog/pg_inherits.h" #include "catalog/pg_opclass.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index df30bff6c99..93856e30875 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -31,12 +31,12 @@ #include #include "access/hash.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/multixact.h" #include "access/nbtree.h" #include "access/reloptions.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tupdesc_details.h" #include "access/xact.h" #include "access/xlog.h" diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c index 29ee86acd6d..b766dbb21c0 100644 --- a/src/backend/utils/cache/relfilenodemap.c +++ b/src/backend/utils/cache/relfilenodemap.c @@ -14,8 +14,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_class.h" #include "catalog/pg_tablespace.h" diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c index f7fc6c15581..4e0fdb7b55a 100644 --- a/src/backend/utils/cache/ts_cache.c +++ b/src/backend/utils/cache/ts_cache.c @@ -27,8 +27,8 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index 0fdd1ebef1f..b1931dad95e 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -43,11 +43,12 @@ #include #include "access/hash.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/nbtree.h" #include "access/parallel.h" +#include "access/relation.h" #include "access/session.h" +#include "access/table.h" #include "catalog/indexing.h" #include "catalog/pg_am.h" #include "catalog/pg_constraint.h" diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 8fba7791cf8..a5e77a208ef 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -13,8 +13,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" #include "catalog/namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/misc/queryenvironment.c b/src/backend/utils/misc/queryenvironment.c index 29d45cc368b..165e819e47a 100644 --- a/src/backend/utils/misc/queryenvironment.c +++ b/src/backend/utils/misc/queryenvironment.c @@ -22,7 +22,7 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/table.h" #include "utils/queryenvironment.h" #include "utils/rel.h" -- 2.18.0.rc2.dirty