diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-11-14 23:54:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-11-14 23:54:23 +0000 |
| commit | 1bdf124b94af3c24d3c3083c820804274df8262b (patch) | |
| tree | 580185c38a9903dd1bb390d099719e781044d2de /src/backend/optimizer/plan/initsplan.c | |
| parent | e93fb885ebbf4ecbafe3e16813dc47397eda84ea (diff) | |
Restore the former RestrictInfo field valid_everywhere (but invert the flag
sense and rename to "outerjoin_delayed" to more clearly reflect what it
means). I had decided that it was redundant in 8.1, but the folly of this
is exposed by a bug report from Sebastian Böck. The place where it's
needed is to prevent orindxpath.c from cherry-picking arms of an outer-join
OR clause to form a relation restriction that isn't actually legal to push
down to the relation scan level. There may be some legal cases that this
forbids optimizing, but we'd need much closer analysis to determine it.
Diffstat (limited to 'src/backend/optimizer/plan/initsplan.c')
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index dd8fc4fa2d7..fd1ddedbfd2 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.110 2005/10/15 02:49:20 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.111 2005/11/14 23:54:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -409,6 +409,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, Relids qualscope) { Relids relids; + bool outerjoin_delayed; bool maybe_equijoin; bool maybe_outer_join; RestrictInfo *restrictinfo; @@ -451,6 +452,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, */ Assert(bms_equal(relids, qualscope)); /* Needn't feed it back for more deductions */ + outerjoin_delayed = false; maybe_equijoin = false; maybe_outer_join = false; } @@ -470,6 +472,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, * except for not setting maybe_equijoin (see below). */ relids = qualscope; + outerjoin_delayed = true; /* * We can't use such a clause to deduce equijoin (the left and right @@ -499,13 +502,17 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, Relids tmprelids; int relno; + outerjoin_delayed = false; tmprelids = bms_copy(relids); while ((relno = bms_first_member(tmprelids)) >= 0) { RelOptInfo *rel = find_base_rel(root, relno); if (rel->outerjoinset != NULL) + { addrelids = bms_add_members(addrelids, rel->outerjoinset); + outerjoin_delayed = true; + } } bms_free(tmprelids); @@ -555,6 +562,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, */ restrictinfo = make_restrictinfo((Expr *) clause, is_pushed_down, + outerjoin_delayed, relids); /* |