Commit f772e6cb authored by Tom Lane's avatar Tom Lane

Clamp the output of estimate_hash_bucketsize() to a sane range;

per example from Bruno Wolff in which it produced a silly result.
parent 1dfbbd51
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.96 2002/12/14 00:17:55 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.97 2002/12/26 23:38:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1164,6 +1164,16 @@ estimate_hash_bucketsize(Query *root, Var *var) ...@@ -1164,6 +1164,16 @@ estimate_hash_bucketsize(Query *root, Var *var)
if (avgfreq > 0.0 && mcvfreq > avgfreq) if (avgfreq > 0.0 && mcvfreq > avgfreq)
estfract *= mcvfreq / avgfreq; estfract *= mcvfreq / avgfreq;
/*
* Clamp bucketsize to sane range (the above adjustment could easily
* produce an out-of-range result). We set the lower bound a little
* above zero, since zero isn't a very sane result.
*/
if (estfract < 1.0e-6)
estfract = 1.0e-6;
else if (estfract > 1.0)
estfract = 1.0;
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
return (Selectivity) estfract; return (Selectivity) estfract;
......
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