Fix oversight in 8.0 modification of RestrictInfo data structures.

A RestrictInfo representing an OR clause now contains two versions of
the contained expression, one with sub-RestrictInfos and one without.
clause_selectivity() should descend to the version with sub-RestrictInfos
so that it has a chance of caching its results for the OR's sub-clauses.
Failing to do so resulted in redundant planner effort.

diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 580a386d3d870ac711fa91127860b4ee5c903d52..5fe7fa5d2e624c5f6c344a85db75ee6adf89b73f 100644 (file)
--- 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.72 2004/12/31 22:00:04 pgsql Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.72.4.1 2005/10/11 16:45:00 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,8 +461,15 @@ clause_selectivity(Query *root,
                        }
                }
 
-               /* Proceed with examination of contained clause */
-               clause = (Node *) rinfo->clause;
+               /*
+                * Proceed with examination of contained clause.  If the clause is an
+                * OR-clause, we want to look at the variant with sub-RestrictInfos,
+                * so that per-subclause selectivities can be cached.
+                */
+               if (rinfo->orclause)
+                       clause = (Node *) rinfo->orclause;
+               else
+                       clause = (Node *) rinfo->clause;
        }
 
        if (IsA(clause, Var))