From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Wed, 21 Nov 2012 23:26:44 +0000 (+0000)
Subject: Of course we're going to do real joinsel...
X-Git-Tag: 2.1.0beta2~367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74652cd8506619dbef7a4cecf2cad1f87513e768;p=postgis

Of course we're going to do real joinsel...


git-svn-id: http://svn.osgeo.org/postgis/trunk@10728 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/postgis/geometry_estimate.c b/postgis/geometry_estimate.c
index 888119627..d39135a18 100644
--- a/postgis/geometry_estimate.c
+++ b/postgis/geometry_estimate.c
@@ -106,14 +106,6 @@ static float8 estimate_selectivity(GBOX *box, GEOM_STATS *geomstats);
  */
 #define DEFAULT_GEOMETRY_JOINSEL 0.000005
 
-/**
- * Define this to actually DO join selectivity
- * (as contrary to just return the default JOINSEL value)
- * Note that this is only possible when compiling postgis
- * against pgsql >= 800
- */
-#define REALLY_DO_JOINSEL 1
-
 Datum geometry_gist_sel_2d(PG_FUNCTION_ARGS);
 Datum geometry_gist_joinsel_2d(PG_FUNCTION_ARGS);
 Datum geometry_analyze_2d(PG_FUNCTION_ARGS);
@@ -121,22 +113,6 @@ Datum geometry_estimated_extent(PG_FUNCTION_ARGS);
 Datum _postgis_geometry_sel(PG_FUNCTION_ARGS);
 
 
-#if ! REALLY_DO_JOINSEL
-/**
- * JOIN selectivity in the GiST && operator
- * for all PG versions
- */
-PG_FUNCTION_INFO_V1(LWGEOM_gist_joinsel);
-Datum geometry_gist_joinsel_2d(PG_FUNCTION_ARGS)
-{
-	POSTGIS_DEBUGF(2, "geometry_gist_joinsel_2d called (returning default, %f)",
-	               DEFAULT_GEOMETRY_JOINSEL);
-
-	PG_RETURN_FLOAT8(DEFAULT_GEOMETRY_JOINSEL);
-}
-
-#else /* REALLY_DO_JOINSEL */
-
 static int
 calculate_column_intersection(GBOX *search_box, GEOM_STATS *geomstats1, GEOM_STATS *geomstats2)
 {
@@ -378,9 +354,6 @@ Datum geometry_gist_joinsel_2d(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(rows_returned / total_tuples);
 }
 
-#endif /* REALLY_DO_JOINSEL */
-
-
 
 /**
 * This function returns an estimate of the selectivity