database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Fix a bug in the original implementation of redundant-join-clause removal:

Browse Source 
clauses in which one side or the other references both sides of the join
cannot be removed as redundant, because that expression won't have been
constrained below the join.  Per report from Sergey Burladyan.
This commit is contained in:
Tom Lane
2007-07-31 19:53:50 +00:00
parent 5bd7b83426
commit 1be62b532b
8 changed files with 95 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/optimizer/path/indxpath.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.212.2.2 2007/05/22 01:40:42 tgl Exp $
* $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.212.2.3 2007/07/31 19:53:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1755,6 +1755,8 @@ find_clauses_for_join(PlannerInfo *root, RelOptInfo *rel,
{
clause_list = remove_redundant_join_clauses(root,
clause_list,
outer_relids,
rel->relids,
isouterjoin);
}

10
src/backend/optimizer/plan/createplan.c
View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.217 2006/10/04 00:29:54 momjian Exp $
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.217.2.1 2007/07/31 19:53:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1398,7 +1398,9 @@ create_nestloop_plan(PlannerInfo *root,
select_nonredundant_join_clauses(root,
joinrestrictclauses,
innerpath->indexclauses,
IS_OUTER_JOIN(best_path->jointype));
best_path->outerjoinpath->parent->relids,
best_path->innerjoinpath->parent->relids,
IS_OUTER_JOIN(best_path->jointype));
}
}
else if (IsA(best_path->innerjoinpath, BitmapHeapPath))
@ -1430,7 +1432,9 @@ create_nestloop_plan(PlannerInfo *root,
select_nonredundant_join_clauses(root,
joinrestrictclauses,
bitmapclauses,
IS_OUTER_JOIN(best_path->jointype));
best_path->outerjoinpath->parent->relids,
best_path->innerjoinpath->parent->relids,
IS_OUTER_JOIN(best_path->jointype));
}
}

4
src/backend/optimizer/util/relnode.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/util/relnode.c,v 1.83 2006/10/04 00:29:55 momjian Exp $
* $PostgreSQL: pgsql/src/backend/optimizer/util/relnode.c,v 1.83.2.1 2007/07/31 19:53:50 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -515,6 +515,8 @@ build_joinrel_restrictlist(PlannerInfo *root,
* omit the redundant clause from the result list.
*/
result = remove_redundant_join_clauses(root, rlist,
outer_rel->relids,
inner_rel->relids,
IS_OUTER_JOIN(jointype));
list_free(rlist);

32
src/backend/optimizer/util/restrictinfo.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.49 2006/10/04 00:29:55 momjian Exp $
* $PostgreSQL: pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.49.2.1 2007/07/31 19:53:50 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -36,6 +36,8 @@ static Expr *make_sub_restrictinfos(Expr *clause,
static RestrictInfo *join_clause_is_redundant(PlannerInfo *root,
RestrictInfo *rinfo,
List *reference_list,
Relids outer_relids,
Relids inner_relids,
bool isouterjoin);
@ -546,6 +548,8 @@ extract_actual_join_clauses(List *restrictinfo_list,
*/
List *
remove_redundant_join_clauses(PlannerInfo *root, List *restrictinfo_list,
Relids outer_relids,
Relids inner_relids,
bool isouterjoin)
{
List *result = NIL;
@ -572,7 +576,9 @@ remove_redundant_join_clauses(PlannerInfo *root, List *restrictinfo_list,
RestrictInfo *prevrinfo;
/* is it redundant with any prior clause? */
prevrinfo = join_clause_is_redundant(root, rinfo, result, isouterjoin);
prevrinfo = join_clause_is_redundant(root, rinfo, result,
outer_relids, inner_relids,
isouterjoin);
if (prevrinfo == NULL)
{
/* no, so add it to result list */
@ -608,6 +614,8 @@ List *
select_nonredundant_join_clauses(PlannerInfo *root,
List *restrictinfo_list,
List *reference_list,
Relids outer_relids,
Relids inner_relids,
bool isouterjoin)
{
List *result = NIL;
@ -618,7 +626,9 @@ select_nonredundant_join_clauses(PlannerInfo *root,
RestrictInfo *rinfo = (RestrictInfo *) lfirst(item);
/* drop it if redundant with any reference clause */
if (join_clause_is_redundant(root, rinfo, reference_list, isouterjoin) != NULL)
if (join_clause_is_redundant(root, rinfo, reference_list,
outer_relids, inner_relids,
isouterjoin) != NULL)
continue;
/* otherwise, add it to result list */
@ -651,6 +661,12 @@ select_nonredundant_join_clauses(PlannerInfo *root,
* of the latter, even though they might seem redundant by the pathkey
* membership test.
*
* Also, we cannot eliminate clauses wherein one side mentions vars from
* both relations, as in "WHERE t1.f1 = t2.f1 AND t1.f1 = t1.f2 - t2.f2".
* In this example, "t1.f2 - t2.f2" could not have been computed at all
* before forming the join of t1 and t2, so it certainly wasn't constrained
* earlier.
*
* Weird special case: if we have two clauses that seem redundant
* except one is pushed down into an outer join and the other isn't,
* then they're not really redundant, because one constrains the
@ -660,6 +676,8 @@ static RestrictInfo *
join_clause_is_redundant(PlannerInfo *root,
RestrictInfo *rinfo,
List *reference_list,
Relids outer_relids,
Relids inner_relids,
bool isouterjoin)
{
ListCell *refitem;
@ -681,6 +699,14 @@ join_clause_is_redundant(PlannerInfo *root,
bms_is_empty(rinfo->right_relids))
return NULL; /* var = const, so not redundant */
/* check for either side mentioning both rels */
if (bms_overlap(rinfo->left_relids, outer_relids) &&
bms_overlap(rinfo->left_relids, inner_relids))
return NULL; /* clause LHS uses both, so not redundant */
if (bms_overlap(rinfo->right_relids, outer_relids) &&
bms_overlap(rinfo->right_relids, inner_relids))
return NULL; /* clause RHS uses both, so not redundant */
cache_mergeclause_pathkeys(root, rinfo);
foreach(refitem, reference_list)