Commit a053437d authored by Tom Lane's avatar Tom Lane

Dept of second thoughts: the IQ of estimate_array_length() needs to be

kept on par with that of scalararraysel(), else estimates that should
track might not.  Hence teach it about binary-compatible cases, too.
parent c2c0b318
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.222 2007/01/28 01:37:38 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.223 2007/01/28 02:53:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1698,6 +1698,9 @@ scalararraysel(PlannerInfo *root, ...@@ -1698,6 +1698,9 @@ scalararraysel(PlannerInfo *root,
int int
estimate_array_length(Node *arrayexpr) estimate_array_length(Node *arrayexpr)
{ {
/* look through any binary-compatible relabeling of arrayexpr */
arrayexpr = strip_array_coercion(arrayexpr);
if (arrayexpr && IsA(arrayexpr, Const)) if (arrayexpr && IsA(arrayexpr, Const))
{ {
Datum arraydatum = ((Const *) arrayexpr)->constvalue; Datum arraydatum = ((Const *) arrayexpr)->constvalue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment