Move geo-grid functions out of SNAPSHOT and into tech-preview

docs/reference/query-languages/esql/_snippets/lists/spatial-functions.md

@@ -10,3 +10,6 @@
   * [preview] [`ST_XMIN`](../../functions-operators/spatial-functions.md#esql-st_xmin)
   * [preview] [`ST_YMAX`](../../functions-operators/spatial-functions.md#esql-st_ymax)
   * [preview] [`ST_YMIN`](../../functions-operators/spatial-functions.md#esql-st_ymin)
+* [preview] [`ST_GEOTILE`](../../functions-operators/spatial-functions.md#esql-st_geotile)
+* [preview] [`ST_GEOHEX`](../../functions-operators/spatial-functions.md#esql-st_geohex)
+* [preview] [`ST_GEOHASH`](../../functions-operators/spatial-functions.md#esql-st_geohash)

docs/reference/query-languages/esql/_snippets/lists/type-conversion-functions.md

@@ -6,8 +6,11 @@
 * [`TO_DATE_NANOS`](../../functions-operators/type-conversion-functions.md#esql-to_date_nanos)
 * [`TO_DEGREES`](../../functions-operators/type-conversion-functions.md#esql-to_degrees)
 * [`TO_DOUBLE`](../../functions-operators/type-conversion-functions.md#esql-to_double)
+* [preview] [`TO_GEOHASH`](../../functions-operators/type-conversion-functions.md#esql-to_geohash)
+* [preview] [`TO_GEOHEX`](../../functions-operators/type-conversion-functions.md#esql-to_geohex)
 * [`TO_GEOPOINT`](../../functions-operators/type-conversion-functions.md#esql-to_geopoint)
 * [`TO_GEOSHAPE`](../../functions-operators/type-conversion-functions.md#esql-to_geoshape)
+* [preview] [`TO_GEOTILE`](../../functions-operators/type-conversion-functions.md#esql-to_geotile)
 * [`TO_INTEGER`](../../functions-operators/type-conversion-functions.md#esql-to_integer)
 * [`TO_IP`](../../functions-operators/type-conversion-functions.md#esql-to_ip)
 * [`TO_LONG`](../../functions-operators/type-conversion-functions.md#esql-to_long)

docs/reference/query-languages/esql/functions-operators/spatial-functions.md

@@ -47,3 +47,12 @@ mapped_pages:
 
 :::{include} ../_snippets/functions/layout/st_ymin.md
 :::
+
+:::{include} ../_snippets/functions/layout/st_geotile.md
+:::
+
+:::{include} ../_snippets/functions/layout/st_geohex.md
+:::
+
+:::{include} ../_snippets/functions/layout/st_geohash.md
+:::

docs/reference/query-languages/esql/functions-operators/type-conversion-functions.md

@@ -43,12 +43,21 @@ mapped_pages:
 :::{include} ../_snippets/functions/layout/to_double.md
 :::
 
+:::{include} ../_snippets/functions/layout/to_geohash.md
+:::
+
+:::{include} ../_snippets/functions/layout/to_geohex.md
+:::
+
 :::{include} ../_snippets/functions/layout/to_geopoint.md
 :::
 
 :::{include} ../_snippets/functions/layout/to_geoshape.md
 :::
 
+:::{include} ../_snippets/functions/layout/to_geotile.md
+:::
+
 :::{include} ../_snippets/functions/layout/to_integer.md
 :::
 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/spatial/SpatialGridLicenseTestCase.java

@@ -63,8 +63,8 @@ protected int precision() {
     /**
      * Test that the geo_grid functions are disabled outside of SNAPSHOT.
      */
-    public void testGeoGridDisabled() {
-        assertGeoGridDisabledWith("index_geo_point");
+    public void testGeoGridEnabled() {
+        assertGeoGridEnabled();
     }
 
     /**
@@ -120,16 +120,10 @@ protected void assertGeoGridFailsWith(String index) {
         assertThat(e.getMessage(), containsString(expectedError));
     }
 
-    protected void assertGeoGridDisabledWith(String index) {
-        assumeFalse("testing feature is disabled in non-snapshot builds", Build.current().isSnapshot());
-        var query = String.format(Locale.ROOT, """
-            FROM %s
-            | EVAL gridId = %s(location, %d)
-            | STATS count=COUNT() BY gridId
-            """, index, gridFunction(), precision());
-        var expectedError = String.format(Locale.ROOT, "Unknown function [%s]", gridFunction());
-        ElasticsearchException e = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(e.getMessage(), containsString(expectedError));
+    protected void assertGeoGridEnabled() {
+        assumeFalse("testing feature is enabled in non-snapshot builds", Build.current().isSnapshot());
+        assertThat("Capability SPATIAL_GRID_TYPES should be enabled", EsqlCapabilities.Cap.SPATIAL_GRID_TYPES.isEnabled(), equalTo(true));
+        testGeoGridWithPoints();
     }
 
     public static Map<String, Long> getValuesMap(Iterator<Iterator<Object>> values) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -414,17 +414,17 @@ public enum Cap {
         /**
          * Support ST_GEOHASH, ST_GEOTILE and ST_GEOHEX functions
          */
-        SPATIAL_GRID(Build.current().isSnapshot()),
+        SPATIAL_GRID,
 
         /**
          * Support geohash, geotile and geohex data types. Done in #129581
          */
-        SPATIAL_GRID_TYPES(Build.current().isSnapshot()),
+        SPATIAL_GRID_TYPES,
 
         /**
          * Support geohash, geotile and geohex in ST_INTERSECTS and ST_DISJOINT. Done in #133546
          */
-        SPATIAL_GRID_INTERSECTS(Build.current().isSnapshot()),
+        SPATIAL_GRID_INTERSECTS,
 
         /**
          * Fix to GROK and DISSECT that allows extracting attributes with the same name as the input

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java

@@ -419,6 +419,9 @@ private static FunctionDefinition[][] functions() {
                 def(SpatialWithin.class, SpatialWithin::new, "st_within"),
                 def(StDistance.class, StDistance::new, "st_distance"),
                 def(StEnvelope.class, StEnvelope::new, "st_envelope"),
+                def(StGeohash.class, StGeohash::new, "st_geohash"),
+                def(StGeotile.class, StGeotile::new, "st_geotile"),
+                def(StGeohex.class, StGeohex::new, "st_geohex"),
                 def(StXMax.class, StXMax::new, "st_xmax"),
                 def(StXMin.class, StXMin::new, "st_xmin"),
                 def(StYMax.class, StYMax::new, "st_ymax"),
@@ -445,6 +448,9 @@ private static FunctionDefinition[][] functions() {
                 def(ToDateNanos.class, ToDateNanos::new, "to_date_nanos", "to_datenanos"),
                 def(ToDegrees.class, ToDegrees::new, "to_degrees"),
                 def(ToDouble.class, ToDouble::new, "to_double", "to_dbl"),
+                def(ToGeohash.class, ToGeohash::new, "to_geohash"),
+                def(ToGeotile.class, ToGeotile::new, "to_geotile"),
+                def(ToGeohex.class, ToGeohex::new, "to_geohex"),
                 def(ToGeoPoint.class, ToGeoPoint::new, "to_geopoint"),
                 def(ToGeoShape.class, ToGeoShape::new, "to_geoshape"),
                 def(ToIp.class, ToIp::new, "to_ip"),
@@ -506,12 +512,6 @@ private static FunctionDefinition[][] snapshotFunctions() {
                 def(Score.class, uni(Score::new), Score.NAME),
                 def(Term.class, bi(Term::new), "term"),
                 def(Knn.class, tri(Knn::new), "knn"),
-                def(ToGeohash.class, ToGeohash::new, "to_geohash"),
-                def(ToGeotile.class, ToGeotile::new, "to_geotile"),
-                def(ToGeohex.class, ToGeohex::new, "to_geohex"),
-                def(StGeohash.class, StGeohash::new, "st_geohash"),
-                def(StGeotile.class, StGeotile::new, "st_geotile"),
-                def(StGeohex.class, StGeohex::new, "st_geohex"),
                 def(CosineSimilarity.class, CosineSimilarity::new, "v_cosine"),
                 def(DotProduct.class, DotProduct::new, "v_dot_product"),
                 def(L1Norm.class, L1Norm::new, "v_l1_norm"),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohash.java

@@ -118,7 +118,7 @@ private static int checkPrecisionRange(int precision) {
         description = """
             Calculates the `geohash` of the supplied geo_point at the specified precision.
             The result is long encoded. Use [TO_STRING](#esql-to_string) to convert the result to a string,
-            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](esql-to_geoshape.md) to calculate
+            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](#esql-to_geoshape) to calculate
             the `geo_shape` bounding geometry.
 
             These functions are related to the [`geo_grid` query](/reference/query-languages/query-dsl/query-dsl-geo-grid-query.md)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohex.java

@@ -119,7 +119,7 @@ private static int checkPrecisionRange(int precision) {
         description = """
             Calculates the `geohex`, the H3 cell-id, of the supplied geo_point at the specified precision.
             The result is long encoded. Use [TO_STRING](#esql-to_string) to convert the result to a string,
-            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](esql-to_geoshape.md) to calculate
+            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](#esql-to_geoshape) to calculate
             the `geo_shape` bounding geometry.
 
             These functions are related to the [`geo_grid` query](/reference/query-languages/query-dsl/query-dsl-geo-grid-query.md)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotile.java

@@ -115,7 +115,7 @@ public GeoTileBoundedGrid get(DriverContext context) {
         description = """
             Calculates the `geotile` of the supplied geo_point at the specified precision.
             The result is long encoded. Use [TO_STRING](#esql-to_string) to convert the result to a string,
-            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](esql-to_geoshape.md) to calculate
+            [TO_LONG](#esql-to_long) to convert it to a `long`, or [TO_GEOSHAPE](#esql-to_geoshape) to calculate
             the `geo_shape` bounding geometry.
 
             These functions are related to the [`geo_grid` query](/reference/query-languages/query-dsl/query-dsl-geo-grid-query.md)

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml

@@ -225,7 +225,7 @@ setup:
   - gt: {esql.functions.to_long: $functions_to_long}
   - match: {esql.functions.coalesce: $functions_coalesce}
   - gt: {esql.functions.categorize: $functions_categorize}
-  - length: {esql.functions: 142} # check the "sister" test above for a likely update to the same esql.functions length check
+  - length: {esql.functions: 148} # check the "sister" test above for a likely update to the same esql.functions length check
 
 ---
 took: