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.

Since parser/parse_node.h already includes nodes/parsenodes.h, the
latter is then removed where the former was added.  Also, remove
nodes/pg_list.h from objectaddress.h, since that's included via
nodes/parsenodes.h.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Alvaro Herrera <alvherre@2ndquadrant.com>
Discussion: https://www.postgresql.org/message-id/flat/7601e258-26b2-8481-36d0-dc9dca6f28f1%402ndquadrant.com

diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index ba69c74b5a9b6ee061592de9cdbb18562173f501..bc45e79895142b9dcf3a9b3c7909736c74aae8a1 100644 (file)
--- 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 d003160296cb29146d1943ba71cddcbe41d4935c..fbcf7ca9c91ea3ed5a3dee2309f6e7cf756065ec 100644 (file)
--- 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 2e8f67ef10175f79235e6292eb518b3d67b48c07..c481838389c6da87359dfe1df3592a4fd211a02a 100644 (file)
--- 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 c4a4df25b87e1e2ad0831e8f136ac1c5fd485ce1..ffd52c11533e3a1f05e76c3aa8194c2b3dd2de80 100644 (file)
--- 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 c9957b75793d94b2eb3908dc146565b9f90bd537..84463f76fc9d525d4ae38f2c988a6643430f1b60 100644 (file)
--- 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 85f726ae062e70c1bcdc11d4ab844687fae7946a..9f6582c530cbcf2c06e9c8008989437c98eb031f 100644 (file)
--- 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 f974478b263e96a3e26e1bd3bdbae09bb0806b60..0ee3b6d19a398acd573db9d9c6301e8bc27fa283 100644 (file)
--- 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 e79ede4cb859710b66813cb5b485693ac93ce4a0..fbde9f88e74a5fa4d660166b1b5c2b26dce164b1 100644 (file)
--- 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 b3131ab208c0c32bb063fbe82834811e4bab1c1b..81f03801086d9a7d57237c6822e2f183e6041a04 100644 (file)
--- 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 bdf90bf7fd67ab10196bcaf2a4658c0c3d8615d6..0a53e9b93e2187604fe3e8d483f371a82575fe7e 100644 (file)
--- 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 768c2184e13e25707e9edcfa2bb688ec210c423b..494c0bdc282c1eb7352c124e38a9c38950cbf252 100644 (file)
--- 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 f3ec012ddad01239eaafce3602396877e6002d4c..7f156673f7d7466730458b5445b4da3acb708cce 100644 (file)
--- 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 8c5ead93d680baef80ecc0fdbffd7d78a99a4f03..1370ffec5093536b6230cd8ea9505de04e610e0b 100644 (file)
--- 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 c13b1d3501f4a7779de342a11ab7e87947dff50f..ef74ad85ff9a04b990257c798953e345fd4f09f4 100644 (file)
--- 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 2ab15c3cbb690822721c5728e1037502dec23218..ab59a86c62ef698e312f79d3e66897e5600bdf60 100644 (file)
--- 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 ae4a9cbe119ea09254c9b1c56679e9036636b8be..594a60e883fecfa579b6eeb780e9115a2334385c 100644 (file)
--- 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 03e69d057ff6be312c56c6be62cdb8b268898400..81864ce03df0cc1221987eabce8eb158c3aeb6f6 100644 (file)
--- 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 4a5b26c23dc64a5faedf14ded085041a15a85b49..f45a619deb8fa87d081cdb494326c1fcd8d994e2 100644 (file)
--- 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 da42d9b479c509470ff7e80659b4272cb56cd7a9..20130e47b76c18eb4b0636e020b033b228f5aae2 100644 (file)
--- 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 3741b87486d0e8cf0942d61d2d8750a781db06da..5bda2af87c37e282b23c7868d1115c7975bd8208 100644 (file)
--- 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 0be26fe03780c89f15642dd98ecea2eaa0db42a3..8339f4cd7a295256a5a0fe5ec4613c9fba8a746f 100644 (file)
--- 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 c1fad3b3508f0aeb5f423e475180193ccb6b410f..4c6d64866230dec5b7ea0221ae3b3b5af4423f78 100644 (file)
--- 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 9c6f7aad6bb21d736d47ac6a9c2c97afacc38298..7f15efd58a81922d4eb1cfb5a8da98037f9fe2d3 100644 (file)
--- a/src/include/catalog/objectaddress.h
+++ b/src/include/catalog/objectaddress.h
@@ -13,9 +13,9 @@
 #ifndef OBJECTADDRESS_H
 #define OBJECTADDRESS_H
 
-#include "nodes/pg_list.h"
+#include "access/htup.h"
+#include "nodes/parsenodes.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 5289ad8ee25cf3d2b27a9812e9a2fff390c7819b..db93b270150767c70a906708320ad26551539dd8 100644 (file)
--- 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 df7d1d498c39f2f3a465e1a07138bac6217c9e14..373b85374c42d2743c64858c629a322ad6c41b83 100644 (file)
--- a/src/include/commands/collationcmds.h
+++ b/src/include/commands/collationcmds.h
@@ -16,7 +16,7 @@
 #define COLLATIONCMDS_H
 
 #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 5615b5ecac50b69aa8f4f16964601b740c30138a..7629230254248feec36e3bdeb2425fdddd4fa607 100644 (file)
--- a/src/include/commands/createas.h
+++ b/src/include/commands/createas.h
@@ -16,7 +16,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 f8f6d5ffd03ca92896011a2c8ac9d81cadacecac..fb8ccfdbf53d70fbc25b25f54a03e759e37c394c 100644 (file)
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -17,7 +17,7 @@
 #include "access/xlogreader.h"
 #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 5cd6975a225e5b8a260f046bbdf9090cb73021d3..08ca6ac31e8d328db1d7f04e31bae9b25b074b60 100644 (file)
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -16,7 +16,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 7923cdc250db87ee46c9246a6dd6c531b48065b1..8b06df02a7209a690b9b61234a5a8fa84e931f66 100644 (file)
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -15,7 +15,7 @@
 #define EXTENSION_H
 
 #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 c27d255d8da0bb7534bf6bd9375f10dec472cd75..2779bea5c988841675e438a578bf7bbf6d0816de 100644 (file)
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -18,7 +18,7 @@
 #include "catalog/pg_class.h"
 #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 26e76f6a5124300aea1c7eedf109d40c2c94bd1c..99d11c8e3b7a1d836c295c5dba08140f416e62f3 100644 (file)
--- 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"