Added tests for invalid precision

Author: craigtaverner

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

@@ -85,7 +85,7 @@ public int precision() {
     private static int checkPrecisionRange(int precision) {
         if (precision < 1 || precision > Geohash.PRECISION) {
             throw new IllegalArgumentException(
-                "Invalid geohash precision of " + precision + ". Must be between 1 and " + Geohash.PRECISION + "."
+                "Invalid geohash_grid precision of " + precision + ". Must be between 1 and " + Geohash.PRECISION + "."
             );
         }
         return precision;

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

@@ -81,7 +81,7 @@ public int precision() {
     private static int checkPrecisionRange(int precision) {
         if (precision < 1 || precision > H3.MAX_H3_RES) {
             throw new IllegalArgumentException(
-                "Invalid geohex precision of " + precision + ". Must be between 0 and " + H3.MAX_H3_RES + "."
+                "Invalid geohex_grid precision of " + precision + ". Must be between 0 and " + H3.MAX_H3_RES + "."
             );
         }
         return precision;

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

@@ -8,6 +8,10 @@
 package org.elasticsearch.xpack.esql.expression.function.scalar.spatial;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.xpack.esql.core.expression.Literal;
+import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
@@ -18,6 +22,7 @@
 import static org.elasticsearch.xpack.esql.core.type.DataType.LONG;
 import static org.elasticsearch.xpack.esql.core.type.DataType.isSpatialGeo;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assume.assumeNotNull;
 
 public abstract class SpatialGridFunctionTestCase extends AbstractScalarFunctionTestCase {
 
@@ -87,4 +92,22 @@ public static TestCaseSupplier.TypedDataSupplier testCaseSupplier(DataType dataT
             };
         }
     }
+
+    protected Long process(int precision, BiFunction<BytesRef, Integer, Long> expectedValue) {
+        Object spatialObj = this.testCase.getDataValues().getFirst();
+        assumeNotNull(spatialObj);
+        assumeTrue("Expected a BytesRef, but got " + spatialObj.getClass(), spatialObj instanceof BytesRef);
+        BytesRef wkb = (BytesRef) spatialObj;
+        try (
+            EvalOperator.ExpressionEvaluator eval = evaluator(
+                build(
+                    Source.EMPTY,
+                    List.of(new Literal(Source.EMPTY, wkb, DataType.GEO_POINT), new Literal(Source.EMPTY, precision, DataType.INTEGER))
+                )
+            ).get(driverContext());
+            Block block = eval.eval(row(List.of(wkb, precision)))
+        ) {
+            return block.isNull(0) ? null : expectedValue.apply(wkb, precision);
+        }
+    }
 }

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

@@ -11,6 +11,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.geometry.utils.Geohash;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
@@ -21,6 +22,7 @@
 import java.util.function.Supplier;
 
 import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED;
+import static org.hamcrest.Matchers.containsString;
 
 public class StGeohashTests extends SpatialGridFunctionTestCase {
     public StGeohashTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
@@ -43,4 +45,11 @@ protected Expression build(Source source, List<Expression> args) {
         Expression bounds = args.size() > 2 ? args.get(2) : null;
         return new StGeohash(source, args.get(0), args.get(1), bounds);
     }
+
+    public void testInvalidPrecision() {
+        IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> process(-1, StGeohashTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geohash_grid precision of -1. Must be between 1 and 12."));
+        ex = expectThrows(IllegalArgumentException.class, () -> process(Geohash.PRECISION + 1, StGeohashTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geohash_grid precision of 13. Must be between 1 and 12."));
+    }
 }

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

@@ -11,6 +11,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.h3.H3;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
@@ -21,6 +22,7 @@
 import java.util.function.Supplier;
 
 import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED;
+import static org.hamcrest.Matchers.containsString;
 
 public class StGeohexTests extends SpatialGridFunctionTestCase {
     public StGeohexTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
@@ -43,4 +45,11 @@ protected Expression build(Source source, List<Expression> args) {
         Expression bounds = args.size() > 2 ? args.get(2) : null;
         return new StGeohex(source, args.get(0), args.get(1), bounds);
     }
+
+    public void testInvalidPrecision() {
+        IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> process(-1, StGeohexTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geohex_grid precision of -1. Must be between 0 and 15."));
+        ex = expectThrows(IllegalArgumentException.class, () -> process(H3.MAX_H3_RES + 1, StGeohexTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geohex_grid precision of 16. Must be between 0 and 15."));
+    }
 }

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

@@ -11,6 +11,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
@@ -21,6 +22,7 @@
 import java.util.function.Supplier;
 
 import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED;
+import static org.hamcrest.Matchers.containsString;
 
 public class StGeotileTests extends SpatialGridFunctionTestCase {
     public StGeotileTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
@@ -43,4 +45,11 @@ protected Expression build(Source source, List<Expression> args) {
         Expression bounds = args.size() > 2 ? args.get(2) : null;
         return new StGeotile(source, args.get(0), args.get(1), bounds);
     }
+
+    public void testInvalidPrecision() {
+        IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> process(-1, StGeotileTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geotile_grid precision of -1. Must be between 0 and 29."));
+        ex = expectThrows(IllegalArgumentException.class, () -> process(GeoTileUtils.MAX_ZOOM + 1, StGeotileTests::valueOf));
+        assertThat(ex.getMessage(), containsString("Invalid geotile_grid precision of 30. Must be between 0 and 29."));
+    }
 }