I noticed that catalog/objectaddress.h includes utils/acl.h for no
apparent reason. It turns out this used to be needed but not anymore.
So removed it and cleaned up the fallout. Patch attached.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
From 6a2603fbaaf7029f1171e87c396b673ec80e7077 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Sat, 7 Mar 2020 08:19:18 +0100
Subject: [PATCH] Remove utils/acl.h from catalog/objectaddress.h
The need for this was removed by
8b9e9644dc6a9bd4b7a97950e6212f63880cf18b.
A number of files now need to include utils/acl.h or
parser/parse_node.h explicitly where they previously got it indirectly
somehow.
---
contrib/adminpack/adminpack.c | 1 +
contrib/file_fdw/file_fdw.c | 1 +
src/backend/access/brin/brin.c | 1 +
src/backend/catalog/dependency.c | 1 +
src/backend/catalog/objectaddress.c | 1 +
src/backend/commands/collationcmds.c | 1 +
src/backend/commands/conversioncmds.c | 1 +
src/backend/commands/copy.c | 1 +
src/backend/commands/dropcmds.c | 1 +
src/backend/commands/operatorcmds.c | 1 +
src/backend/commands/publicationcmds.c | 1 +
src/backend/commands/subscriptioncmds.c | 1 +
src/backend/executor/execExpr.c | 1 +
src/backend/executor/execPartition.c | 1 +
src/backend/replication/walreceiver.c | 1 +
src/backend/replication/walsender.c | 1 +
src/backend/statistics/extended_stats.c | 1 +
src/backend/storage/ipc/procarray.c | 1 +
src/backend/storage/large_object/inv_api.c | 1 +
src/backend/utils/adt/genfile.c | 1 +
src/backend/utils/adt/selfuncs.c | 1 +
src/backend/utils/misc/guc.c | 1 +
src/include/catalog/objectaddress.h | 3 ++-
src/include/catalog/pg_namespace.h | 1 +
src/include/commands/collationcmds.h | 1 +
src/include/commands/createas.h | 1 +
src/include/commands/dbcommands.h | 1 +
src/include/commands/defrem.h | 1 +
src/include/commands/extension.h | 1 +
src/include/commands/vacuum.h | 1 +
src/pl/tcl/pltcl.c | 1 +
31 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index ba69c74b5a..bc45e79895 100644
--- a/contrib/adminpack/adminpack.c
+++ b/contrib/adminpack/adminpack.c
@@ -24,6 +24,7 @@
#include "miscadmin.h"
#include "postmaster/syslogger.h"
#include "storage/fd.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/datetime.h"
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index d003160296..fbcf7ca9c9 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -33,6 +33,7 @@
#include "optimizer/pathnode.h"
#include "optimizer/planmain.h"
#include "optimizer/restrictinfo.h"
+#include "utils/acl.h"
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/sampling.h"
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index 2e8f67ef10..c481838389 100644
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -33,6 +33,7 @@
#include "postmaster/autovacuum.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index c4a4df25b8..ffd52c1153 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -77,6 +77,7 @@
#include "parser/parsetree.h"
#include "rewrite/rewriteRemove.h"
#include "storage/lmgr.h"
+#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/catalog/objectaddress.c
b/src/backend/catalog/objectaddress.c
index d0b5de49eb..11558f1e62 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -81,6 +81,7 @@
#include "storage/large_object.h"
#include "storage/lmgr.h"
#include "storage/sinval.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/collationcmds.c
b/src/backend/commands/collationcmds.c
index 85f726ae06..9f6582c530 100644
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -29,6 +29,7 @@
#include "commands/defrem.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
diff --git a/src/backend/commands/conversioncmds.c
b/src/backend/commands/conversioncmds.c
index f974478b26..0ee3b6d19a 100644
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -24,6 +24,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/parse_func.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index e79ede4cb8..fbde9f88e7 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -49,6 +49,7 @@
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
#include "tcop/tcopprot.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c
index b3131ab208..81f0380108 100644
--- a/src/backend/commands/dropcmds.c
+++ b/src/backend/commands/dropcmds.c
@@ -26,6 +26,7 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/operatorcmds.c
b/src/backend/commands/operatorcmds.c
index bdf90bf7fd..0a53e9b93e 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -44,6 +44,7 @@
#include "parser/parse_func.h"
#include "parser/parse_oper.h"
#include "parser/parse_type.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
diff --git a/src/backend/commands/publicationcmds.c
b/src/backend/commands/publicationcmds.c
index eb4d22cc2a..0b1fba89de 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -33,6 +33,7 @@
#include "commands/publicationcmds.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "utils/acl.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/subscriptioncmds.c
b/src/backend/commands/subscriptioncmds.c
index f3ec012dda..7f156673f7 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -38,6 +38,7 @@
#include "replication/walsender.h"
#include "replication/worker_internal.h"
#include "storage/lmgr.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 8c5ead93d6..1370ffec50 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -42,6 +42,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "pgstat.h"
+#include "utils/acl.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/datum.h"
diff --git a/src/backend/executor/execPartition.c
b/src/backend/executor/execPartition.c
index c13b1d3501..ef74ad85ff 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -28,6 +28,7 @@
#include "partitioning/partdesc.h"
#include "partitioning/partprune.h"
#include "rewrite/rewriteManip.h"
+#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rls.h"
diff --git a/src/backend/replication/walreceiver.c
b/src/backend/replication/walreceiver.c
index 2ab15c3cbb..ab59a86c62 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -64,6 +64,7 @@
#include "storage/pmsignal.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/replication/walsender.c
b/src/backend/replication/walsender.c
index ae4a9cbe11..594a60e883 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -85,6 +85,7 @@
#include "storage/procarray.h"
#include "tcop/dest.h"
#include "tcop/tcopprot.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/memutils.h"
diff --git a/src/backend/statistics/extended_stats.c
b/src/backend/statistics/extended_stats.c
index 03e69d057f..81864ce03d 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -33,6 +33,7 @@
#include "postmaster/autovacuum.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
+#include "utils/acl.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
diff --git a/src/backend/storage/ipc/procarray.c
b/src/backend/storage/ipc/procarray.c
index 4a5b26c23d..f45a619deb 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -59,6 +59,7 @@
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/spin.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/storage/large_object/inv_api.c
b/src/backend/storage/large_object/inv_api.c
index da42d9b479..20130e47b7 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -46,6 +46,7 @@
#include "libpq/libpq-fs.h"
#include "miscadmin.h"
#include "storage/large_object.h"
+#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 3741b87486..5bda2af87c 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -30,6 +30,7 @@
#include "miscadmin.h"
#include "postmaster/syslogger.h"
#include "storage/fd.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 0be26fe037..8339f4cd7a 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -126,6 +126,7 @@
#include "parser/parsetree.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index dbecc00fef..7c023dd9f2 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -81,6 +81,7 @@
#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
#include "utils/float.h"
diff --git a/src/include/catalog/objectaddress.h
b/src/include/catalog/objectaddress.h
index 9c6f7aad6b..2f043037b6 100644
--- a/src/include/catalog/objectaddress.h
+++ b/src/include/catalog/objectaddress.h
@@ -13,9 +13,10 @@
#ifndef OBJECTADDRESS_H
#define OBJECTADDRESS_H
+#include "access/htup.h"
+#include "nodes/parsenodes.h"
#include "nodes/pg_list.h"
#include "storage/lockdefs.h"
-#include "utils/acl.h"
#include "utils/relcache.h"
/*
diff --git a/src/include/catalog/pg_namespace.h
b/src/include/catalog/pg_namespace.h
index 5289ad8ee2..db93b27015 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -20,6 +20,7 @@
#include "catalog/genbki.h"
#include "catalog/pg_namespace_d.h"
+#include "utils/acl.h"
/* ----------------------------------------------------------------
* pg_namespace definition.
diff --git a/src/include/commands/collationcmds.h
b/src/include/commands/collationcmds.h
index df7d1d498c..20f198e7f9 100644
--- a/src/include/commands/collationcmds.h
+++ b/src/include/commands/collationcmds.h
@@ -17,6 +17,7 @@
#include "catalog/objectaddress.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List
*parameters, bool if_not_exists);
extern void IsThereCollationInNamespace(const char *collname, Oid nspOid);
diff --git a/src/include/commands/createas.h b/src/include/commands/createas.h
index 5615b5ecac..5d3cdcd371 100644
--- a/src/include/commands/createas.h
+++ b/src/include/commands/createas.h
@@ -17,6 +17,7 @@
#include "catalog/objectaddress.h"
#include "nodes/params.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
#include "tcop/dest.h"
#include "utils/queryenvironment.h"
diff --git a/src/include/commands/dbcommands.h
b/src/include/commands/dbcommands.h
index f8f6d5ffd0..46524073c4 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -18,6 +18,7 @@
#include "catalog/objectaddress.h"
#include "lib/stringinfo.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
extern Oid createdb(ParseState *pstate, const CreatedbStmt *stmt);
extern void dropdb(const char *dbname, bool missing_ok, bool force);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 5cd6975a22..8bd0643ca6 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -17,6 +17,7 @@
#include "catalog/objectaddress.h"
#include "nodes/params.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
#include "tcop/dest.h"
#include "utils/array.h"
diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h
index 7923cdc250..37f66235a0 100644
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -16,6 +16,7 @@
#include "catalog/objectaddress.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
/*
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index c27d255d8d..be63e043c6 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -19,6 +19,7 @@
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
#include "storage/buf.h"
#include "storage/lock.h"
#include "utils/relcache.h"
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 26e76f6a51..99d11c8e3b 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -30,6 +30,7 @@
#include "parser/parse_type.h"
#include "pgstat.h"
#include "tcop/tcopprot.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
--
2.25.0
