Strabon

changeset 184:514cf28c79ab

3rd geosparql 'disjoint' now ignores (rightly) spatial index
author Manos Karpathiotakis <mk@di.uoa.gr>
date Wed May 23 13:28:04 2012 +0300 (2012-05-23)
parents 2192aa4a6418
children e83e7ee94da5
files generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java
line diff
     1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java	Wed May 23 12:03:47 2012 +0300
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java	Wed May 23 13:28:04 2012 +0300
     1.3 @@ -2,7 +2,7 @@
     1.4  package org.openrdf.sail.generaldb.schema;
     1.5  
     1.6  
     1.7 -import org.apache.commons.codec.binary.Hex;
     1.8 +//import org.apache.commons.codec.binary.Hex;
     1.9  import org.openrdf.sail.generaldb.GeneralDBSqlTable;
    1.10  import org.openrdf.sail.rdbms.schema.RdbmsTable;
    1.11  import java.sql.PreparedStatement;
     2.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Wed May 23 12:03:47 2012 +0300
     2.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Wed May 23 13:28:04 2012 +0300
     2.3 @@ -2113,7 +2113,7 @@
     2.4  			}
     2.5  
     2.6  			//Also need bounding box intersection query to enable the usage of the Gist R-tree index
     2.7 -			if(func != SpatialFunctionsPostGIS.SF_Disjoint && func != SpatialFunctionsPostGIS.EH_Disjoint)
     2.8 +			if(func != SpatialFunctionsPostGIS.SF_Disjoint && func != SpatialFunctionsPostGIS.EH_Disjoint && func != SpatialFunctionsPostGIS.RCC8_Dc)
     2.9  			{
    2.10  				filter.and();
    2.11  				appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Intersects);