diff options
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/path/clausesel.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 14 | ||||
| -rw-r--r-- | src/backend/optimizer/prep/prepjointree.c | 12 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index 37d438fefce..3ff02902f7c 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.78 2006/03/05 15:58:28 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.79 2006/03/07 01:00:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -449,8 +449,6 @@ clause_selectivity(PlannerInfo *root, cacheable = true; break; - case JOIN_UNION: - /* unimplemented anyway... */ case JOIN_IN: case JOIN_REVERSE_IN: case JOIN_UNIQUE_OUTER: diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 21b10cf817c..d980cde06bc 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.115 2006/03/05 15:58:29 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.116 2006/03/07 01:00:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -363,18 +363,6 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join, *qualscope = bms_union(leftids, rightids); nonnullable_rels = leftids; break; - case JOIN_UNION: - - /* - * This is where we fail if upper levels of planner haven't - * rewritten UNION JOIN as an Append ... - */ - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("UNION JOIN is not implemented"))); - nonnullable_rels = NULL; /* keep compiler quiet */ - leftjoinlist = rightjoinlist = NIL; - break; default: elog(ERROR, "unrecognized join type: %d", (int) j->jointype); diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index c318b89d39c..ae538c9cc00 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.36 2006/03/05 15:58:30 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.37 2006/03/07 01:00:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -242,16 +242,6 @@ pull_up_subqueries(PlannerInfo *root, Node *jtnode, j->rarg = pull_up_subqueries(root, j->rarg, below_outer_join, false); break; - case JOIN_UNION: - - /* - * This is where we fail if upper levels of planner haven't - * rewritten UNION JOIN as an Append ... - */ - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("UNION JOIN is not implemented"))); - break; default: elog(ERROR, "unrecognized join type: %d", (int) j->jointype); |