elastic · craigtaverner · Sep 5, 2025 · Jun 17, 2025 · Jun 17, 2025 · Jun 17, 2025
diff --git a/docs/changelog/133546.yaml b/docs/changelog/133546.yaml
@@ -0,0 +1,5 @@
+pr: 133546
+summary: "Support geohash, geotile and geohex grid types in ST_INTERSECTS and ST_DISJOINT"
+area: "ES|QL"
+type: enhancement
+issues: []
diff --git a/docs/reference/query-languages/esql/_snippets/functions/parameters/st_disjoint.md b/docs/reference/query-languages/esql/_snippets/functions/parameters/st_disjoint.md
diff --git a/.../reference/query-languages/esql/_snippets/functions/parameters/st_intersects.md b/.../reference/query-languages/esql/_snippets/functions/parameters/st_intersects.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/types/st_disjoint.md b/docs/reference/query-languages/esql/_snippets/functions/types/st_disjoint.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/types/st_intersects.md b/docs/reference/query-languages/esql/_snippets/functions/types/st_intersects.md
diff --git a/docs/reference/query-languages/esql/kibana/definition/functions/st_disjoint.json b/docs/reference/query-languages/esql/kibana/definition/functions/st_disjoint.json
diff --git a/docs/reference/query-languages/esql/kibana/definition/functions/st_intersects.json b/docs/reference/query-languages/esql/kibana/definition/functions/st_intersects.json
diff --git a/...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
@@ -147,7 +147,7 @@ protected void shouldSkipTest(String testName) throws IOException {
                 hasCapabilities(adminClient(), List.of(ENABLE_LOOKUP_JOIN_ON_REMOTE.capabilityName()))
             );
         }
-        // Unmapped fields require a coorect capability response from every cluster, which isn't currently implemented.
+        // Unmapped fields require a correct capability response from every cluster, which isn't currently implemented.
         assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
         // Tests that use capabilities not supported in CCS
         assumeFalse(

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/spatial-grid.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/spatial-grid.csv-spec
@@ -320,6 +320,62 @@ 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_intersects
+
+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)
+;
+
+gridIntersectsDisjointGeohash
+required_capability: spatial_grid_intersects
+
+FROM airports
+| EVAL intersects = ST_INTERSECTS(location, "u1"::geohash)
+| EVAL disjoint = ST_DISJOINT(location, "u1"::geohash)
+| STATS count = COUNT(*) BY intersects, disjoint
+| SORT count ASC
+;
+
+count:long | intersects:boolean | disjoint:boolean
+8          | true               | false
+883        | false              | true
+;
+
+gridGeohashLiteralFromCell
+required_capability: spatial_grid_intersects
+
+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)
+;
+
+gridGeohashLiteralFromCellDisjoint
+required_capability: spatial_grid_intersects
+
+ROW location = ["POINT (6.360728044651057 47.94084087577894)", "POINT (6.351574736181647 51.8981519783847)", "POINT (5.268637698941997 42.747250193330856)"]
+| EVAL location = location::geo_point
+| MV_EXPAND location
+| WHERE ST_DISJOINT(location, "u1"::geohash)
+;
+
+location:geo_point
+POINT (6.360728044651057 47.94084087577894)
+POINT (5.268637698941997 42.747250193330856)
+;
+
 gridGeohashStatsByWhereUK
 required_capability: spatial_grid_types
 
@@ -688,6 +744,62 @@ 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_intersects
+
+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)
+;
+
+gridIntersectsDisjointGeotile
+required_capability: spatial_grid_intersects
+
+FROM airports
+| EVAL intersects = ST_INTERSECTS(location, "3/4/3"::geotile)
+| EVAL disjoint = ST_DISJOINT(location, "3/4/3"::geotile)
+| STATS count = COUNT(*) BY intersects, disjoint
+| SORT count ASC
+;
+
+count:long | intersects:boolean | disjoint:boolean
+79         | true               | false
+812        | false              | true
+;
+
+gridGeotileLiteralFromCell
+required_capability: spatial_grid_intersects
+
+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)
+;
+
+gridGeotileLiteralFromCellDisjoint
+required_capability: spatial_grid_intersects
+
+ROW location = ["POINT (6.360728044651057 47.94084087577894)", "POINT (24.516750878736943 23.93036561181085)", "POINT (5.268637698941997 42.747250193330856)"]
+| EVAL location = location::geo_point
+| MV_EXPAND location
+| WHERE ST_DISJOINT(location, "3/4/3"::geotile)
+;
+
+location:geo_point
+POINT (6.360728044651057 47.94084087577894)
+POINT (5.268637698941997 42.747250193330856)
+;
+
 gridGeotileStatsByWhereUK
 required_capability: spatial_grid_types
 
@@ -1123,6 +1235,62 @@ 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_intersects
+
+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)
+;
+
+gridIntersectsDisjointGeohex
+required_capability: spatial_grid_intersects
+
+FROM airports
+| EVAL intersects = ST_INTERSECTS(location, "81397ffffffffff"::geohex)
+| EVAL disjoint = ST_DISJOINT(location, "81397ffffffffff"::geohex)
+| STATS count = COUNT(*) BY intersects, disjoint
+| SORT count ASC
+;
+
+count:long | intersects:boolean | disjoint:boolean
+7          | true               | false
+884        | false              | true
+;
+
+gridGeohexLiteralFromCell
+required_capability: spatial_grid_intersects
+
+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)
+;
+
+gridGeohexLiteralFromCellDisjoint
+required_capability: spatial_grid_intersects
+
+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_DISJOINT(location, "81397ffffffffff"::geohex)
+;
+
+location:geo_point
+POINT (6.360728044651057 47.94084087577894)
+;
+
 gridGeohexStatsByWhereUK
 required_capability: spatial_grid_types
 

diff --git a/...ion/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantGridEvaluator.java b/...ion/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantGridEvaluator.java
diff --git a/...ssion/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceGridEvaluator.java b/...ssion/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceGridEvaluator.java
diff --git a/.../expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantGridEvaluator.java b/.../expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantGridEvaluator.java
diff --git a/...ql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceGridEvaluator.java b/...ql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceGridEvaluator.java