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

Commit 3c173a5

Browse files
committed
Remove utils/acl.h from catalog/objectaddress.h
The need for this was removed by 8b9e964. 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
1 parent 17b9e7f commit 3c173a5

31 files changed

+32
-8
lines changed

contrib/adminpack/adminpack.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "miscadmin.h"
2525
#include "postmaster/syslogger.h"
2626
#include "storage/fd.h"
27+
#include "utils/acl.h"
2728
#include "utils/builtins.h"
2829
#include "utils/datetime.h"
2930

contrib/file_fdw/file_fdw.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "optimizer/pathnode.h"
3434
#include "optimizer/planmain.h"
3535
#include "optimizer/restrictinfo.h"
36+
#include "utils/acl.h"
3637
#include "utils/memutils.h"
3738
#include "utils/rel.h"
3839
#include "utils/sampling.h"

src/backend/access/brin/brin.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "postmaster/autovacuum.h"
3434
#include "storage/bufmgr.h"
3535
#include "storage/freespace.h"
36+
#include "utils/acl.h"
3637
#include "utils/builtins.h"
3738
#include "utils/index_selfuncs.h"
3839
#include "utils/memutils.h"

src/backend/catalog/dependency.c

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
#include "parser/parsetree.h"
7878
#include "rewrite/rewriteRemove.h"
7979
#include "storage/lmgr.h"
80+
#include "utils/acl.h"
8081
#include "utils/fmgroids.h"
8182
#include "utils/guc.h"
8283
#include "utils/lsyscache.h"

src/backend/catalog/objectaddress.c

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
#include "storage/large_object.h"
8282
#include "storage/lmgr.h"
8383
#include "storage/sinval.h"
84+
#include "utils/acl.h"
8485
#include "utils/builtins.h"
8586
#include "utils/fmgroids.h"
8687
#include "utils/lsyscache.h"

src/backend/commands/collationcmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "commands/defrem.h"
3030
#include "mb/pg_wchar.h"
3131
#include "miscadmin.h"
32+
#include "utils/acl.h"
3233
#include "utils/builtins.h"
3334
#include "utils/lsyscache.h"
3435
#include "utils/pg_locale.h"

src/backend/commands/conversioncmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "mb/pg_wchar.h"
2525
#include "miscadmin.h"
2626
#include "parser/parse_func.h"
27+
#include "utils/acl.h"
2728
#include "utils/builtins.h"
2829
#include "utils/lsyscache.h"
2930
#include "utils/rel.h"

src/backend/commands/copy.c

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#include "rewrite/rewriteHandler.h"
5050
#include "storage/fd.h"
5151
#include "tcop/tcopprot.h"
52+
#include "utils/acl.h"
5253
#include "utils/builtins.h"
5354
#include "utils/lsyscache.h"
5455
#include "utils/memutils.h"

src/backend/commands/dropcmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "miscadmin.h"
2727
#include "nodes/makefuncs.h"
2828
#include "parser/parse_type.h"
29+
#include "utils/acl.h"
2930
#include "utils/builtins.h"
3031
#include "utils/lsyscache.h"
3132
#include "utils/syscache.h"

src/backend/commands/operatorcmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "parser/parse_func.h"
4545
#include "parser/parse_oper.h"
4646
#include "parser/parse_type.h"
47+
#include "utils/acl.h"
4748
#include "utils/builtins.h"
4849
#include "utils/lsyscache.h"
4950
#include "utils/rel.h"

src/backend/commands/publicationcmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "commands/publicationcmds.h"
3434
#include "funcapi.h"
3535
#include "miscadmin.h"
36+
#include "utils/acl.h"
3637
#include "utils/array.h"
3738
#include "utils/builtins.h"
3839
#include "utils/catcache.h"

src/backend/commands/subscriptioncmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "replication/walsender.h"
3939
#include "replication/worker_internal.h"
4040
#include "storage/lmgr.h"
41+
#include "utils/acl.h"
4142
#include "utils/builtins.h"
4243
#include "utils/guc.h"
4344
#include "utils/lsyscache.h"

src/backend/executor/execExpr.c

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "nodes/nodeFuncs.h"
4343
#include "optimizer/optimizer.h"
4444
#include "pgstat.h"
45+
#include "utils/acl.h"
4546
#include "utils/array.h"
4647
#include "utils/builtins.h"
4748
#include "utils/datum.h"

src/backend/executor/execPartition.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "partitioning/partdesc.h"
2929
#include "partitioning/partprune.h"
3030
#include "rewrite/rewriteManip.h"
31+
#include "utils/acl.h"
3132
#include "utils/lsyscache.h"
3233
#include "utils/partcache.h"
3334
#include "utils/rls.h"

src/backend/replication/walreceiver.c

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
#include "storage/pmsignal.h"
6565
#include "storage/procarray.h"
6666
#include "storage/procsignal.h"
67+
#include "utils/acl.h"
6768
#include "utils/builtins.h"
6869
#include "utils/guc.h"
6970
#include "utils/pg_lsn.h"

