summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/util/clauses.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/util/clauses.c')
-rw-r--r--src/backend/optimizer/util/clauses.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 65c9b61458..c9c7270d2b 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.275 2009/01/09 15:46:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.276 2009/02/25 03:30:37 tgl Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -1300,15 +1300,6 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
expr->booltesttype == IS_NOT_UNKNOWN))
result = find_nonnullable_rels_walker((Node *) expr->arg, false);
}
- else if (IsA(node, FlattenedSubLink))
- {
- /* JOIN_SEMI sublinks preserve strictness, but JOIN_ANTI ones don't */
- FlattenedSubLink *expr = (FlattenedSubLink *) node;
-
- if (expr->jointype == JOIN_SEMI)
- result = find_nonnullable_rels_walker((Node *) expr->quals,
- top_level);
- }
else if (IsA(node, PlaceHolderVar))
{
PlaceHolderVar *phv = (PlaceHolderVar *) node;
@@ -1511,15 +1502,6 @@ find_nonnullable_vars_walker(Node *node, bool top_level)
expr->booltesttype == IS_NOT_UNKNOWN))
result = find_nonnullable_vars_walker((Node *) expr->arg, false);
}
- else if (IsA(node, FlattenedSubLink))
- {
- /* JOIN_SEMI sublinks preserve strictness, but JOIN_ANTI ones don't */
- FlattenedSubLink *expr = (FlattenedSubLink *) node;
-
- if (expr->jointype == JOIN_SEMI)
- result = find_nonnullable_vars_walker((Node *) expr->quals,
- top_level);
- }
else if (IsA(node, PlaceHolderVar))
{
PlaceHolderVar *phv = (PlaceHolderVar *) node;
@@ -2943,24 +2925,6 @@ eval_const_expressions_mutator(Node *node,
newbtest->booltesttype = btest->booltesttype;
return (Node *) newbtest;
}
- if (IsA(node, FlattenedSubLink))
- {
- FlattenedSubLink *fslink = (FlattenedSubLink *) node;
- FlattenedSubLink *newfslink;
- Expr *quals;
-
- /* Simplify and also canonicalize the arguments */
- quals = (Expr *) eval_const_expressions_mutator((Node *) fslink->quals,
- context);
- quals = canonicalize_qual(quals);
-
- newfslink = makeNode(FlattenedSubLink);
- newfslink->jointype = fslink->jointype;
- newfslink->lefthand = fslink->lefthand;
- newfslink->righthand = fslink->righthand;
- newfslink->quals = quals;
- return (Node *) newfslink;
- }
if (IsA(node, PlaceHolderVar) && context->estimate)
{
/*