diff options
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 3 | ||||
| -rw-r--r-- | src/backend/optimizer/path/clausesel.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/path/equivclass.c | 8 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 5 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index f64553bbf87..2477a17cfa3 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.345 2008/11/15 19:43:46 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.346 2008/12/01 21:06:12 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -1563,6 +1563,7 @@ _outRestrictInfo(StringInfo str, RestrictInfo *node) WRITE_BITMAPSET_FIELD(right_relids); WRITE_NODE_FIELD(orclause); /* don't write parent_ec, leads to infinite recursion in plan tree dump */ + WRITE_FLOAT_FIELD(this_selec, "%.4f"); WRITE_NODE_FIELD(mergeopfamilies); /* don't write left_ec, leads to infinite recursion in plan tree dump */ /* don't write right_ec, leads to infinite recursion in plan tree dump */ diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index e3e4e9f02c0..0ecdec10be2 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.94 2008/10/04 21:56:53 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.95 2008/12/01 21:06:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -514,6 +514,12 @@ clause_selectivity(PlannerInfo *root, } /* + * If the clause is marked redundant, always return 1.0. + */ + if (rinfo->this_selec > 1) + return (Selectivity) 1.0; + + /* * If possible, cache the result of the selectivity calculation for * the clause. We can cache if varRelid is zero or the clause * contains only vars of that relid --- otherwise varRelid will affect diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index c0351008750..3d35eb605d9 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.13 2008/10/21 20:42:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.14 2008/12/01 21:06:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1198,7 +1198,7 @@ reconsider_outer_join_clauses(PlannerInfo *root) list_delete_cell(root->left_join_clauses, cell, prev); /* we throw it back anyway (see notes above) */ /* but the thrown-back clause has no extra selectivity */ - rinfo->this_selec = 1.0; + rinfo->this_selec = 2.0; distribute_restrictinfo_to_rels(root, rinfo); } else @@ -1220,7 +1220,7 @@ reconsider_outer_join_clauses(PlannerInfo *root) list_delete_cell(root->right_join_clauses, cell, prev); /* we throw it back anyway (see notes above) */ /* but the thrown-back clause has no extra selectivity */ - rinfo->this_selec = 1.0; + rinfo->this_selec = 2.0; distribute_restrictinfo_to_rels(root, rinfo); } else @@ -1242,7 +1242,7 @@ reconsider_outer_join_clauses(PlannerInfo *root) list_delete_cell(root->full_join_clauses, cell, prev); /* we throw it back anyway (see notes above) */ /* but the thrown-back clause has no extra selectivity */ - rinfo->this_selec = 1.0; + rinfo->this_selec = 2.0; distribute_restrictinfo_to_rels(root, rinfo); } else diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 56074a469dc..7b67d94700e 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.164 2008/11/11 18:13:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.165 2008/12/01 21:06:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -991,7 +991,8 @@ typedef struct RestrictInfo /* cache space for cost and selectivity */ QualCost eval_cost; /* eval cost of clause; -1 if not yet set */ - Selectivity this_selec; /* selectivity; -1 if not yet set */ + Selectivity this_selec; /* selectivity; -1 if not yet set; >1 means + * a redundant clause */ /* valid if clause is mergejoinable, else NIL */ List *mergeopfamilies; /* opfamilies containing clause operator */ |