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

Commit b93f5a5

Browse files
committed
Move Trigger and TriggerDesc structs out of rel.h into a new reltrigger.h
This lets us stop including rel.h into execnodes.h, which is a widely used header.
1 parent d665162 commit b93f5a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+144
-65
lines changed

contrib/dblink/dblink.c

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
#include "utils/hsearch.h"
6464
#include "utils/lsyscache.h"
6565
#include "utils/memutils.h"
66+
#include "utils/rel.h"
6667
#include "utils/syscache.h"
6768
#include "utils/tqual.h"
6869

contrib/file_fdw/file_fdw.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "foreign/foreign.h"
2525
#include "miscadmin.h"
2626
#include "optimizer/cost.h"
27+
#include "utils/rel.h"
2728

2829
PG_MODULE_MAGIC;
2930

contrib/lo/lo.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77

88
#include "postgres.h"
99

10-
/* Required for SPI */
10+
#include "commands/trigger.h"
1111
#include "executor/spi.h"
12-
13-
/* Required for largeobjects */
1412
#include "libpq/be-fsstubs.h"
1513
#include "libpq/libpq-fs.h"
14+
#include "utils/rel.h"
1615

17-
/* Required for triggers */
18-
#include "commands/trigger.h"
1916

2017
PG_MODULE_MAGIC;
2118

contrib/pageinspect/btreefuncs.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "miscadmin.h"
3636
#include "storage/bufmgr.h"
3737
#include "utils/builtins.h"
38+
#include "utils/rel.h"
3839

3940

4041
extern Datum bt_metap(PG_FUNCTION_ARGS);

contrib/pageinspect/rawpage.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "miscadmin.h"
2626
#include "storage/bufmgr.h"
2727
#include "utils/builtins.h"
28+
#include "utils/rel.h"
2829

2930
PG_MODULE_MAGIC;
3031

contrib/pgrowlocks/pgrowlocks.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "storage/procarray.h"
3636
#include "utils/acl.h"
3737
#include "utils/builtins.h"
38+
#include "utils/rel.h"
3839
#include "utils/tqual.h"
3940

4041

contrib/pgstattuple/pgstatindex.c

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "miscadmin.h"
3535
#include "storage/bufmgr.h"
3636
#include "utils/builtins.h"
37+
#include "utils/rel.h"
3738

3839

3940
extern Datum pgstatindex(PG_FUNCTION_ARGS);

contrib/spi/autoinc.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "commands/trigger.h"
99
#include "executor/spi.h"
1010
#include "utils/builtins.h"
11+
#include "utils/rel.h"
1112

1213
PG_MODULE_MAGIC;
1314

contrib/spi/insert_username.c

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "executor/spi.h"
1414
#include "miscadmin.h"
1515
#include "utils/builtins.h"
16+
#include "utils/rel.h"
1617

1718
PG_MODULE_MAGIC;
1819

contrib/spi/moddatetime.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
1818
#include "catalog/pg_type.h"
1919
#include "executor/spi.h"
2020
#include "commands/trigger.h"
21+
#include "utils/rel.h"
2122

2223
PG_MODULE_MAGIC;
2324

contrib/spi/refint.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "commands/trigger.h"
1313
#include "executor/spi.h"
1414
#include "utils/builtins.h"
15+
#include "utils/rel.h"
1516

1617
PG_MODULE_MAGIC;
1718

contrib/spi/timetravel.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "miscadmin.h"
1818
#include "utils/builtins.h"
1919
#include "utils/nabstime.h"
20+
#include "utils/rel.h"
2021

2122
PG_MODULE_MAGIC;
2223

src/backend/access/gin/ginfast.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "miscadmin.h"
2525
#include "storage/bufmgr.h"
2626
#include "utils/memutils.h"
27+
#include "utils/rel.h"
2728

2829

2930
#define GIN_PAGE_FREESIZE \

src/backend/access/gin/gininsert.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "storage/smgr.h"
2222
#include "storage/indexfsm.h"
2323
#include "utils/memutils.h"
24+
#include "utils/rel.h"
2425

2526

2627
typedef struct

src/backend/access/gist/gist.c

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "storage/bufmgr.h"
2323
#include "storage/indexfsm.h"
2424
#include "utils/memutils.h"
25+
#include "utils/rel.h"
2526

2627
/* Working state for gistbuild and its callback */
2728
typedef struct

src/backend/access/gist/gistget.c

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "storage/bufmgr.h"
2323
#include "utils/builtins.h"
2424
#include "utils/memutils.h"
25+
#include "utils/rel.h"
2526

