aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/executor/execAmi.c3
-rw-r--r--src/backend/executor/nodeCustom.c1
-rw-r--r--src/backend/nodes/README2
-rw-r--r--src/backend/nodes/copyfuncs.c4
-rw-r--r--src/backend/nodes/equalfuncs.c4
-rw-r--r--src/backend/nodes/nodeFuncs.c2
-rw-r--r--src/backend/nodes/outfuncs.c4
-rw-r--r--src/backend/nodes/print.c2
-rw-r--r--src/backend/optimizer/path/costsize.c4
-rw-r--r--src/backend/optimizer/util/predtest.c2
-rw-r--r--src/backend/rewrite/rewriteManip.c2
-rw-r--r--src/backend/statistics/dependencies.c2
-rw-r--r--src/backend/statistics/extended_stats.c1
13 files changed, 17 insertions, 16 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index cd77f9927e5..187f892421f 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -56,8 +56,9 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
+#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index eb65a6385f2..6dd0916818f 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -14,6 +14,7 @@
#include "executor/executor.h"
#include "executor/nodeCustom.h"
#include "nodes/execnodes.h"
+#include "nodes/extensible.h"
#include "nodes/plannodes.h"
#include "miscadmin.h"
#include "parser/parsetree.h"
diff --git a/src/backend/nodes/README b/src/backend/nodes/README
index 2df4389437e..dcd66d7243c 100644
--- a/src/backend/nodes/README
+++ b/src/backend/nodes/README
@@ -36,8 +36,8 @@ FILES IN src/include/nodes/
nodes.h - define node tags (NodeTag)
primnodes.h - primitive nodes
parsenodes.h - parse tree nodes
+ pathnodes.h - path tree nodes and planner internal structures
plannodes.h - plan tree nodes
- relation.h - planner internal nodes
execnodes.h - executor nodes
memnodes.h - memory nodes
pg_list.h - generic list
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 3eb7e95d641..807393dfaa4 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -24,8 +24,8 @@
#include "miscadmin.h"
#include "nodes/extensible.h"
+#include "nodes/pathnodes.h"
#include "nodes/plannodes.h"
-#include "nodes/relation.h"
#include "utils/datum.h"
#include "utils/rel.h"
@@ -2196,7 +2196,7 @@ _copyOnConflictExpr(const OnConflictExpr *from)
}
/* ****************************************************************
- * relation.h copy functions
+ * pathnodes.h copy functions
*
* We don't support copying RelOptInfo, IndexOptInfo, or Path nodes.
* There are some subsidiary structs that are useful to copy, though.
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 5c4fa7d077a..a397de155eb 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -31,7 +31,7 @@
#include "miscadmin.h"
#include "nodes/extensible.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
#include "utils/datum.h"
@@ -814,7 +814,7 @@ _equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
}
/*
- * Stuff from relation.h
+ * Stuff from pathnodes.h
*/
static bool
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index ecb9abd7fe9..1275c7168fe 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -20,7 +20,7 @@
#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
#include "nodes/nodeFuncs.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 33f7939e058..9d44e3e4c63 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -32,8 +32,8 @@
#include "lib/stringinfo.h"
#include "miscadmin.h"
#include "nodes/extensible.h"
+#include "nodes/pathnodes.h"
#include "nodes/plannodes.h"
-#include "nodes/relation.h"
#include "utils/datum.h"
#include "utils/rel.h"
@@ -1676,7 +1676,7 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
/*****************************************************************************
*
- * Stuff from relation.h.
+ * Stuff from pathnodes.h.
*
*****************************************************************************/
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 6d6da5299fa..4b9e141404c 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -22,8 +22,8 @@
#include "access/printtup.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
+#include "nodes/pathnodes.h"
#include "nodes/print.h"
-#include "nodes/relation.h"
#include "parser/parsetree.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 532de4484fa..b8d406f230c 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -540,7 +540,7 @@ cost_index(IndexPath *path, PlannerInfo *root, double loop_count,
* for scanning the index, as well as the selectivity of the index (ie,
* the fraction of main-table tuples we will have to retrieve) and its
* correlation to the main-table tuple order. We need a cast here because
- * relation.h uses a weak function type to avoid including amapi.h.
+ * pathnodes.h uses a weak function type to avoid including amapi.h.
*/
amcostestimate = (amcostestimate_function) index->amcostestimate;
amcostestimate(root, path, loop_count,
@@ -4072,7 +4072,7 @@ get_restriction_qual_cost(PlannerInfo *root, RelOptInfo *baserel,
* sjinfo: SpecialJoinInfo relevant to this join
* restrictlist: join quals
* Output parameters:
- * *semifactors is filled in (see relation.h for field definitions)
+ * *semifactors is filled in (see pathnodes.h for field definitions)
*/
void
compute_semi_anti_join_factors(PlannerInfo *root,
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index 3b260b1e3c4..01f64eeab56 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -21,7 +21,7 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
#include "optimizer/optimizer.h"
#include "utils/array.h"
#include "utils/inval.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 57aee3d760c..8fa5c11cc71 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -16,8 +16,8 @@
#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
+#include "nodes/pathnodes.h"
#include "nodes/plannodes.h"
-#include "nodes/relation.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 13492ceb9ce..96916eafe1f 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -22,7 +22,7 @@
#include "optimizer/clauses.h"
#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index 7f13e434a87..d429a531de8 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -22,7 +22,6 @@
#include "catalog/indexing.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_statistic_ext.h"
-#include "nodes/relation.h"
#include "postmaster/autovacuum.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"