From 111944c5ee567f1c45bf0f1ecfdec682af467aa6 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 21 Jan 2019 10:18:20 -0800 Subject: 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 --- 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 +- 16 files changed, 18 insertions(+), 16 deletions(-) (limited to 'src/backend/utils') 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 0c1ee8d1f69..3c18d8695c8 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 7ea371a3c71..ca229f940fe 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" -- cgit v1.2.3