diff options
| author | Tom Lane | 2010-09-14 23:15:29 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-09-14 23:15:29 +0000 |
| commit | 4e97631e6a9d31acfde1057ad966e73f9d28c28d (patch) | |
| tree | a4f97e3e140119921d60b33cdd285d8b8e519823 /src/include/optimizer | |
| parent | 3522217b63ce9e88cd33a43e9481961a7c49ffb1 (diff) | |
Fix join-removal logic for pseudoconstant and outerjoin-delayed quals.
In these cases a qual can get marked with the removable rel in its
required_relids, but this is just to schedule its evaluation correctly, not
because it really depends on the rel. We were assuming that, in effect,
we could throw away *all* quals so marked, which is nonsense. Tighten up
the logic to be a little more paranoid about which quals belong to the
outer join being considered for removal, and arrange for all quals that
don't belong to be updated so they will still get evaluated correctly.
Also fix another problem that happened to be exposed by this test case,
which was that make_join_rel() was failing to notice some cases where
a constant-false qual could be used to prove a join relation empty. If it's
a pushed-down constant false, then the relation is empty even if it's an
outer join, because the qual applies after the outer join expansion.
Per report from Nathan Grange. Back-patch into 9.0.
Diffstat (limited to 'src/include/optimizer')
| -rw-r--r-- | src/include/optimizer/joininfo.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 58eeb8c942..0c4c8e172a 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/joininfo.h,v 1.38 2010/01/02 16:58:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/joininfo.h,v 1.39 2010/09/14 23:15:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,8 @@ extern bool have_relevant_joinclause(PlannerInfo *root, extern void add_join_clause_to_rels(PlannerInfo *root, RestrictInfo *restrictinfo, Relids join_relids); +extern void remove_join_clause_from_rels(PlannerInfo *root, + RestrictInfo *restrictinfo, + Relids join_relids); #endif /* JOININFO_H */ |