2627

2728
/*

src/backend/access/hash/hash.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "optimizer/cost.h"
2626
#include "optimizer/plancat.h"
2727
#include "storage/bufmgr.h"
28+
#include "utils/rel.h"
2829

2930

3031
/* Working state for hashbuild and its callback */

src/backend/access/hash/hashutil.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "executor/execdebug.h"
2121
#include "storage/bufmgr.h"
2222
#include "utils/lsyscache.h"
23+
#include "utils/rel.h"
2324

2425

2526
/*

src/backend/access/nbtree/nbtutils.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "storage/lwlock.h"
2828
#include "storage/shmem.h"
2929
#include "utils/lsyscache.h"
30+
#include "utils/rel.h"
3031

3132

3233
static bool _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,

src/backend/bootstrap/bootstrap.c

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "utils/fmgroids.h"
4444
#include "utils/memutils.h"
4545
#include "utils/ps_status.h"
46+
#include "utils/rel.h"
4647
#include "utils/relmapper.h"
4748
#include "utils/tqual.h"
4849

src/backend/catalog/heap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
#include "utils/fmgroids.h"
7171
#include "utils/inval.h"
7272
#include "utils/lsyscache.h"
73-
#include "utils/relcache.h"
73+
#include "utils/rel.h"
7474
#include "utils/snapmgr.h"
7575
#include "utils/syscache.h"
7676
#include "utils/tqual.h"

src/backend/catalog/indexing.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "catalog/index.h"
2020
#include "catalog/indexing.h"
2121
#include "executor/executor.h"
22+
#include "utils/rel.h"
2223

2324

2425
/*

src/backend/catalog/pg_proc.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "utils/acl.h"
3636
#include "utils/builtins.h"
3737
#include "utils/lsyscache.h"
38+
#include "utils/rel.h"
3839
#include "utils/syscache.h"
3940

4041

src/backend/catalog/toasting.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "miscadmin.h"
3030
#include "nodes/makefuncs.h"
3131
#include "utils/builtins.h"
32+
#include "utils/rel.h"
3233
#include "utils/syscache.h"
3334

3435
/* Potentially set by contrib/pg_upgrade_support functions */

src/backend/commands/alter.c

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "utils/acl.h"
3939
#include "utils/builtins.h"
4040
#include "utils/lsyscache.h"
41+
#include "utils/rel.h"
4142
#include "utils/syscache.h"
4243

4344

src/backend/commands/constraint.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "commands/trigger.h"
1818
#include "executor/executor.h"
1919
#include "utils/builtins.h"
20+
#include "utils/rel.h"
2021
#include "utils/tqual.h"
2122

2223

src/backend/commands/copy.c

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "utils/builtins.h"
4343
#include "utils/lsyscache.h"
4444
#include "utils/memutils.h"
45+
#include "utils/rel.h"
4546
#include "utils/snapmgr.h"
4647

4748

src/backend/commands/explain.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
3232
#include "utils/builtins.h"
3333
#include "utils/guc.h"
3434
#include "utils/lsyscache.h"
35-
#include "utils/tuplesort.h"
35+
#include "utils/rel.h"
3636
#include "utils/snapmgr.h"
37+
#include "utils/tuplesort.h"
3738
#include "utils/xml.h"
3839

3940

src/backend/commands/extension.c

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include "utils/fmgroids.h"
5252
#include "utils/guc.h"
5353
#include "utils/lsyscache.h"
54+
#include "utils/rel.h"
5455
#include "utils/snapmgr.h"
5556
#include "utils/tqual.h"
5657

src/backend/commands/schemacmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "utils/acl.h"
3030
#include "utils/builtins.h"
3131
#include "utils/lsyscache.h"
32+
#include "utils/rel.h"
3233
#include "utils/syscache.h"
3334

3435

src/backend/commands/trigger.c

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include "utils/inval.h"
5252
#include "utils/lsyscache.h"
5353
#include "utils/memutils.h"
54+
#include "utils/rel.h"
5455
#include "utils/snapmgr.h"
5556
#include "utils/syscache.h"
5657
#include "utils/tqual.h"

src/backend/commands/typecmds.c

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
#include "utils/fmgroids.h"
6464
#include "utils/lsyscache.h"
6565
#include "utils/memutils.h"
66+
#include "utils/rel.h"
6667
#include "utils/syscache.h"
6768
#include "utils/tqual.h"
6869

