diff options
Diffstat (limited to 'src/include/nodes/relation.h')
| -rw-r--r-- | src/include/nodes/relation.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 0a2ca0e5f33..2f906c6a472 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.115 2005/06/13 23:14:49 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.116 2005/07/02 23:00:42 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -87,6 +87,15 @@ typedef struct PlannerInfo List *equi_key_list; /* list of lists of equijoined * PathKeyItems */ + List *left_join_clauses; /* list of RestrictInfos for outer join + * clauses w/nonnullable var on left */ + + List *right_join_clauses; /* list of RestrictInfos for outer join + * clauses w/nonnullable var on right */ + + List *full_join_clauses; /* list of RestrictInfos for full outer + * join clauses */ + List *in_info_list; /* list of InClauseInfos */ List *query_pathkeys; /* desired pathkeys for query_planner(), @@ -95,6 +104,7 @@ typedef struct PlannerInfo double tuple_fraction; /* tuple_fraction passed to query_planner */ bool hasJoinRTEs; /* true if any RTEs are RTE_JOIN kind */ + bool hasOuterJoins; /* true if any RTEs are outer joins */ bool hasHavingQual; /* true if havingQual was non-null */ } PlannerInfo; @@ -695,10 +705,6 @@ typedef struct HashPath * joined, will also have is_pushed_down set because it will get attached to * some lower joinrel. * - * We also store a valid_everywhere flag, which says that the clause is not - * affected by any lower-level outer join, and therefore any conditions it - * asserts can be presumed true throughout the plan tree. - * * In general, the referenced clause might be arbitrarily complex. The * kinds of clauses we can handle as indexscan quals, mergejoin clauses, * or hashjoin clauses are fairly limited --- the code for each kind of @@ -725,8 +731,6 @@ typedef struct RestrictInfo bool is_pushed_down; /* TRUE if clause was pushed down in level */ - bool valid_everywhere; /* TRUE if valid on every level */ - /* * This flag is set true if the clause looks potentially useful as a * merge or hash join clause, that is if it is a binary opclause with |