src/backend/replication/walsender.c

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
#include "storage/procarray.h"
8686
#include "tcop/dest.h"
8787
#include "tcop/tcopprot.h"
88+
#include "utils/acl.h"
8889
#include "utils/builtins.h"
8990
#include "utils/guc.h"
9091
#include "utils/memutils.h"

src/backend/statistics/extended_stats.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "postmaster/autovacuum.h"
3434
#include "statistics/extended_stats_internal.h"
3535
#include "statistics/statistics.h"
36+
#include "utils/acl.h"
3637
#include "utils/array.h"
3738
#include "utils/builtins.h"
3839
#include "utils/fmgroids.h"

src/backend/storage/ipc/procarray.c

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#include "storage/proc.h"
6060
#include "storage/procarray.h"
6161
#include "storage/spin.h"
62+
#include "utils/acl.h"
6263
#include "utils/builtins.h"
6364
#include "utils/rel.h"
6465
#include "utils/snapmgr.h"

src/backend/storage/large_object/inv_api.c

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "libpq/libpq-fs.h"
4747
#include "miscadmin.h"
4848
#include "storage/large_object.h"
49+
#include "utils/acl.h"
4950
#include "utils/fmgroids.h"
5051
#include "utils/rel.h"
5152
#include "utils/snapmgr.h"

src/backend/utils/adt/genfile.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "miscadmin.h"
3131
#include "postmaster/syslogger.h"
3232
#include "storage/fd.h"
33+
#include "utils/acl.h"
3334
#include "utils/builtins.h"
3435
#include "utils/memutils.h"
3536
#include "utils/syscache.h"

src/backend/utils/adt/selfuncs.c

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
#include "parser/parsetree.h"
127127
#include "statistics/statistics.h"
128128
#include "storage/bufmgr.h"
129+
#include "utils/acl.h"
129130
#include "utils/builtins.h"
130131
#include "utils/date.h"
131132
#include "utils/datum.h"

src/backend/utils/misc/guc.c

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
#include "storage/standby.h"
8282
#include "tcop/tcopprot.h"
8383
#include "tsearch/ts_cache.h"
84+
#include "utils/acl.h"
8485
#include "utils/builtins.h"
8586
#include "utils/bytea.h"
8687
#include "utils/float.h"

src/include/catalog/objectaddress.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#ifndef OBJECTADDRESS_H
1414
#define OBJECTADDRESS_H
1515

16-
#include "nodes/pg_list.h"
16+
#include "access/htup.h"
17+
#include "nodes/parsenodes.h"
1718
#include "storage/lockdefs.h"
18-
#include "utils/acl.h"
1919
#include "utils/relcache.h"
2020

2121
/*

src/include/catalog/pg_namespace.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "catalog/genbki.h"
2222
#include "catalog/pg_namespace_d.h"
23+
#include "utils/acl.h"
2324

2425
/* ----------------------------------------------------------------
2526
* pg_namespace definition.

src/include/commands/collationcmds.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define COLLATIONCMDS_H
1717

1818
#include "catalog/objectaddress.h"
19-
#include "nodes/parsenodes.h"
19+
#include "parser/parse_node.h"
2020

2121
extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists);
2222
extern void IsThereCollationInNamespace(const char *collname, Oid nspOid);

src/include/commands/createas.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "catalog/objectaddress.h"
1818
#include "nodes/params.h"
19-
#include "nodes/parsenodes.h"
19+
#include "parser/parse_node.h"
2020
#include "tcop/dest.h"
2121
#include "utils/queryenvironment.h"
2222

src/include/commands/dbcommands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "access/xlogreader.h"
1818
#include "catalog/objectaddress.h"
1919
#include "lib/stringinfo.h"
20-
#include "nodes/parsenodes.h"
20+
#include "parser/parse_node.h"
2121

2222
extern Oid createdb(ParseState *pstate, const CreatedbStmt *stmt);
2323
extern void dropdb(const char *dbname, bool missing_ok, bool force);

src/include/commands/defrem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "catalog/objectaddress.h"
1818
#include "nodes/params.h"
19-
#include "nodes/parsenodes.h"
19+
#include "parser/parse_node.h"
2020
#include "tcop/dest.h"
2121
#include "utils/array.h"
2222

src/include/commands/extension.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define EXTENSION_H
1616

1717
#include "catalog/objectaddress.h"
18-
#include "nodes/parsenodes.h"
18+
#include "parser/parse_node.h"
1919

2020

2121
/*

src/include/commands/vacuum.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "catalog/pg_class.h"
1919
#include "catalog/pg_statistic.h"
2020
#include "catalog/pg_type.h"
21-
#include "nodes/parsenodes.h"
21+
#include "parser/parse_node.h"
2222
#include "storage/buf.h"
2323
#include "storage/lock.h"
2424
#include "utils/relcache.h"

src/pl/tcl/pltcl.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "parser/parse_type.h"
3131
#include "pgstat.h"
3232
#include "tcop/tcopprot.h"
33+
#include "utils/acl.h"
3334
#include "utils/builtins.h"
3435
#include "utils/lsyscache.h"
3536
#include "utils/memutils.h"

0 commit comments

Comments
 (0)