GIS #462: exclude geo operations from being pushed down in sql filter

polypheny · Jan 17, 2024 · 34b043d · 34b043d
1 parent 9015dbc
commit 34b043d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/dbms/src/test/java/org/polypheny/db/sql/fun/GeoFunctionsTest.java b/dbms/src/test/java/org/polypheny/db/sql/fun/GeoFunctionsTest.java
@@ -296,6 +296,11 @@ public void distanceFunctions() throws SQLException {
         try ( TestHelper.JdbcConnection polyphenyDbConnection = new TestHelper.JdbcConnection( true ) ) {
             Connection connection = polyphenyDbConnection.getConnection();
             try ( Statement statement = connection.createStatement() ) {
+                TestHelper.checkResultSet(
+                        statement.executeQuery( "SELECT count(*) from TEST_GIS where ST_Distance(wkt, ST_GeomFromText('POINT (9.289382 48.741588)', 4326)) < 135555" ),
+                        ImmutableList.of(
+                                new Object[]{ 2 }
+                        ) );
                 // calculate the distance between two points
                 TestHelper.checkResultSet(
                         statement.executeQuery( "SELECT ST_Distance(ST_GeomFromText('POINT (7.852923 47.998949)', 4326), ST_GeomFromText('POINT (9.289382 48.741588)', 4326))" ),

diff --git a/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcRules.java b/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcRules.java
@@ -492,7 +492,7 @@ private static boolean supportsGeoFunction( SqlDialect dialect, Project project
         }
 
 
-        private static boolean geoFunctionInProject( Project project ) {
+        private static boolean geoFunctionInProject( AlgNode project ) {
             CheckingGeoFunctionVisitor visitor = new CheckingGeoFunctionVisitor();
             for ( RexNode node : project.getChildExps() ) {
                 node.accept( visitor );
@@ -577,6 +577,7 @@ public JdbcFilterRule( JdbcConvention out, AlgBuilderFactory algBuilderFactory )
                             !userDefinedFunctionInFilter( filter )
                                     && !knnFunctionInFilter( filter )
                                     && !multimediaFunctionInFilter( filter )
+                                    && (!geoFunctionInFilter( filter ) || supportsGeoFunctionInFilter( out.dialect, filter ))
                                     && !DocumentRules.containsJson( filter )
                                     && !DocumentRules.containsDocument( filter )
                                     && (out.dialect.supportsNestedArrays() || (!itemOperatorInFilter( filter ) && isStringComparableArrayType( filter )))),
@@ -615,6 +616,30 @@ private static boolean multimediaFunctionInFilter( Filter filter ) {
         }
 
 
+        private static boolean geoFunctionInFilter( Filter filter ) {
+            CheckingGeoFunctionVisitor visitor = new CheckingGeoFunctionVisitor();
+            for ( RexNode node : filter.getChildExps() ) {
+                node.accept( visitor );
+                if ( visitor.containsGeoFunction() ) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+        private static boolean supportsGeoFunctionInFilter( SqlDialect dialect, Filter filter ) {
+            CheckingGeoFunctionSupportVisitor visitor = new CheckingGeoFunctionSupportVisitor( dialect );
+            for ( RexNode node : filter.getChildExps() ) {
+                node.accept( visitor );
+                if ( visitor.supportsGeoFunction() ) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
         private static boolean itemOperatorInFilter( Filter filter ) {
             CheckingItemOperatorVisitor visitor = new CheckingItemOperatorVisitor();
             for ( RexNode node : filter.getChildExps() ) {
@@ -697,7 +722,7 @@ public static class JdbcAggregateRule extends JdbcConverterRule {
          * Creates a JdbcAggregateRule.
          */
         public JdbcAggregateRule( JdbcConvention out, AlgBuilderFactory algBuilderFactory ) {
-            super( Aggregate.class, (Predicate<AlgNode>) r -> true, Convention.NONE, out, algBuilderFactory, "JdbcAggregateRule." + out );
+            super( Aggregate.class, aggregate -> true, Convention.NONE, out, algBuilderFactory, "JdbcAggregateRule." + out );
         }