diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-05-07 20:13:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-05-07 20:13:09 +0000 |
| commit | fdd48b185288e3e77827d4d81dd1561e17bde90c (patch) | |
| tree | 99aff98183db5a1e0284361910cd03d236c7a56b /src | |
| parent | 223431cba1aa4055be6896e80d351acd55ed7c18 (diff) | |
| download | postgresql-fdd48b185288e3e77827d4d81dd1561e17bde90c.tar.gz postgresql-fdd48b185288e3e77827d4d81dd1561e17bde90c.zip | |
Ooops ... make_outerjoininfo wasn't actually enforcing the join order
restrictions specified for semijoins in optimizer/README, to wit that
you can't reassociate outer joins into or out of the RHS of a semijoin.
Per report from Heikki.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index b31ffa81cc1..56100ba6cc8 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.152 2009/05/06 20:31:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.153 2009/05/07 20:13:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -654,7 +654,8 @@ make_outerjoininfo(PlannerInfo *root, * lower join's RHS and the lower OJ's join condition is strict, we * can interchange the ordering of the two OJs; otherwise we must add * lower OJ's full syntactic relset to min_righthand. Here, we must - * preserve ordering anyway if the lower OJ is an antijoin. + * preserve ordering anyway if either the current join is a semijoin, + * or the lower OJ is an antijoin. * * Here, we have to consider that "our join condition" includes any * clauses that syntactically appeared above the lower OJ and below @@ -670,6 +671,7 @@ make_outerjoininfo(PlannerInfo *root, if (bms_overlap(right_rels, otherinfo->syn_righthand)) { if (bms_overlap(clause_relids, otherinfo->syn_righthand) || + jointype == JOIN_SEMI || otherinfo->jointype == JOIN_ANTI || !otherinfo->lhs_strict || otherinfo->delay_upper_joins) { |