diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/path/clausesel.c | 6 | ||||
| -rw-r--r-- | src/backend/optimizer/path/joinpath.c | 28 |
2 files changed, 13 insertions, 21 deletions
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index 18bb69f53c9..1eeae4c6d3d 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.18 1999/02/15 01:06:57 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.19 1999/05/16 19:45:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ set_clause_selectivities(List *restrictinfo_list, Cost new_selectivity) { clausenode = (RestrictInfo *) lfirst(temp); cost_clause = clausenode->selectivity; - if (FLOAT_IS_ZERO(cost_clause) || new_selectivity < cost_clause) + if (cost_clause <= 0 || new_selectivity < cost_clause) clausenode->selectivity = new_selectivity; } } @@ -129,7 +129,7 @@ set_rest_selec(Query *root, List *restrictinfo_list) * Check to see if the selectivity of this clause or any 'or' * subclauses (if any) haven't been set yet. */ - if (valid_or_clause(clausenode) || FLOAT_IS_ZERO(cost_clause)) + if (cost_clause <= 0 || valid_or_clause(clausenode)) { clausenode->selectivity = compute_clause_selec(root, (Node *) clausenode->clause, diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 8b2f5139ecd..930112f888e 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.34 1999/05/01 19:47:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.35 1999/05/16 19:45:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -418,29 +418,21 @@ match_unsorted_inner(RelOptInfo *joinrel, List *innerpath_list, List *mergeinfo_list) { - Path *innerpath = (Path *) NULL; List *mp_list = NIL; - PathOrder *innerpath_ordering = NULL; - Cost temp1 = 0.0; - bool temp2 = false; - List *i = NIL; + List *i; foreach(i, innerpath_list) { + Path *innerpath = (Path *) lfirst(i); + PathOrder *innerpath_ordering = innerpath->pathorder; MergeInfo *xmergeinfo = (MergeInfo *) NULL; List *clauses = NIL; List *matchedJoinKeys = NIL; List *matchedJoinClauses = NIL; - innerpath = (Path *) lfirst(i); - - innerpath_ordering = innerpath->pathorder; - if (innerpath_ordering) - { xmergeinfo = match_order_mergeinfo(innerpath_ordering, - mergeinfo_list); - } + mergeinfo_list); if (xmergeinfo) clauses = ((JoinMethod *) xmergeinfo)->clauses; @@ -463,13 +455,13 @@ match_unsorted_inner(RelOptInfo *joinrel, */ if (clauses && matchedJoinKeys) { + Cost temp1; + temp1 = outerrel->cheapestpath->path_cost + cost_sort(matchedJoinKeys, outerrel->size, outerrel->width); - temp2 = (bool) (FLOAT_IS_ZERO(innerpath->outerjoincost) - || (innerpath->outerjoincost > temp1)); - - if (temp2) + if (innerpath->outerjoincost <= 0 /* unset? */ + || innerpath->outerjoincost > temp1) { List *outerkeys = make_pathkeys_from_joinkeys(matchedJoinKeys, outerrel->targetlist, @@ -494,8 +486,8 @@ match_unsorted_inner(RelOptInfo *joinrel, } } } - return mp_list; + return mp_list; } static bool |