8000 Rename nodes/relation.h to nodes/pathnodes.h. · postgrespro/postgres@fa2cf16 · GitHub
[go: up one dir, main page]
Skip to content

Commit fa2cf16

Browse files
tglsfdctglsfdc
committed
Rename nodes/relation.h to nodes/pathnodes.h.
The old name of this file was never a very good indication of what it was for. Now that there's also access/relation.h, we have a potential confusion hazard as well, so let's rename it to something more apropos. Per discussion, "pathnodes.h" is reasonable, since a good fraction of the file is Path node definitions. While at it, tweak a couple of other headers that were gratuitously importing relation.h into modules that don't need it. Discussion: https://postgr.es/m/7719.1548688728@sss.pgh.pa.us
1 parent f09346a commit fa2cf16

Some content is hidden

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

44 files changed

+60
-59
lines changed

‎contrib/bloom/bloom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "access/generic_xlog.h"
1818
#include "access/itup.h"
1919
#include "access/xlog.h"
20-
#include "nodes/relation.h"
20+
#include "nodes/pathnodes.h"
2121
#include "fmgr.h"
2222

2323
/* Support procedures numbers */

‎contrib/postgres_fdw/postgres_fdw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "foreign/foreign.h"
1717
#include "lib/stringinfo.h"
18-
#include "nodes/relation.h"
18+
#include "nodes/pathnodes.h"
1919
#include "utils/relcache.h"
2020

2121
#include "libpq-fe.h"

‎src/backend/executor/execAmi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@
5656
#include "executor/nodeValuesscan.h"
5757
#include "executor/nodeWindowAgg.h"
5858
#include "executor/nodeWorktablescan.h"
59+
#include "nodes/extensible.h"
5960
#include "nodes/nodeFuncs.h"
60-
#include "nodes/relation.h"
61+
#include "nodes/pathnodes.h"
6162
#include "utils/rel.h"
6263
#include "utils/syscache.h"
6364

‎src/backend/executor/nodeCustom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "executor/executor.h"
1515
#include "executor/nodeCustom.h"
1616
#include "nodes/execnodes.h"
17+
#include "nodes/extensible.h"
1718
#include "nodes/plannodes.h"
1819
#include "miscadmin.h"
1920
#include "parser/parsetree.h"

‎src/backend/nodes/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ FILES IN src/include/nodes/
3636
nodes.h - define node tags (NodeTag)
3737
primnodes.h - primitive nodes
3838
parsenodes.h - parse tree nodes
39+
pathnodes.h - path tree nodes and planner internal structures
3940
plannodes.h - plan tree nodes
40-
relation.h - planner internal nodes
4141
execnodes.h - executor nodes
4242
memnodes.h - memory nodes
4343
pg_list.h - generic list

‎src/backend/nodes/copyfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include "miscadmin.h"
2626
#include "nodes/extensible.h"
27+
#include "nodes/pathnodes.h"
2728
#include "nodes/plannodes.h"
28-
#include "nodes/relation.h"
2929
#include "utils/datum.h"
3030
#include "utils/rel.h"
3131

@@ -2196,7 +2196,7 @@ _copyOnConflictExpr(const OnConflictExpr *from)
21962196
}
21972197

21982198
/* ****************************************************************
2199-
* relation.h copy functions
2199+
* pathnodes.h copy functions
22002200
*
22012201
* We don't support copying RelOptInfo, IndexOptInfo, or Path nodes.
22022202
* There are some subsidiary structs that are useful to copy, though.

‎src/backend/nodes/equalfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include "miscadmin.h"
3333
#include "nodes/extensible.h"
34-
#include "nodes/relation.h"
34+
#include "nodes/pathnodes.h"
3535
#include "utils/datum.h"
3636

3737

@@ -814,7 +814,7 @@ _equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
814814
}
815815

816816
/*
817-
* Stuff from relation.h
817+
* Stuff from pathnodes.h
818818
*/
819819

820820
static bool

‎src/backend/nodes/nodeFuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "nodes/makefuncs.h"
2121
#include "nodes/execnodes.h"
2222
#include "nodes/nodeFuncs.h"
23-
#include "nodes/relation.h"
23+
#include "nodes/pathnodes.h"
2424
#include "utils/builtins.h"
2525
#include "utils/lsyscache.h"
2626

‎src/backend/nodes/outfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "lib/stringinfo.h"
3333
#include "miscadmin.h"
3434
#include "nodes/extensible.h"
35+
#include "nodes/pathnodes.h"
3536
#include "nodes/plannodes.h"
36-
#include "nodes/relation.h"
3737
#include "utils/datum.h"
3838
#include "utils/rel.h"
3939

@@ -1676,7 +1676,7 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
16761676

16771677
/*****************************************************************************
16781678
*
1679-
* Stuff from relation.h.
1679+
* Stuff from pathnodes.h.
16801680
*
16811681
*****************************************************************************/
16821682

‎src/backend/nodes/print.c

Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "access/printtup.h"
2323
#include "lib/stringinfo.h"
2424
#include "nodes/nodeFuncs.h"
25+
#include "nodes/pathnodes.h"
2526
#include "nodes/print.h"
26-
#include "nodes/relation.h"
2727
#include "parser/parsetree.h"
2828
#include "utils/lsyscache.h"
2929

0 commit comments

Comments
 (0)
0