diff options
Diffstat (limited to 'src/backend/optimizer')
26 files changed, 33 insertions, 58 deletions
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 34cc53af53e..12cffb66415 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -35,11 +35,13 @@ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(CX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* cx * * cycle crossover diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 21ad7854118..af289f7eeb7 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -32,11 +32,13 @@ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(ERX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + static int gimme_edge(PlannerInfo *root, Gene gene1, Gene gene2, Edge *edge_table); static void remove_gene(PlannerInfo *root, Gene gene, Edge edge, Edge *edge_table); static Gene gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table); diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index 47090a138b2..0c5540e2af4 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -26,10 +26,15 @@ #include <math.h> +#include "optimizer/geqo.h" + #include "optimizer/geqo_misc.h" +#if defined(CX) #include "optimizer/geqo_mutation.h" +#endif #include "optimizer/geqo_pool.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_selection.h" diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index 2af0295d694..56e8445e4ea 100644 --- a/src/backend/optimizer/geqo/geqo_mutation.c +++ b/src/backend/optimizer/geqo/geqo_mutation.c @@ -32,11 +32,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_mutation.h" -#include "optimizer/geqo_random.h" +#include "optimizer/geqo.h" #if defined(CX) /* currently used only in CX mode */ +#include "optimizer/geqo_mutation.h" +#include "optimizer/geqo_random.h" + void geqo_mutation(PlannerInfo *root, Gene *tour, int num_gene) { diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index ede7abb4177..a5487269778 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(OX1) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* ox1 * * position crossover diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index 080dbc076cc..6b703576f5a 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(OX2) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* ox2 * * position crossover diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index e44fd0bae5a..01d55711925 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(PMX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* pmx * * partially matched crossover diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index 914296b53d2..662a17c8437 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(PX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* px * * position crossover diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index d404fbf262c..0b98f0856e9 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -35,18 +35,15 @@ #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/geqo.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/plancat.h" #include "optimizer/planner.h" -#include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "parser/parse_clause.h" #include "parser/parsetree.h" #include "partitioning/partbounds.h" -#include "partitioning/partprune.h" #include "port/pg_bitutils.h" #include "rewrite/rewriteManip.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index c949dc18661..0ab021c1e89 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -14,10 +14,8 @@ */ #include "postgres.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 8b76e985296..83a0aed0519 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -91,7 +91,6 @@ #include "optimizer/paths.h" #include "optimizer/placeholder.h" #include "optimizer/plancat.h" -#include "optimizer/planmain.h" #include "optimizer/restrictinfo.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index da6f457a3bf..3f1a4050e74 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -19,9 +19,7 @@ #include "access/stratnum.h" #include "catalog/pg_opfamily.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "nodes/plannodes.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c index b603dcd64b9..2ae5ddfe432 100644 --- a/src/backend/optimizer/path/tidpath.c +++ b/src/backend/optimizer/path/tidpath.c @@ -42,7 +42,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index 4978758f8e1..506fccd20c9 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -24,14 +24,12 @@ #include "catalog/pg_class.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/joininfo.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" #include "optimizer/restrictinfo.h" -#include "optimizer/tlist.h" #include "utils/lsyscache.h" /* diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index d4a9d77d7f5..d3868b628d8 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "catalog/pg_class.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" @@ -28,7 +27,6 @@ #include "optimizer/placeholder.h" #include "optimizer/planmain.h" #include "optimizer/planner.h" -#include "optimizer/prep.h" #include "optimizer/restrictinfo.h" #include "parser/analyze.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index 700c0b7ac74..afb5445b77b 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -33,7 +33,6 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index ca47c7d3103..075d36c7ecc 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -22,7 +22,6 @@ #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/orclauses.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index be4e182869a..ac97575453f 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -19,18 +19,15 @@ #include <math.h> #include "access/genam.h" -#include "access/htup_details.h" #include "access/parallel.h" #include "access/sysattr.h" #include "access/table.h" -#include "access/xact.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_constraint.h" #include "catalog/pg_inherits.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/executor.h" -#include "executor/nodeAgg.h" #include "foreign/fdwapi.h" #include "jit/jit.h" #include "lib/bipartite_match.h" @@ -45,7 +42,6 @@ #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/paramassign.h" #include "optimizer/pathnode.h" @@ -61,12 +57,9 @@ #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "partitioning/partdesc.h" -#include "rewrite/rewriteManip.h" -#include "storage/dsm_impl.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" /* GUC parameters */ double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION; diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 22a1fa29f36..42603dbc7c2 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -27,7 +27,6 @@ #include "optimizer/tlist.h" #include "parser/parse_relation.h" #include "tcop/utility.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/prep/prepagg.c b/src/backend/optimizer/prep/prepagg.c index 127f25bb2f5..4606df379a8 100644 --- a/src/backend/optimizer/prep/prepagg.c +++ b/src/backend/optimizer/prep/prepagg.c @@ -39,7 +39,6 @@ #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" #include "nodes/pathnodes.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index 7ce14cc535c..cbcf83f8473 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -34,7 +34,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" -#include "optimizer/prep.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index c939b5a45fb..a5bfd7a3f70 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -24,9 +24,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/sysattr.h" -#include "catalog/partition.h" -#include "catalog/pg_inherits.h" #include "catalog/pg_type.h" #include "miscadmin.h" #include "nodes/makefuncs.h" @@ -34,16 +31,11 @@ #include "optimizer/cost.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" -#include "optimizer/planmain.h" #include "optimizer/planner.h" #include "optimizer/prep.h" #include "optimizer/tlist.h" #include "parser/parse_coerce.h" -#include "parser/parsetree.h" -#include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" static RelOptInfo *recurse_set_operations(Node *setOp, PlannerInfo *root, diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index edc25d712e9..455c2e8d31a 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -20,8 +20,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "catalog/pg_aggregate.h" -#include "catalog/pg_class.h" #include "catalog/pg_language.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" @@ -41,7 +39,6 @@ #include "optimizer/plancat.h" #include "optimizer/planmain.h" #include "parser/analyze.h" -#include "parser/parse_agg.h" #include "parser/parse_coerce.h" #include "parser/parse_func.h" #include "rewrite/rewriteHandler.h" diff --git a/src/backend/optimizer/util/orclauses.c b/src/backend/optimizer/util/orclauses.c index 6a5234e2cec..d911c6547d9 100644 --- a/src/backend/optimizer/util/orclauses.c +++ b/src/backend/optimizer/util/orclauses.c @@ -17,8 +17,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/orclauses.h" #include "optimizer/restrictinfo.h" diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 6f79b2e3fe7..246cd8f7476 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -19,7 +19,6 @@ #include "foreign/fdwapi.h" #include "miscadmin.h" #include "nodes/extensible.h" -#include "nodes/nodeFuncs.h" #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" @@ -27,11 +26,8 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" -#include "optimizer/prep.h" -#include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "parser/parsetree.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/selfuncs.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index b933eefa649..6bb53e4346f 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -36,11 +36,9 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/supportnodes.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/plancat.h" -#include "optimizer/prep.h" #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "partitioning/partdesc.h" |