diff options
Diffstat (limited to 'src/include')
29 files changed, 41 insertions, 41 deletions
diff --git a/src/include/access/tsmapi.h b/src/include/access/tsmapi.h index f39c55d8d6..a5c0b4cafe 100644 --- a/src/include/access/tsmapi.h +++ b/src/include/access/tsmapi.h @@ -13,7 +13,7 @@ #define TSMAPI_H #include "nodes/execnodes.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 3831cceedf..537fe5cef0 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -87,7 +87,7 @@ extern PGDLLIMPORT ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook; /* * prototypes from functions in execAmi.c */ -struct Path; /* avoid including relation.h here */ +struct Path; /* avoid including pathnodes.h here */ extern void ExecReScan(PlanState *node); extern void ExecMarkPos(PlanState *node); diff --git a/src/include/executor/nodeCustom.h b/src/include/executor/nodeCustom.h index 0ef5870006..3c1dd19a4a 100644 --- a/src/include/executor/nodeCustom.h +++ b/src/include/executor/nodeCustom.h @@ -14,7 +14,6 @@ #include "access/parallel.h" #include "nodes/execnodes.h" -#include "nodes/extensible.h" /* * General executor code diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h index e19d53a41f..01c95c3267 100644 --- a/src/include/foreign/fdwapi.h +++ b/src/include/foreign/fdwapi.h @@ -14,7 +14,7 @@ #include "access/parallel.h" #include "nodes/execnodes.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* To avoid including explain.h here, reference ExplainState thus: */ struct ExplainState; diff --git a/src/include/nodes/extensible.h b/src/include/nodes/extensible.h index 7f9b6d8052..58878edba2 100644 --- a/src/include/nodes/extensible.h +++ b/src/include/nodes/extensible.h @@ -17,8 +17,8 @@ #include "access/parallel.h" #include "commands/explain.h" #include "nodes/execnodes.h" +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" /* maximum length of an extensible node identifier */ #define EXTNODENAME_MAX_LEN 64 diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 4808a9e76d..fbe2dc14a7 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -215,7 +215,7 @@ typedef enum NodeTag T_DomainConstraintState, /* - * TAGS FOR PLANNER NODES (relation.h) + * TAGS FOR PLANNER NODES (pathnodes.h) */ T_PlannerInfo, T_PlannerGlobal, @@ -741,7 +741,7 @@ typedef enum JoinType * AggStrategy - * overall execution strategies for Agg plan nodes * - * This is needed in both plannodes.h and relation.h, so put it here... + * This is needed in both pathnodes.h and plannodes.h, so put it here... */ typedef enum AggStrategy { @@ -755,7 +755,7 @@ typedef enum AggStrategy * AggSplit - * splitting (partial aggregation) modes for Agg plan nodes * - * This is needed in both plannodes.h and relation.h, so put it here... + * This is needed in both pathnodes.h and plannodes.h, so put it here... */ /* Primitive options supported by nodeAgg.c: */ @@ -785,7 +785,7 @@ typedef enum AggSplit * SetOpCmd and SetOpStrategy - * overall semantics and execution strategies for SetOp plan nodes * - * This is needed in both plannodes.h and relation.h, so put it here... + * This is needed in both pathnodes.h and plannodes.h, so put it here... */ typedef enum SetOpCmd { diff --git a/src/include/nodes/relation.h b/src/include/nodes/pathnodes.h index 7917b889ae..d3c477a542 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/pathnodes.h @@ -1,18 +1,18 @@ /*------------------------------------------------------------------------- * - * relation.h - * Definitions for planner's internal data structures. + * pathnodes.h + * Definitions for planner's internal data structures, especially Paths. * * * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/include/nodes/relation.h + * src/include/nodes/pathnodes.h * *------------------------------------------------------------------------- */ -#ifndef RELATION_H -#define RELATION_H +#ifndef PATHNODES_H +#define PATHNODES_H #include "access/sdir.h" #include "fmgr.h" @@ -2433,4 +2433,4 @@ typedef struct JoinCostWorkspace double inner_rows_total; } JoinCostWorkspace; -#endif /* RELATION_H */ +#endif /* PATHNODES_H */ diff --git a/src/include/optimizer/appendinfo.h b/src/include/optimizer/appendinfo.h index 604e36d73c..790914c1b0 100644 --- a/src/include/optimizer/appendinfo.h +++ b/src/include/optimizer/appendinfo.h @@ -14,7 +14,7 @@ #ifndef APPENDINFO_H #define APPENDINFO_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" #include "utils/relcache.h" extern AppendRelInfo *make_append_rel_info(Relation parentrel, diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index cfedd424ce..23073c0402 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -15,7 +15,7 @@ #define CLAUSES_H #include "access/htup.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" typedef struct { diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 48efbe58f7..ac6de0f6be 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -14,8 +14,8 @@ #ifndef COST_H #define COST_H +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" /* defaults for costsize.c's Cost parameters */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index dc88fbbc1b..5b3327665e 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -22,7 +22,7 @@ #ifndef GEQO_H #define GEQO_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" #include "optimizer/geqo_gene.h" diff --git a/src/include/optimizer/inherit.h b/src/include/optimizer/inherit.h index b2687abd4e..d2418f15cf 100644 --- a/src/include/optimizer/inherit.h +++ b/src/include/optimizer/inherit.h @@ -14,7 +14,7 @@ #ifndef INHERIT_H #define INHERIT_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern void expand_inherited_tables(PlannerInfo *root); diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 6598174331..c6e4be6cf4 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -14,7 +14,7 @@ #ifndef JOININFO_H #define JOININFO_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern bool have_relevant_joinclause(PlannerInfo *root, diff --git a/src/include/optimizer/optimizer.h b/src/include/optimizer/optimizer.h index 1cd5c80e76..ffaf5b9450 100644 --- a/src/include/optimizer/optimizer.h +++ b/src/include/optimizer/optimizer.h @@ -25,10 +25,10 @@ #include "nodes/parsenodes.h" /* - * We don't want to include nodes/relation.h here, because non-planner + * We don't want to include nodes/pathnodes.h here, because non-planner * code should generally treat PlannerInfo as an opaque typedef. * But we'd like such code to use that typedef name, so define the - * typedef either here or in relation.h, whichever is read first. + * typedef either here or in pathnodes.h, whichever is read first. */ #ifndef HAVE_PLANNERINFO_TYPEDEF typedef struct PlannerInfo PlannerInfo; diff --git a/src/include/optimizer/orclauses.h b/src/include/optimizer/orclauses.h index 8ccb98e567..b527900189 100644 --- a/src/include/optimizer/orclauses.h +++ b/src/include/optimizer/orclauses.h @@ -14,7 +14,7 @@ #ifndef ORCLAUSES_H #define ORCLAUSES_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern void extract_restriction_or_clauses(PlannerInfo *root); diff --git a/src/include/optimizer/paramassign.h b/src/include/optimizer/paramassign.h index d18c85c938..e18f420eb4 100644 --- a/src/include/optimizer/paramassign.h +++ b/src/include/optimizer/paramassign.h @@ -13,7 +13,7 @@ #ifndef PARAMASSIGN_H #define PARAMASSIGN_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern Param *replace_outer_var(PlannerInfo *root, Var *var); extern Param *replace_outer_placeholdervar(PlannerInfo *root, diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index aaaf3f4ff5..d0c8f99d0a 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -15,7 +15,7 @@ #define PATHNODE_H #include "nodes/bitmapset.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 666217c189..1b02b3b889 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -14,7 +14,7 @@ #ifndef PATHS_H #define PATHS_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h index c7764a7226..86a1e5d039 100644 --- a/src/include/optimizer/placeholder.h +++ b/src/include/optimizer/placeholder.h @@ -14,7 +14,7 @@ #ifndef PLACEHOLDER_H #define PLACEHOLDER_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern PlaceHolderVar *make_placeholder_expr(PlannerInfo *root, Expr *expr, diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index a1b23251a1..40f70f9f2b 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -14,7 +14,7 @@ #ifndef PLANCAT_H #define PLANCAT_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" #include "utils/relcache.h" /* Hook for plugins to get control in get_relation_info() */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index b2e1c07732..3bbdb5e2f7 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -14,8 +14,8 @@ #ifndef PLANMAIN_H #define PLANMAIN_H +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" /* GUC parameters */ #define DEFAULT_CURSOR_TUPLE_FRACTION 0.1 diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 769a2f8e01..cb41e409dc 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -18,8 +18,8 @@ #ifndef PLANNER_H #define PLANNER_H +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" /* Hook for plugins to get control in planner() */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 5277e990ed..a9b2c9026c 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -14,8 +14,8 @@ #ifndef PREP_H #define PREP_H +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" /* diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index bca480f446..feeaf0e674 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -14,7 +14,7 @@ #ifndef RESTRICTINFO_H #define RESTRICTINFO_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* Convenience macro for the common case of a valid-everywhere qual */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 22959ff423..2d2c3bcbc0 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -13,8 +13,8 @@ #ifndef SUBSELECT_H #define SUBSELECT_H +#include "nodes/pathnodes.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" extern void SS_process_ctes(PlannerInfo *root); extern JoinExpr *convert_ANY_sublink_to_join(PlannerInfo *root, diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 13ac7b88b4..58db79203b 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -14,7 +14,7 @@ #ifndef TLIST_H #define TLIST_H -#include "nodes/relation.h" +#include "nodes/pathnodes.h" extern TargetEntry *tlist_member(Expr *node, List *targetlist); diff --git a/src/include/partitioning/partprune.h b/src/include/partitioning/partprune.h index ce9bc8d9fd..397ffaab36 100644 --- a/src/include/partitioning/partprune.h +++ b/src/include/partitioning/partprune.h @@ -15,7 +15,8 @@ #define PARTPRUNE_H #include "nodes/execnodes.h" -#include "nodes/relation.h" +struct PlannerInfo; /* avoid including pathnodes.h here */ +struct RelOptInfo; /* @@ -71,12 +72,12 @@ typedef struct PartitionPruneContext #define PruneCxtStateIdx(partnatts, step_id, keyno) \ ((partnatts) * (step_id) + (keyno)) -extern PartitionPruneInfo *make_partition_pruneinfo(PlannerInfo *root, - RelOptInfo *parentrel, +extern PartitionPruneInfo *make_partition_pruneinfo(struct PlannerInfo *root, + struct RelOptInfo *parentrel, List *subpaths, List *partitioned_rels, List *prunequal); -extern Relids prune_append_rel_partitions(RelOptInfo *rel); +extern Bitmapset *prune_append_rel_partitions(struct RelOptInfo *rel); extern Bitmapset *get_matching_partitions(PartitionPruneContext *context, List *pruning_steps); diff --git a/src/include/statistics/statistics.h b/src/include/statistics/statistics.h index 02d1efb54d..4876e9523f 100644 --- a/src/include/statistics/statistics.h +++ b/src/include/statistics/statistics.h @@ -14,7 +14,7 @@ #define STATISTICS_H #include "commands/vacuum.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" #define STATS_MAX_DIMENSIONS 8 /* max number of attributes */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 5cc4cf15e2..6b1ef91af6 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -17,7 +17,7 @@ #include "fmgr.h" #include "access/htup.h" -#include "nodes/relation.h" +#include "nodes/pathnodes.h" /* |