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.
This commit is contained in:
Tom Lane 2005-10-11 16:45:00 +00:00
parent 20f5a328e5
commit d30c134806

View File

@ -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))