Remove support for geogrid in ST_INTERSECTS

Author: craigtaverner

docs/reference/query-languages/esql/_snippets/functions/parameters/st_disjoint.md

@@ -255,33 +255,6 @@ count:long | centroid:geo_point                            | geohashString:keywo
 2          | POINT (16.706149326637387 32.37822346854955)  | sm                    | POLYGON((11.25 28.125, 22.5 28.125, 22.5 33.75, 11.25 33.75, 11.25 28.125))
 ;
 
-gridGeohashDocsFromCell
-required_capability: spatial_grid_types
-
-FROM airports
-| WHERE ST_INTERSECTS(location, TO_GEOHASH("u1"))
-| STATS
-    count = COUNT(*),
-    centroid = ST_CENTROID_AGG(location)
-;
-
-count:long | centroid:geo_point
-8          | POINT (6.351574736181647 51.8981519783847)
-;
-
-gridGeohashLiteralFromCell
-required_capability: spatial_grid_types
-
-ROW location = ["POINT (6.360728044651057 47.94084087577894)", "POINT (6.351574736181647 51.8981519783847)", "POINT (5.268637698941997 42.747250193330856)"]
-| EVAL location = TO_GEOPOINT(location)
-| MV_EXPAND location
-| WHERE ST_INTERSECTS(location, "u1"::geohash)
-;
-
-location:geo_point
-POINT (6.351574736181647 51.8981519783847)
-;
-
 gridGeohashStatsByWhereUK
 required_capability: spatial_grid_types
 
@@ -590,33 +563,6 @@ count:long | centroid:geo_point                           | geotileString:keywor
 79         | POINT (24.516750878736943 23.93036561181085) | 3/4/3                 | POLYGON((0.0 0.0, 45.0 0.0, 45.0 40.979898069620134, 0.0 40.979898069620134, 0.0 0.0))
 ;
 
-gridGeotileDocsFromCell
-required_capability: spatial_grid_types
-
-FROM airports
-| WHERE ST_INTERSECTS(location, TO_GEOTILE("3/4/3"))
-| STATS
-    count = COUNT(*),
-    centroid = ST_CENTROID_AGG(location)
-;
-
-count:long | centroid:geo_point
-79         | POINT (24.516750878736943 23.93036561181085)
-;
-
-gridGeotileLiteralFromCell
-required_capability: spatial_grid_types
-
-ROW location = ["POINT (6.360728044651057 47.94084087577894)", "POINT (24.516750878736943 23.93036561181085)", "POINT (5.268637698941997 42.747250193330856)"]
-| EVAL location = TO_GEOPOINT(location)
-| MV_EXPAND location
-| WHERE ST_INTERSECTS(location, "3/4/3"::geotile)
-;
-
-location:geo_point
-POINT (24.516750878736943 23.93036561181085)
-;
-
 gridGeotileStatsByWhereUK
 required_capability: spatial_grid_types
 
@@ -994,34 +940,6 @@ POINT (13.1442589810713 32.6691695504993) | 813fbffffffffff | 813fbffffffffff
 POINT (118.12696884672 24.537192570557)   | 8141bffffffffff | null                 | POLYGON ((121.34751445935747 26.200276060455465, 120.50339385995798 29.892985338693542, 116.26130043917948 31.68090796798786, 112.74092235558841 29.367231998154967, 113.70376749169584 25.199133186716526, 117.99047716641066 23.5089519597363, 119.64146543031175 24.728661050965922, 121.34751445935747 26.200276060455465))
 ;
 
-gridGeohexDocsFromCell
-required_capability: spatial_grid_types
-
-FROM airports
-| WHERE ST_INTERSECTS(location, TO_GEOHEX("81397ffffffffff"))
-| STATS
-    count = COUNT(*),
-    centroid = ST_CENTROID_AGG(location)
-;
-
-count:long | centroid:geo_point
-7          | POINT (2.475211258445467 41.32352174592337)
-;
-
-gridGeohexLiteralFromCell
-required_capability: spatial_grid_types
-
-ROW location = ["POINT (6.360728044651057 47.94084087577894)", "POINT (2.475211258445467 41.32352174592337)", "POINT (5.268637698941997 42.747250193330856)"]
-| EVAL location = TO_GEOPOINT(location)
-| MV_EXPAND location
-| WHERE ST_INTERSECTS(location, "81397ffffffffff"::geohex)
-;
-
-location:geo_point
-POINT (2.475211258445467 41.32352174592337)
-POINT (5.268637698941997 42.747250193330856)
-;
-
 gridGeohexStatsByWhereUK
 required_capability: spatial_grid_types
 

