diff options
Diffstat (limited to 'src/backend/optimizer/path/allpaths.c')
| -rw-r--r-- | src/backend/optimizer/path/allpaths.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 90469a63e7d..a4aa7ba8db8 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.40 1999/02/16 00:40:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.41 1999/02/18 00:49:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -191,6 +191,8 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed) merge_rels_with_same_relids(joined_rels); + root->join_rel_list = rels = joined_rels; + #if 0 /* * * for each expensive predicate in each path in each distinct @@ -203,17 +205,6 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed) rels_set_cheapest(joined_rels); - if (BushyPlanFlag) - { - /* - * In case of bushy trees if there is still a join between a - * join relation and another relation, add a new joininfo that - * involves the join relation to the joininfo list of the - * other relation - */ - add_rel_to_rel_joininfos(root, joined_rels, rels); - } - foreach(x, joined_rels) { rel = (RelOptInfo *) lfirst(x); @@ -228,20 +219,6 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed) #endif } - if (BushyPlanFlag) - { - /* - * prune rels that have been completely incorporated into new - * join rels - */ - joined_rels = del_rels_all_bushy_inactive(rels); - - /* - * merge join rels if then contain the same list of base rels - */ - merge_rels_with_same_relids(joined_rels); - } - root->join_rel_list = rels = joined_rels; } Assert(BushyPlanFlag || length(rels) == 1); |