src/backend/executor/execAmi.c

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "executor/nodeWindowAgg.h"
4949
#include "executor/nodeWorktablescan.h"
5050
#include "nodes/nodeFuncs.h"
51+
#include "utils/rel.h"
5152
#include "utils/syscache.h"
5253

5354

src/backend/executor/execCurrent.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "utils/builtins.h"
1919
#include "utils/lsyscache.h"
2020
#include "utils/portal.h"
21+
#include "utils/rel.h"
2122

2223

2324
static char *fetch_cursor_param_value(ExprContext *econtext, int paramId);

src/backend/executor/nodeBitmapHeapscan.c

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "storage/bufmgr.h"
4545
#include "storage/predicate.h"
4646
#include "utils/memutils.h"
47+
#include "utils/rel.h"
4748
#include "utils/snapmgr.h"
4849
#include "utils/tqual.h"
4950

src/backend/executor/nodeForeignscan.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "executor/executor.h"
2626
#include "executor/nodeForeignscan.h"
2727
#include "foreign/fdwapi.h"
28+
#include "utils/rel.h"
2829

2930
static TupleTableSlot *ForeignNext(ForeignScanState *node);
3031
static bool ForeignRecheck(ForeignScanState *node, TupleTableSlot *slot);

src/backend/executor/nodeIndexscan.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "utils/array.h"
3434
#include "utils/lsyscache.h"
3535
#include "utils/memutils.h"
36+
#include "utils/rel.h"
3637

3738

3839
static TupleTableSlot *IndexNext(IndexScanState *node);

src/backend/executor/nodeLockRows.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "executor/executor.h"
2626
#include "executor/nodeLockRows.h"
2727
#include "storage/bufmgr.h"
28+
#include "utils/rel.h"
2829
#include "utils/tqual.h"
2930

3031

src/backend/executor/nodeMergeAppend.c

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "executor/execdebug.h"
4343
#include "executor/nodeMergeAppend.h"
4444
#include "utils/lsyscache.h"
45+
#include "utils/rel.h"
4546

4647
/*
4748
* It gets quite confusing having a heap array (indexed by integers) which

src/backend/executor/nodeModifyTable.c

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "storage/bufmgr.h"
4747
#include "utils/builtins.h"
4848
#include "utils/memutils.h"
49+
#include "utils/rel.h"
4950
#include "utils/tqual.h"
5051

5152

src/backend/executor/nodeSeqscan.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "access/relscan.h"
2929
#include "executor/execdebug.h"
3030
#include "executor/nodeSeqscan.h"
31+
#include "utils/rel.h"
3132

3233
static void InitScanRelation(SeqScanState *node, EState *estate);
3334
static TupleTableSlot *SeqNext(SeqScanState *node);

src/backend/executor/nodeTidscan.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "optimizer/clauses.h"
3333
#include "storage/bufmgr.h"
3434
#include "utils/array.h"
35+
#include "utils/rel.h"
3536

3637

3738
#define IsCTIDVar(node) \

src/backend/executor/spi.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "utils/datum.h"
2929
#include "utils/lsyscache.h"
3030
#include "utils/memutils.h"
31+
#include "utils/rel.h"
3132
#include "utils/snapmgr.h"
3233
#include "utils/syscache.h"
3334
#include "utils/typcache.h"

src/backend/optimizer/plan/planner.c

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "parser/parse_oper.h"
4242
#include "parser/parsetree.h"
4343
#include "utils/lsyscache.h"
44+
#include "utils/rel.h"
4445
#include "utils/syscache.h"
4546

4647

src/backend/optimizer/util/predtest.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
#include "postgres.h"
1717

18+
#include "catalog/pg_am.h"
1819
#include "catalog/pg_amop.h"
1920
#include "catalog/pg_proc.h"
2021
#include "catalog/pg_type.h"

src/backend/parser/parse_relation.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "parser/parse_type.h"
3030
#include "utils/builtins.h"
3131
#include "utils/lsyscache.h"
32+
#include "utils/rel.h"
3233
#include "utils/syscache.h"
3334

3435

src/backend/parser/parse_target.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "parser/parse_type.h"
3030
#include "utils/builtins.h"
3131
#include "utils/lsyscache.h"
32+
#include "utils/rel.h"
3233
#include "utils/typcache.h"
3334

3435

src/backend/parser/parse_utilcmd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#include "utils/acl.h"
6060
#include "utils/builtins.h"
6161
#include "utils/lsyscache.h"
62-
#include "utils/relcache.h"
62+
#include "utils/rel.h"
6363
#include "utils/syscache.h"
6464
#include "utils/typcache.h"
6565

0 commit comments

Comments
 (0)