docs/reference/query-languages/esql/_snippets/functions/parameters/st_intersects.md

@@ -27,7 +27,6 @@
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
@@ -56,17 +55,15 @@ protected BinarySpatialFunction(
         Expression right,
         boolean leftDocValues,
         boolean rightDocValues,
-        boolean pointsOnly,
-        boolean supportsGrid
+        boolean pointsOnly
     ) {
         super(source, left, right);
         this.leftDocValues = leftDocValues;
         this.rightDocValues = rightDocValues;
-        this.spatialTypeResolver = new SpatialTypeResolver(this, pointsOnly, supportsGrid);
+        this.spatialTypeResolver = new SpatialTypeResolver(this, pointsOnly);
     }
 
-    protected BinarySpatialFunction(StreamInput in, boolean leftDocValues, boolean rightDocValues, boolean pointsOnly, boolean supportsGrid)
-        throws IOException {
+    protected BinarySpatialFunction(StreamInput in, boolean leftDocValues, boolean rightDocValues, boolean pointsOnly) throws IOException {
         // The doc-values fields are only used on data nodes local planning, and therefor never serialized
         this(
             in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_SOURCE_FUNCTIONS_WARNINGS)
@@ -76,8 +73,7 @@ protected BinarySpatialFunction(StreamInput in, boolean leftDocValues, boolean r
             in.readNamedWriteable(Expression.class),
             leftDocValues,
             rightDocValues,
-            pointsOnly,
-            supportsGrid
+            pointsOnly
         );
     }
 
@@ -123,12 +119,10 @@ protected TypeResolution resolveType() {
     static class SpatialTypeResolver {
         private final SpatialEvaluatorFactory.SpatialSourceResolution supplier;
         private final boolean pointsOnly;
-        private final boolean supportsGrid;
 
-        SpatialTypeResolver(SpatialEvaluatorFactory.SpatialSourceResolution supplier, boolean pointsOnly, boolean supportsGrid) {
+        SpatialTypeResolver(SpatialEvaluatorFactory.SpatialSourceResolution supplier, boolean pointsOnly) {
             this.supplier = supplier;
             this.pointsOnly = pointsOnly;
-            this.supportsGrid = supportsGrid;
         }
 
         public Expression left() {
@@ -153,16 +147,10 @@ protected TypeResolution resolveType() {
             }
         }
 
-        protected Expression.TypeResolution isCompatibleSpatial(Expression e, TypeResolutions.ParamOrdinal paramOrd) {
+        protected Expression.TypeResolution isSpatial(Expression e, TypeResolutions.ParamOrdinal paramOrd) {
             return pointsOnly
                 ? EsqlTypeResolutions.isSpatialPoint(e, sourceText(), paramOrd)
-                : (supportsGrid
-                    ? EsqlTypeResolutions.isSpatialOrGrid(e, sourceText(), paramOrd)
-                    : EsqlTypeResolutions.isSpatial(e, sourceText(), paramOrd));
-        }
-
-        protected Expression.TypeResolution isGeoPoint(Expression e, TypeResolutions.ParamOrdinal paramOrd) {
-            return isType(e, GEO_POINT::equals, sourceText(), paramOrd, GEO_POINT.typeName());
+                : EsqlTypeResolutions.isSpatial(e, sourceText(), paramOrd);
         }
 
         private TypeResolution resolveType(
@@ -171,8 +159,8 @@ private TypeResolution resolveType(
             TypeResolutions.ParamOrdinal leftOrdinal,
             TypeResolutions.ParamOrdinal rightOrdinal
         ) {
-            TypeResolution leftResolution = isCompatibleSpatial(leftExpression, leftOrdinal);
-            TypeResolution rightResolution = isCompatibleSpatial(rightExpression, rightOrdinal);
+            TypeResolution leftResolution = isSpatial(leftExpression, leftOrdinal);
+            TypeResolution rightResolution = isSpatial(rightExpression, rightOrdinal);
             if (leftResolution.resolved()) {
                 return resolveType(leftExpression, rightExpression, rightOrdinal);
             } else if (rightResolution.resolved()) {
@@ -188,16 +176,9 @@ protected TypeResolution resolveType(
             TypeResolutions.ParamOrdinal otherParamOrdinal
         ) {
             if (isNull(spatialExpression.dataType())) {
-                return isCompatibleSpatial(otherExpression, otherParamOrdinal);
+                return isSpatial(otherExpression, otherParamOrdinal);
             }
             TypeResolution resolution = isSameSpatialType(spatialExpression.dataType(), otherExpression, sourceText(), otherParamOrdinal);
-            // TODO Remove these grid checks once we support geo_shape relation to geoGrid
-            if (resolution.resolved() && DataType.isGeoGrid(spatialExpression.dataType())) {
-                resolution = isGeoPoint(otherExpression, otherParamOrdinal);
-            }
-            if (resolution.resolved() && DataType.isGeoGrid(otherExpression.dataType())) {
-                resolution = isGeoPoint(spatialExpression, otherParamOrdinal == FIRST ? SECOND : FIRST);
-            }
             if (resolution.unresolved()) {
                 return resolution;
             }
@@ -211,12 +192,15 @@ protected TypeResolution isSameSpatialType(
             String operationName,
             TypeResolutions.ParamOrdinal paramOrd
         ) {
-            Predicate<DataType> isSpatialType = pointsOnly
-                ? dt -> dt == spatialDataType
-                : (supportsGrid
-                    ? dt -> DataType.isSpatialOrGrid(dt) && spatialCRSCompatible(spatialDataType, dt)
-                    : dt -> DataType.isSpatial(dt) && spatialCRSCompatible(spatialDataType, dt));
-            return isType(expression, isSpatialType, operationName, paramOrd, compatibleTypeNames(spatialDataType));
+            return pointsOnly
+                ? isType(expression, dt -> dt == spatialDataType, operationName, paramOrd, compatibleTypeNames(spatialDataType))
+                : isType(
+                    expression,
+                    dt -> DataType.isSpatial(dt) && spatialCRSCompatible(spatialDataType, dt),
+                    operationName,
+                    paramOrd,
+                    compatibleTypeNames(spatialDataType)
+                );
         }
     }
 
@@ -264,7 +248,7 @@ public enum SpatialCrsType {
 
         public static SpatialCrsType fromDataType(DataType dataType) {
             return DataType.isSpatialGeo(dataType) ? SpatialCrsType.GEO
-                : DataType.isSpatialOrGrid(dataType) ? SpatialCrsType.CARTESIAN
+                : DataType.isSpatial(dataType) ? SpatialCrsType.CARTESIAN
                 : SpatialCrsType.UNSPECIFIED;
         }
     }
@@ -294,8 +278,8 @@ public TranslationAware.Translatable translatable(LucenePushdownPredicates pushd
         // The use of foldable here instead of SpatialEvaluatorFieldKey.isConstant is intentional to match the behavior of the
         // Lucene pushdown code in EsqlTranslationHandler::SpatialRelatesTranslator
         // We could enhance both places to support ReferenceAttributes that refer to constants, but that is a larger change
-        return isPushableSpatialAttribute(left(), pushdownPredicates) && isPushableLiteralAttribute(right())
-            || isPushableSpatialAttribute(right(), pushdownPredicates) && isPushableLiteralAttribute(left())
+        return isPushableSpatialAttribute(left(), pushdownPredicates) && right().foldable()
+            || isPushableSpatialAttribute(right(), pushdownPredicates) && left().foldable()
                 ? TranslationAware.Translatable.YES
                 : TranslationAware.Translatable.NO;
 
@@ -304,9 +288,4 @@ public TranslationAware.Translatable translatable(LucenePushdownPredicates pushd
     private static boolean isPushableSpatialAttribute(Expression exp, LucenePushdownPredicates p) {
         return exp instanceof FieldAttribute fa && DataType.isSpatial(fa.dataType()) && fa.getExactInfo().hasExact() && p.isIndexed(fa);
     }
-
-    private static boolean isPushableLiteralAttribute(Expression exp) {
-        // TODO: Support pushdown of geo-grid queries where the constant is a geo-grid-id literal
-        return DataType.isSpatial(exp.dataType()) && exp.foldable();
-    }
 }