diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountTests.java index 863a8cc5f255b..b4aafef8fa467 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountTests.java @@ -51,6 +51,9 @@ public static Iterable parameters() { MultiRowTestCaseSupplier.geoPointCases(1, 1000, IncludingAltitude.YES), MultiRowTestCaseSupplier.geoShapeCasesWithoutCircle(1, 1000, IncludingAltitude.YES), MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 1000, IncludingAltitude.YES), + MultiRowTestCaseSupplier.geohashCases(1, 1000), + MultiRowTestCaseSupplier.geotileCases(1, 1000), + MultiRowTestCaseSupplier.geohexCases(1, 1000), MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.KEYWORD), MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.TEXT) ).flatMap(List::stream).map(CountTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers)); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SampleTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SampleTests.java index 8b66da40ddb27..e61447a65a820 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SampleTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SampleTests.java @@ -59,7 +59,10 @@ public static Iterable parameters() { MultiRowTestCaseSupplier.geoPointCases(1, 1000, MultiRowTestCaseSupplier.IncludingAltitude.NO), MultiRowTestCaseSupplier.cartesianPointCases(1, 1000, MultiRowTestCaseSupplier.IncludingAltitude.NO), MultiRowTestCaseSupplier.geoShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO), - MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO) + MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO), + MultiRowTestCaseSupplier.geohashCases(1, 1000), + MultiRowTestCaseSupplier.geotileCases(1, 1000), + MultiRowTestCaseSupplier.geohexCases(1, 1000) ) .flatMap(List::stream) .map(fieldCaseSupplier -> makeSupplier(fieldCaseSupplier, limitCaseSupplier)) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesTests.java index f386f623e17dc..f23ff3c715ca4 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesTests.java @@ -59,7 +59,10 @@ public static Iterable parameters() { MultiRowTestCaseSupplier.geoPointCases(1, 1000, MultiRowTestCaseSupplier.IncludingAltitude.NO), MultiRowTestCaseSupplier.cartesianPointCases(1, 1000, MultiRowTestCaseSupplier.IncludingAltitude.NO), MultiRowTestCaseSupplier.geoShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO), - MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO) + MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 20, MultiRowTestCaseSupplier.IncludingAltitude.NO), + MultiRowTestCaseSupplier.geohashCases(1, 100), + MultiRowTestCaseSupplier.geotileCases(1, 100), + MultiRowTestCaseSupplier.geohexCases(1, 100) ).flatMap(List::stream).map(ValuesTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers)); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(suppliers, false); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java index 8d3b214f97a63..a538f17969bce 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java @@ -56,6 +56,9 @@ public class CaseTests extends AbstractScalarFunctionTestCase { DataType.GEO_POINT, DataType.CARTESIAN_SHAPE, DataType.GEO_SHAPE, + DataType.GEOHASH, + DataType.GEOTILE, + DataType.GEOHEX, DataType.NULL ).collect(Collectors.toList()); if (Build.current().isSnapshot()) { diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeErrorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeErrorTests.java index 9e6f81e649d84..3b689323990dc 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeErrorTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeErrorTests.java @@ -32,6 +32,7 @@ protected Expression build(Source source, List args) { @Override protected Matcher expectedTypeErrorMatcher(List> validPerPosition, List signature) { - return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "geo_point or geo_shape or string")); + String expectedTypes = "geo_point or geo_shape or geohash or geohex or geotile or string"; + return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> expectedTypes)); } } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeTests.java index 5b75bded802de..a2148a61f4fb1 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeTests.java @@ -18,6 +18,7 @@ import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase; import org.elasticsearch.xpack.esql.expression.function.FunctionName; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; +import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter; import java.util.ArrayList; import java.util.List; @@ -39,8 +40,20 @@ public static Iterable parameters() { final Function evaluatorName = s -> "ToGeoShape" + s + "Evaluator[in=" + attribute + "]"; final List suppliers = new ArrayList<>(); + // Points and shapes TestCaseSupplier.forUnaryGeoPoint(suppliers, attribute, DataType.GEO_SHAPE, v -> v, List.of()); TestCaseSupplier.forUnaryGeoShape(suppliers, attribute, DataType.GEO_SHAPE, v -> v, List.of()); + // Geo-Grid types + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + TestCaseSupplier.forUnaryGeoGrid( + suppliers, + "ToGeoShapeFromGeoGridEvaluator[in=Attribute[channel=0], dataType=" + gridType + "]", + gridType, + DataType.GEO_SHAPE, + v -> EsqlDataTypeConverter.geoGridToShape((long) v, gridType), + List.of() + ); + } // random strings that don't look like a geo shape TestCaseSupplier.forUnaryStrings(suppliers, evaluatorName.apply("FromString"), DataType.GEO_SHAPE, bytesRef -> null, bytesRef -> { var exception = expectThrows(Exception.class, () -> GEO.wktToWkb(bytesRef.utf8ToString())); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashErrorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashErrorTests.java new file mode 100644 index 0000000000000..aefe38d0f8685 --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashErrorTests.java @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.core.type.DataType; +import org.elasticsearch.xpack.esql.expression.function.ErrorsForCasesWithoutExamplesTestCase; +import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; +import org.hamcrest.Matcher; + +import java.util.List; +import java.util.Set; + +import static org.hamcrest.Matchers.equalTo; + +public class ToGeohashErrorTests extends ErrorsForCasesWithoutExamplesTestCase { + @Override + protected List cases() { + return paramsToSuppliers(ToGeohashTests.parameters()); + } + + @Override + protected Expression build(Source source, List args) { + return new ToGeohash(source, args.get(0)); + } + + @Override + protected Matcher expectedTypeErrorMatcher(List> validPerPosition, List signature) { + return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "geohash or long or string")); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashSerializationTests.java new file mode 100644 index 0000000000000..244094a627589 --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashSerializationTests.java @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.expression.AbstractUnaryScalarSerializationTests; + +public class ToGeohashSerializationTests extends AbstractUnaryScalarSerializationTests { + @Override + protected ToGeohash create(Source source, Expression child) { + return new ToGeohash(source, child); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToLongTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashTests.java similarity index 53% rename from x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToLongTests.java rename to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashTests.java index fab3655677774..d9c0be69ac42a 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToLongTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohashTests.java @@ -5,7 +5,7 @@ * 2.0. */ -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; @@ -15,6 +15,7 @@ import org.elasticsearch.xpack.esql.core.expression.Expression; 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.FunctionName; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; @@ -22,42 +23,33 @@ import java.util.List; import java.util.function.Supplier; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geohash_to_long") -public class StGeohashToLongTests extends SpatialGridTypeConversionTestCases { - public StGeohashToLongTests(@Name("TestCase") Supplier testCaseSupplier) { +@FunctionName("to_geohash") +public class ToGeohashTests extends AbstractScalarFunctionTestCase { + public ToGeohashTests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @ParametersFactory public static Iterable parameters() { + final String attribute = "Attribute[channel=0]"; + final String evaluator = "ToGeohashFromStringEvaluator[in=Attribute[channel=0]]"; final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "Attribute[channel=0]", - DataType.LONG, - g -> StGeohash.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeohashToLongTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "StGeohashToLongFromStringEvaluator[gridId=Attribute[channel=0]]", - DataType.LONG, - g -> new BytesRef(Geohash.stringEncode(StGeohash.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeohashToLongTests::valueOf - ); + + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.GEOHASH, DataType.GEOHASH, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.LONG, DataType.GEOHASH, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOHASH, ToGeohashTests::valueOf, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOHASH, ToGeohashTests::valueOf, List.of()); + return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } - private static long valueOf(Object gridid) { - return (gridid instanceof Long hash) ? hash : Geohash.longEncode(((BytesRef) gridid).utf8ToString()); + private static long valueOf(Object gridAddress) { + assert gridAddress instanceof BytesRef; + return Geohash.longEncode(((BytesRef) gridAddress).utf8ToString()); } @Override protected Expression build(Source source, List args) { - return new StGeohashToLong(source, args.get(0)); + return new ToGeohash(source, args.get(0)); } } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexSerializationTests.java new file mode 100644 index 0000000000000..a76c8e4a1e535 --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexSerializationTests.java @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.expression.AbstractUnaryScalarSerializationTests; + +public class ToGeohexSerializationTests extends AbstractUnaryScalarSerializationTests { + @Override + protected ToGeohex create(Source source, Expression child) { + return new ToGeohex(source, child); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToLongTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexTests.java similarity index 53% rename from x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToLongTests.java rename to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexTests.java index 7c28fdb551079..75eefec4b3c96 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToLongTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexTests.java @@ -5,7 +5,7 @@ * 2.0. */ -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; @@ -15,6 +15,7 @@ import org.elasticsearch.xpack.esql.core.expression.Expression; 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.FunctionName; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; @@ -22,42 +23,33 @@ import java.util.List; import java.util.function.Supplier; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geohex_to_long") -public class StGeohexToLongTests extends SpatialGridTypeConversionTestCases { - public StGeohexToLongTests(@Name("TestCase") Supplier testCaseSupplier) { +@FunctionName("to_geohex") +public class ToGeohexTests extends AbstractScalarFunctionTestCase { + public ToGeohexTests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @ParametersFactory public static Iterable parameters() { + final String attribute = "Attribute[channel=0]"; + final String evaluator = "ToGeohexFromStringEvaluator[in=Attribute[channel=0]]"; final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "Attribute[channel=0]", - DataType.LONG, - g -> StGeohex.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeohexToLongTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "StGeohexToLongFromStringEvaluator[gridId=Attribute[channel=0]]", - DataType.LONG, - g -> new BytesRef(H3.h3ToString(StGeohex.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeohexToLongTests::valueOf - ); + + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.GEOHEX, DataType.GEOHEX, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.LONG, DataType.GEOHEX, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOHEX, ToGeohexTests::valueOf, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOHEX, ToGeohexTests::valueOf, List.of()); + return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } - private static long valueOf(Object gridid) { - return (gridid instanceof Long hash) ? hash : H3.stringToH3(((BytesRef) gridid).utf8ToString()); + private static long valueOf(Object gridAddress) { + assert gridAddress instanceof BytesRef; + return H3.stringToH3(((BytesRef) gridAddress).utf8ToString()); } @Override protected Expression build(Source source, List args) { - return new StGeohexToLong(source, args.get(0)); + return new ToGeohex(source, args.get(0)); } } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexhErrorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexhErrorTests.java new file mode 100644 index 0000000000000..24e2521731bde --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeohexhErrorTests.java @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.core.type.DataType; +import org.elasticsearch.xpack.esql.expression.function.ErrorsForCasesWithoutExamplesTestCase; +import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; +import org.hamcrest.Matcher; + +import java.util.List; +import java.util.Set; + +import static org.hamcrest.Matchers.equalTo; + +public class ToGeohexhErrorTests extends ErrorsForCasesWithoutExamplesTestCase { + @Override + protected List cases() { + return paramsToSuppliers(ToGeohexTests.parameters()); + } + + @Override + protected Expression build(Source source, List args) { + return new ToGeohex(source, args.get(0)); + } + + @Override + protected Matcher expectedTypeErrorMatcher(List> validPerPosition, List signature) { + return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "geohex or long or string")); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileErrorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileErrorTests.java new file mode 100644 index 0000000000000..9696b7399e830 --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileErrorTests.java @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.core.type.DataType; +import org.elasticsearch.xpack.esql.expression.function.ErrorsForCasesWithoutExamplesTestCase; +import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; +import org.hamcrest.Matcher; + +import java.util.List; +import java.util.Set; + +import static org.hamcrest.Matchers.equalTo; + +public class ToGeotileErrorTests extends ErrorsForCasesWithoutExamplesTestCase { + @Override + protected List cases() { + return paramsToSuppliers(ToGeotileTests.parameters()); + } + + @Override + protected Expression build(Source source, List args) { + return new ToGeotile(source, args.get(0)); + } + + @Override + protected Matcher expectedTypeErrorMatcher(List> validPerPosition, List signature) { + return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "geotile or long or string")); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileSerializationTests.java new file mode 100644 index 0000000000000..dc6838a96343d --- /dev/null +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileSerializationTests.java @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; + +import org.elasticsearch.xpack.esql.core.expression.Expression; +import org.elasticsearch.xpack.esql.core.tree.Source; +import org.elasticsearch.xpack.esql.expression.AbstractUnaryScalarSerializationTests; + +public class ToGeotileSerializationTests extends AbstractUnaryScalarSerializationTests { + @Override + protected ToGeotile create(Source source, Expression child) { + return new ToGeotile(source, child); + } +} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToLongTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileTests.java similarity index 53% rename from x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToLongTests.java rename to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileTests.java index 1f43536719fd8..49776099ada9f 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToLongTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeotileTests.java @@ -5,7 +5,7 @@ * 2.0. */ -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; +package org.elasticsearch.xpack.esql.expression.function.scalar.convert; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; @@ -15,6 +15,7 @@ import org.elasticsearch.xpack.esql.core.expression.Expression; 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.FunctionName; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; @@ -22,42 +23,33 @@ import java.util.List; import java.util.function.Supplier; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geotile_to_long") -public class StGeotileToLongTests extends SpatialGridTypeConversionTestCases { - public StGeotileToLongTests(@Name("TestCase") Supplier testCaseSupplier) { +@FunctionName("to_geotile") +public class ToGeotileTests extends AbstractScalarFunctionTestCase { + public ToGeotileTests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @ParametersFactory public static Iterable parameters() { + final String attribute = "Attribute[channel=0]"; + final String evaluator = "ToGeotileFromStringEvaluator[in=Attribute[channel=0]]"; final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "Attribute[channel=0]", - DataType.LONG, - g -> StGeotile.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeotileToLongTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "StGeotileToLongFromStringEvaluator[gridId=Attribute[channel=0]]", - DataType.LONG, - g -> new BytesRef(GeoTileUtils.stringEncode(StGeotile.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeotileToLongTests::valueOf - ); + + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.GEOTILE, DataType.GEOTILE, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, attribute, DataType.LONG, DataType.GEOTILE, v -> v, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.KEYWORD, DataType.GEOTILE, ToGeotileTests::valueOf, List.of()); + TestCaseSupplier.forUnaryGeoGrid(suppliers, evaluator, DataType.TEXT, DataType.GEOTILE, ToGeotileTests::valueOf, List.of()); + return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } - private static long valueOf(Object gridid) { - return (gridid instanceof Long hash) ? hash : GeoTileUtils.longEncode(((BytesRef) gridid).utf8ToString()); + private static long valueOf(Object gridAddress) { + assert gridAddress instanceof BytesRef; + return GeoTileUtils.longEncode(((BytesRef) gridAddress).utf8ToString()); } @Override protected Expression build(Source source, List args) { - return new StGeotileToLong(source, args.get(0)); + return new ToGeotile(source, args.get(0)); } } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongErrorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongErrorTests.java index cc93e4f050796..4c387c545f6f6 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongErrorTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongErrorTests.java @@ -32,13 +32,8 @@ protected Expression build(Source source, List args) { @Override protected Matcher expectedTypeErrorMatcher(List> validPerPosition, List signature) { - return equalTo( - typeErrorMessage( - false, - validPerPosition, - signature, - (v, p) -> "boolean or counter_integer or counter_long or date_nanos or datetime or numeric or string" - ) - ); + String expectedTypes = + "boolean or counter_integer or counter_long or date_nanos or datetime or geohash or geohex or geotile or numeric or string"; + return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> expectedTypes)); } } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongTests.java index 50748d582ed1f..b7925fce6b496 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongTests.java @@ -241,6 +241,11 @@ public static Iterable parameters() { l -> ((Integer) l).longValue(), List.of() ); + + // Geo-Grid types + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + TestCaseSupplier.forUnaryGeoGrid(suppliers, read, gridType, DataType.LONG, v -> v, List.of()); + } return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringTests.java index f766deb2e1686..8d8f59b78114d 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringTests.java @@ -19,6 +19,7 @@ import org.elasticsearch.xpack.esql.core.type.DataType; import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; +import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter; import java.math.BigInteger; import java.time.Instant; @@ -141,6 +142,17 @@ public static Iterable parameters() { v -> new BytesRef(v.toString()), List.of() ); + // Geo-Grid types + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + TestCaseSupplier.forUnaryGeoGrid( + suppliers, + "ToStringFromGeoGridEvaluator[gridId=Attribute[channel=0], dataType=" + gridType + "]", + gridType, + DataType.KEYWORD, + v -> new BytesRef(EsqlDataTypeConverter.geoGridToString((long) v, gridType)), + List.of() + ); + } return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunctionTestCase.java index c57847a5daea9..dfa0dc786474c 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunctionTestCase.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunctionTestCase.java @@ -12,6 +12,10 @@ import org.elasticsearch.geo.GeometryTestUtils; import org.elasticsearch.geo.ShapeTestUtils; import org.elasticsearch.geometry.Geometry; +import org.elasticsearch.geometry.Point; +import org.elasticsearch.geometry.utils.Geohash; +import org.elasticsearch.h3.H3; +import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.esql.core.expression.Expression; import org.elasticsearch.xpack.esql.core.tree.Source; @@ -571,6 +575,98 @@ protected static void spatial( } } + /** + * Build many test cases with {@code geohash} values that are converted to another type. + * This assumes that the function consumes {@code geohash} values and produces another type. + * For example, mv_count() can consume geo-grid values and produce an integer count. + */ + protected static void geohashGrid( + List cases, + String name, + String evaluatorName, + DataType expectedDataType, + BiFunction, Matcher> matcher + ) { + Supplier supplier = () -> { + Point point = GeometryTestUtils.randomPoint(); + return Geohash.longEncode(point.getX(), point.getY(), randomIntBetween(1, Geohash.PRECISION)); + }; + spatialGrid(cases, name, evaluatorName, DataType.GEOHASH, expectedDataType, supplier, matcher); + } + + /** + * Build many test cases with {@code geotile} values that are converted to another type. + * This assumes that the function consumes {@code geotile} values and produces another type. + * For example, mv_count() can consume geo-grid values and produce an integer count. + */ + protected static void geotileGrid( + List cases, + String name, + String evaluatorName, + DataType expectedDataType, + BiFunction, Matcher> matcher + ) { + Supplier supplier = () -> { + Point point = GeometryTestUtils.randomPoint(); + return GeoTileUtils.longEncode(point.getX(), point.getY(), randomIntBetween(1, GeoTileUtils.MAX_ZOOM)); + }; + spatialGrid(cases, name, evaluatorName, DataType.GEOTILE, expectedDataType, supplier, matcher); + } + + /** + * Build many test cases with {@code geohex} values that are converted to another type. + * This assumes that the function consumes {@code geohex} values and produces another type. + * For example, mv_count() can consume geo-grid values and produce an integer count. + */ + protected static void geohexGrid( + List cases, + String name, + String evaluatorName, + DataType expectedDataType, + BiFunction, Matcher> matcher + ) { + Supplier supplier = () -> { + Point point = GeometryTestUtils.randomPoint(); + return H3.geoToH3(point.getLat(), point.getLon(), randomIntBetween(1, H3.MAX_H3_RES)); + }; + spatialGrid(cases, name, evaluatorName, DataType.GEOHEX, expectedDataType, supplier, matcher); + } + + /** + * Build many test cases for spatial grid values + */ + protected static void spatialGrid( + List cases, + String name, + String evaluatorName, + DataType dataType, + DataType expectedDataType, + Supplier randomGridId, + BiFunction, Matcher> matcher + ) { + cases.add(new TestCaseSupplier(name + "(" + dataType.typeName() + ")", List.of(dataType), () -> { + long gridId = randomGridId.get(); + return new TestCaseSupplier.TestCase( + List.of(new TestCaseSupplier.TypedData(List.of(gridId), dataType, "field")), + evaluatorName + "[field=Attribute[channel=0]]", + expectedDataType, + matcher.apply(1, Stream.of(gridId)) + ); + })); + for (Block.MvOrdering ordering : Block.MvOrdering.values()) { + cases.add(new TestCaseSupplier(name + "(<" + dataType.typeName() + "s>) " + ordering, List.of(dataType), () -> { + List mvData = randomList(1, 100, randomGridId); + putInOrder(mvData, ordering); + return new TestCaseSupplier.TestCase( + List.of(new TestCaseSupplier.TypedData(mvData, dataType, "field")), + evaluatorName + "[field=Attribute[channel=0]]", + expectedDataType, + matcher.apply(mvData.size(), mvData.stream()) + ); + })); + } + } + /** * Build many test cases with unsigned {@code long} values. */ diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppendTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppendTests.java index c0c14499fa744..d485d990693b1 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppendTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppendTests.java @@ -29,6 +29,7 @@ import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.CARTESIAN; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.GEO; +import static org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvSliceTests.randomGrid; import static org.hamcrest.Matchers.equalTo; public class MvAppendTests extends AbstractScalarFunctionTestCase { @@ -89,21 +90,13 @@ private static void ints(List suppliers) { } private static void longs(List suppliers) { - suppliers.add(new TestCaseSupplier(List.of(DataType.LONG, DataType.LONG), () -> { - List field1 = randomList(1, 10, () -> randomLong()); - List field2 = randomList(1, 10, () -> randomLong()); - var result = new ArrayList<>(field1); - result.addAll(field2); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field1, DataType.LONG, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.LONG, "field2") - ), - "MvAppendLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.LONG, - equalTo(result) - ); - })); + addLongTestCase(suppliers, DataType.LONG, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATETIME, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATE_NANOS, ESTestCase::randomNonNegativeLong); + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + addLongTestCase(suppliers, gridType, () -> randomGrid(gridType)); + } + suppliers.add(new TestCaseSupplier(List.of(DataType.UNSIGNED_LONG, DataType.UNSIGNED_LONG), () -> { List field1 = randomList(1, 10, ESTestCase::randomLong); List field2 = randomList(1, 10, ESTestCase::randomLong); @@ -118,33 +111,21 @@ private static void longs(List suppliers) { equalTo(result) ); })); - suppliers.add(new TestCaseSupplier(List.of(DataType.DATETIME, DataType.DATETIME), () -> { - List field1 = randomList(1, 10, () -> randomLong()); - List field2 = randomList(1, 10, () -> randomLong()); - var result = new ArrayList<>(field1); - result.addAll(field2); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field1, DataType.DATETIME, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.DATETIME, "field2") - ), - "MvAppendLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.DATETIME, - equalTo(result) - ); - })); - suppliers.add(new TestCaseSupplier(List.of(DataType.DATE_NANOS, DataType.DATE_NANOS), () -> { - List field1 = randomList(1, 10, () -> randomNonNegativeLong()); - List field2 = randomList(1, 10, () -> randomNonNegativeLong()); + } + + private static void addLongTestCase(List suppliers, DataType dataType, Supplier longSupplier) { + suppliers.add(new TestCaseSupplier(List.of(dataType, dataType), () -> { + List field1 = randomList(1, 10, longSupplier); + List field2 = randomList(1, 10, longSupplier); var result = new ArrayList<>(field1); result.addAll(field2); return new TestCaseSupplier.TestCase( List.of( - new TestCaseSupplier.TypedData(field1, DataType.DATE_NANOS, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.DATE_NANOS, "field2") + new TestCaseSupplier.TypedData(field1, dataType, "field1"), + new TestCaseSupplier.TypedData(field2, dataType, "field2") ), "MvAppendLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.DATE_NANOS, + dataType, equalTo(result) ); })); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContainsTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContainsTests.java index 57da6d5c2fe9a..7b833ba86e00d 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContainsTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContainsTests.java @@ -35,6 +35,7 @@ import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.GEO; import static org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier.TypedData.MULTI_ROW_NULL; import static org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier.TypedData.NULL; +import static org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvSliceTests.randomGrid; import static org.hamcrest.Matchers.equalTo; public class MvContainsTests extends AbstractScalarFunctionTestCase { @@ -100,56 +101,24 @@ private static void ints(List suppliers) { } private static void longs(List suppliers) { - suppliers.add(new TestCaseSupplier(List.of(DataType.LONG, DataType.LONG), () -> { - List field1 = randomList(1, 10, ESTestCase::randomLong); - List field2 = randomList(1, 10, ESTestCase::randomLong); - var result = field1.containsAll(field2); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field1, DataType.LONG, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.LONG, "field2") - ), - "MvContainsLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.BOOLEAN, - equalTo(result) - ); - })); - suppliers.add(new TestCaseSupplier(List.of(DataType.UNSIGNED_LONG, DataType.UNSIGNED_LONG), () -> { - List field1 = randomList(1, 10, ESTestCase::randomLong); - List field2 = randomList(1, 10, ESTestCase::randomLong); - var result = field1.containsAll(field2); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field1, DataType.UNSIGNED_LONG, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.UNSIGNED_LONG, "field2") - ), - "MvContainsLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.BOOLEAN, - equalTo(result) - ); - })); - suppliers.add(new TestCaseSupplier(List.of(DataType.DATETIME, DataType.DATETIME), () -> { - List field1 = randomList(1, 10, ESTestCase::randomLong); - List field2 = randomList(1, 10, ESTestCase::randomLong); - var result = field1.containsAll(field2); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field1, DataType.DATETIME, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.DATETIME, "field2") - ), - "MvContainsLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", - DataType.BOOLEAN, - equalTo(result) - ); - })); - suppliers.add(new TestCaseSupplier(List.of(DataType.DATE_NANOS, DataType.DATE_NANOS), () -> { - List field1 = randomList(1, 10, ESTestCase::randomNonNegativeLong); - List field2 = randomList(1, 10, ESTestCase::randomNonNegativeLong); + addLongTestCase(suppliers, DataType.LONG, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.UNSIGNED_LONG, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATETIME, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATE_NANOS, ESTestCase::randomNonNegativeLong); + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + addLongTestCase(suppliers, gridType, () -> randomGrid(gridType)); + } + } + + private static void addLongTestCase(List suppliers, DataType dataType, Supplier longSupplier) { + suppliers.add(new TestCaseSupplier(List.of(dataType, dataType), () -> { + List field1 = randomList(1, 10, longSupplier); + List field2 = randomList(1, 10, longSupplier); var result = field1.containsAll(field2); return new TestCaseSupplier.TestCase( List.of( - new TestCaseSupplier.TypedData(field1, DataType.DATE_NANOS, "field1"), - new TestCaseSupplier.TypedData(field2, DataType.DATE_NANOS, "field2") + new TestCaseSupplier.TypedData(field1, dataType, "field1"), + new TestCaseSupplier.TypedData(field2, dataType, "field2") ), "MvContainsLongEvaluator[field1=Attribute[channel=0], field2=Attribute[channel=1]]", DataType.BOOLEAN, diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCountTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCountTests.java index 6aeab0339c172..a1bcca42a8d93 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCountTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCountTests.java @@ -41,6 +41,9 @@ public static Iterable parameters() { cartesianPoints(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); geoShape(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); cartesianShape(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); + geohashGrid(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); + geotileGrid(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); + geohexGrid(cases, "mv_count", "MvCount", DataType.INTEGER, (size, values) -> equalTo(Math.toIntExact(values.count()))); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, cases); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupeTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupeTests.java index 24fd0a349796c..78e51b802c191 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupeTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupeTests.java @@ -47,6 +47,9 @@ public static Iterable parameters() { cartesianShape(cases, "mv_dedupe", "MvDedupe", DataType.CARTESIAN_SHAPE, (size, values) -> getMatcher(values)); geoPoints(cases, "mv_dedupe", "MvDedupe", (size, values) -> getMatcher(values)); geoShape(cases, "mv_dedupe", "MvDedupe", DataType.GEO_SHAPE, (size, values) -> getMatcher(values)); + geohashGrid(cases, "mv_dedupe", "MvDedupe", DataType.GEOHASH, (size, values) -> getMatcher(values)); + geotileGrid(cases, "mv_dedupe", "MvDedupe", DataType.GEOTILE, (size, values) -> getMatcher(values)); + geohexGrid(cases, "mv_dedupe", "MvDedupe", DataType.GEOHEX, (size, values) -> getMatcher(values)); unsignedLongs(cases, "mv_dedupe", "MvDedupe", (size, values) -> getMatcher(values)); return parameterSuppliersFromTypedData(anyNullIsNull(false, cases)); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstTests.java index 3ee98364141c6..5d0a4b4b43cda 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstTests.java @@ -42,6 +42,9 @@ public static Iterable parameters() { cartesianPoints(cases, "mv_first", "MvFirst", DataType.CARTESIAN_POINT, (size, values) -> equalTo(values.findFirst().get())); geoShape(cases, "mv_first", "MvFirst", DataType.GEO_SHAPE, (size, values) -> equalTo(values.findFirst().get())); cartesianShape(cases, "mv_first", "MvFirst", DataType.CARTESIAN_SHAPE, (size, values) -> equalTo(values.findFirst().get())); + geohashGrid(cases, "mv_first", "MvFirst", DataType.GEOHASH, (size, values) -> equalTo(values.findFirst().get())); + geotileGrid(cases, "mv_first", "MvFirst", DataType.GEOTILE, (size, values) -> equalTo(values.findFirst().get())); + geohexGrid(cases, "mv_first", "MvFirst", DataType.GEOHEX, (size, values) -> equalTo(values.findFirst().get())); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(false, cases); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastTests.java index a7a13360ce443..a725b03c860f5 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastTests.java @@ -42,6 +42,9 @@ public static Iterable parameters() { cartesianPoints(cases, "mv_last", "MvLast", DataType.CARTESIAN_POINT, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); geoShape(cases, "mv_last", "MvLast", DataType.GEO_SHAPE, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); cartesianShape(cases, "mv_last", "MvLast", DataType.CARTESIAN_SHAPE, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); + geohashGrid(cases, "mv_first", "MvLast", DataType.GEOHASH, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); + geotileGrid(cases, "mv_first", "MvLast", DataType.GEOTILE, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); + geohexGrid(cases, "mv_first", "MvLast", DataType.GEOHEX, (size, values) -> equalTo(values.reduce((f, s) -> s).get())); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(false, cases); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceTests.java index abecd38cfbba1..a6aa700617f79 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceTests.java @@ -13,6 +13,11 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.geo.GeometryTestUtils; import org.elasticsearch.geo.ShapeTestUtils; +import org.elasticsearch.geometry.Point; +import org.elasticsearch.geometry.utils.Geohash; +import org.elasticsearch.h3.H3; +import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.esql.core.InvalidArgumentException; import org.elasticsearch.xpack.esql.core.expression.Expression; import org.elasticsearch.xpack.esql.core.tree.Source; @@ -27,6 +32,9 @@ import java.util.function.Supplier; import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHASH; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHEX; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOTILE; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.CARTESIAN; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.GEO; import static org.hamcrest.Matchers.equalTo; @@ -52,7 +60,7 @@ public static Iterable parameters() { String evaluatorTypePart = switch (firstArgumentType) { case BOOLEAN -> "Boolean"; case INTEGER -> "Int"; - case LONG, DATE_NANOS, DATETIME, UNSIGNED_LONG -> "Long"; + case LONG, DATE_NANOS, DATETIME, UNSIGNED_LONG, GEOHASH, GEOTILE, GEOHEX -> "Long"; case DOUBLE -> "Double"; case KEYWORD, TEXT, IP, VERSION, GEO_POINT, CARTESIAN_POINT, GEO_SHAPE, CARTESIAN_SHAPE -> "BytesRef"; default -> throw new IllegalArgumentException("Unsupported type: " + firstArgumentType); @@ -210,74 +218,59 @@ private static void ints(List suppliers) { } private static void longs(List suppliers) { - suppliers.add(new TestCaseSupplier(List.of(DataType.LONG, DataType.INTEGER, DataType.INTEGER), () -> { - List field = randomList(1, 10, () -> randomLong()); - int length = field.size(); - int start = randomIntBetween(0, length - 1); - int end = randomIntBetween(start, length - 1); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field, DataType.LONG, "field"), - new TestCaseSupplier.TypedData(start, DataType.INTEGER, "start"), - new TestCaseSupplier.TypedData(end, DataType.INTEGER, "end") - ), - "MvSliceLongEvaluator[field=Attribute[channel=0], start=Attribute[channel=1], end=Attribute[channel=2]]", - DataType.LONG, - equalTo(start == end ? field.get(start) : field.subList(start, end + 1)) - ); - })); + addLongTestCase(suppliers, DataType.LONG, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATETIME, ESTestCase::randomLong); + addLongTestCase(suppliers, DataType.DATE_NANOS, ESTestCase::randomLong); + for (DataType gridType : new DataType[] { GEOHASH, GEOTILE, GEOHEX }) { + addLongTestCase(suppliers, gridType, () -> randomGrid(gridType)); + } - suppliers.add(new TestCaseSupplier(List.of(DataType.DATETIME, DataType.INTEGER, DataType.INTEGER), () -> { - List field = randomList(1, 10, () -> randomLong()); + suppliers.add(new TestCaseSupplier(List.of(DataType.UNSIGNED_LONG, DataType.INTEGER, DataType.INTEGER), () -> { + List field = randomList(1, 10, () -> randomNonNegativeLong()); + List result = field.stream().map(NumericUtils::unsignedLongAsBigInteger).toList(); int length = field.size(); int start = randomIntBetween(0, length - 1); int end = randomIntBetween(start, length - 1); return new TestCaseSupplier.TestCase( List.of( - new TestCaseSupplier.TypedData(field, DataType.DATETIME, "field"), + new TestCaseSupplier.TypedData(field, DataType.UNSIGNED_LONG, "field"), new TestCaseSupplier.TypedData(start, DataType.INTEGER, "start"), new TestCaseSupplier.TypedData(end, DataType.INTEGER, "end") ), "MvSliceLongEvaluator[field=Attribute[channel=0], start=Attribute[channel=1], end=Attribute[channel=2]]", - DataType.DATETIME, - equalTo(start == end ? field.get(start) : field.subList(start, end + 1)) + DataType.UNSIGNED_LONG, + equalTo(start == end ? result.get(start) : result.subList(start, end + 1)) ); })); + } - suppliers.add(new TestCaseSupplier(List.of(DataType.DATE_NANOS, DataType.INTEGER, DataType.INTEGER), () -> { - List field = randomList(1, 10, () -> randomLong()); + private static void addLongTestCase(List suppliers, DataType dataType, Supplier longSupplier) { + suppliers.add(new TestCaseSupplier(List.of(dataType, DataType.INTEGER, DataType.INTEGER), () -> { + List field = randomList(1, 10, longSupplier); int length = field.size(); int start = randomIntBetween(0, length - 1); int end = randomIntBetween(start, length - 1); return new TestCaseSupplier.TestCase( List.of( - new TestCaseSupplier.TypedData(field, DataType.DATE_NANOS, "field"), + new TestCaseSupplier.TypedData(field, dataType, "field"), new TestCaseSupplier.TypedData(start, DataType.INTEGER, "start"), new TestCaseSupplier.TypedData(end, DataType.INTEGER, "end") ), "MvSliceLongEvaluator[field=Attribute[channel=0], start=Attribute[channel=1], end=Attribute[channel=2]]", - DataType.DATE_NANOS, + dataType, equalTo(start == end ? field.get(start) : field.subList(start, end + 1)) ); })); + } - suppliers.add(new TestCaseSupplier(List.of(DataType.UNSIGNED_LONG, DataType.INTEGER, DataType.INTEGER), () -> { - List field = randomList(1, 10, () -> randomNonNegativeLong()); - List result = field.stream().map(NumericUtils::unsignedLongAsBigInteger).toList(); - int length = field.size(); - int start = randomIntBetween(0, length - 1); - int end = randomIntBetween(start, length - 1); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(field, DataType.UNSIGNED_LONG, "field"), - new TestCaseSupplier.TypedData(start, DataType.INTEGER, "start"), - new TestCaseSupplier.TypedData(end, DataType.INTEGER, "end") - ), - "MvSliceLongEvaluator[field=Attribute[channel=0], start=Attribute[channel=1], end=Attribute[channel=2]]", - DataType.UNSIGNED_LONG, - equalTo(start == end ? result.get(start) : result.subList(start, end + 1)) - ); - })); + static long randomGrid(DataType gridType) { + Point point = GeometryTestUtils.randomPoint(); + return switch (gridType) { + case GEOHASH -> Geohash.longEncode(point.getX(), point.getY(), randomIntBetween(1, Geohash.PRECISION)); + case GEOTILE -> GeoTileUtils.longEncode(point.getX(), point.getY(), randomIntBetween(1, GeoTileUtils.MAX_ZOOM)); + case GEOHEX -> H3.geoToH3(point.getLat(), point.getLon(), randomIntBetween(1, H3.MAX_H3_RES)); + default -> throw new IllegalStateException("Invalid grid type: " + gridType); + }; } private static void doubles(List suppliers) { diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java index ebbeea3b0e8e4..209cf322b0b9a 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java @@ -183,14 +183,23 @@ private static TestCaseSupplier.TestCase nullCase(TestCaseSupplier.TestCase dele } protected static void addSpatialCombinations(List suppliers) { - for (DataType dataType : List.of(DataType.GEO_POINT, DataType.GEO_SHAPE, DataType.CARTESIAN_POINT, DataType.CARTESIAN_SHAPE)) { + for (DataType dataType : List.of( + DataType.GEO_POINT, + DataType.GEO_SHAPE, + DataType.CARTESIAN_POINT, + DataType.CARTESIAN_SHAPE, + DataType.GEOHASH, + DataType.GEOTILE, + DataType.GEOHEX + )) { + String blockType = DataType.isGeoGrid(dataType) ? "Long" : "BytesRef"; TestCaseSupplier.TypedDataSupplier leftDataSupplier = SpatialRelatesFunctionTestCase.testCaseSupplier(dataType, false); TestCaseSupplier.TypedDataSupplier rightDataSupplier = SpatialRelatesFunctionTestCase.testCaseSupplier(dataType, false); suppliers.add( TestCaseSupplier.testCaseSupplier( leftDataSupplier, rightDataSupplier, - (l, r) -> equalTo("CoalesceBytesRefEagerEvaluator[values=[Attribute[channel=0], Attribute[channel=1]]]"), + (l, r) -> equalTo("Coalesce" + blockType + "EagerEvaluator[values=[Attribute[channel=0], Attribute[channel=1]]]"), dataType, (l, r) -> l ) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunctionTestCase.java index 68dd600489393..1f53ea4d9a72c 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunctionTestCase.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunctionTestCase.java @@ -28,6 +28,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHASH; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHEX; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOTILE; import static org.elasticsearch.xpack.esql.core.type.DataType.isSpatial; import static org.elasticsearch.xpack.esql.core.type.DataType.isSpatialGeo; import static org.elasticsearch.xpack.esql.core.type.DataType.isString; @@ -49,17 +52,20 @@ protected static Class getSpatialRelatesFunctionClass() throws ClassNotFoundE public static TestCaseSupplier.TypedDataSupplier testCaseSupplier(DataType dataType, boolean pointsOnly) { if (pointsOnly) { - return switch (dataType.esType()) { - case "geo_point" -> TestCaseSupplier.geoPointCases(() -> false).get(0); - case "cartesian_point" -> TestCaseSupplier.cartesianPointCases(() -> false).get(0); + return switch (dataType) { + case GEO_POINT -> TestCaseSupplier.geoPointCases(() -> false).get(0); + case CARTESIAN_POINT -> TestCaseSupplier.cartesianPointCases(() -> false).get(0); default -> throw new IllegalArgumentException("Unsupported datatype for " + functionName() + ": " + dataType); }; } else { - return switch (dataType.esType()) { - case "geo_point" -> TestCaseSupplier.geoPointCases(() -> false).get(0); - case "geo_shape" -> TestCaseSupplier.geoShapeCases(() -> false).get(0); - case "cartesian_point" -> TestCaseSupplier.cartesianPointCases(() -> false).get(0); - case "cartesian_shape" -> TestCaseSupplier.cartesianShapeCases(() -> false).get(0); + return switch (dataType) { + case GEO_POINT -> TestCaseSupplier.geoPointCases(() -> false).get(0); + case GEO_SHAPE -> TestCaseSupplier.geoShapeCases(() -> false).get(0); + case CARTESIAN_POINT -> TestCaseSupplier.cartesianPointCases(() -> false).get(0); + case CARTESIAN_SHAPE -> TestCaseSupplier.cartesianShapeCases(() -> false).get(0); + case GEOHASH -> TestCaseSupplier.geoGridCases(GEOHASH, () -> false).get(0); + case GEOTILE -> TestCaseSupplier.geoGridCases(GEOTILE, () -> false).get(0); + case GEOHEX -> TestCaseSupplier.geoGridCases(GEOHEX, () -> false).get(0); default -> throw new IllegalArgumentException("Unsupported datatype for " + functionName() + ": " + dataType); }; } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialGridFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialGridFunctionTestCase.java index 0d4eaf6e826d9..d25e98abefd7e 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialGridFunctionTestCase.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialGridFunctionTestCase.java @@ -26,7 +26,6 @@ import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT; import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_SHAPE; import static org.elasticsearch.xpack.esql.core.type.DataType.INTEGER; -import static org.elasticsearch.xpack.esql.core.type.DataType.LONG; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.GEO; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; import static org.hamcrest.Matchers.containsString; @@ -70,6 +69,7 @@ private static String getFunctionClassName() { protected static void addTestCaseSuppliers( List suppliers, DataType[] dataTypes, + DataType gridType, BiFunction expectedValue, TriFunction expectedValueWithBounds ) { @@ -91,7 +91,7 @@ protected static void addTestCaseSuppliers( return new TestCaseSupplier.TestCase( List.of(geoTypedData, precisionData), getFunctionClassName() + evaluatorName, - LONG, + gridType, equalTo(expectedValue.apply(geometry, precision)) ); })); @@ -111,7 +111,7 @@ protected static void addTestCaseSuppliers( return new TestCaseSupplier.TestCase( List.of(geoTypedData, precisionData, boundsData.typedData), startsWith(getFunctionClassName() + evaluatorName), - LONG, + gridType, equalTo(expectedValueWithBounds.apply(geometry, precision, boundsData.geoBoundingBox())) ); })); @@ -121,17 +121,17 @@ protected static void addTestCaseSuppliers( public static TestCaseSupplier.TypedDataSupplier testCaseSupplier(DataType dataType, boolean pointsOnly) { if (pointsOnly) { - return switch (dataType.esType()) { - case "geo_point" -> TestCaseSupplier.geoPointCases(() -> false).getFirst(); - case "cartesian_point" -> TestCaseSupplier.cartesianPointCases(() -> false).getFirst(); + return switch (dataType) { + case GEO_POINT -> TestCaseSupplier.geoPointCases(() -> false).getFirst(); + case CARTESIAN_POINT -> TestCaseSupplier.cartesianPointCases(() -> false).getFirst(); default -> throw new IllegalArgumentException("Unsupported datatype for " + functionName() + ": " + dataType); }; } else { - return switch (dataType.esType()) { - case "geo_point" -> TestCaseSupplier.geoPointCases(() -> false).getFirst(); - case "geo_shape" -> TestCaseSupplier.geoShapeCases(() -> false).getFirst(); - case "cartesian_point" -> TestCaseSupplier.cartesianPointCases(() -> false).getFirst(); - case "cartesian_shape" -> TestCaseSupplier.cartesianShapeCases(() -> false).getFirst(); + return switch (dataType) { + case GEO_POINT -> TestCaseSupplier.geoPointCases(() -> false).getFirst(); + case GEO_SHAPE -> TestCaseSupplier.geoShapeCases(() -> false).getFirst(); + case CARTESIAN_POINT -> TestCaseSupplier.cartesianPointCases(() -> false).getFirst(); + case CARTESIAN_SHAPE -> TestCaseSupplier.cartesianShapeCases(() -> false).getFirst(); default -> throw new IllegalArgumentException("Unsupported datatype for " + functionName() + ": " + dataType); }; } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashTests.java index 185591df91b4d..eba240d1a1973 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashTests.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.function.Supplier; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHASH; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; import static org.hamcrest.Matchers.containsString; @@ -42,7 +44,7 @@ public static License.OperationMode licenseRequirement(List fieldTypes @ParametersFactory public static Iterable parameters() { final List suppliers = new ArrayList<>(); - addTestCaseSuppliers(suppliers, new DataType[] { DataType.GEO_POINT }, StGeohashTests::valueOf, StGeohashTests::boundedValueOf); + addTestCaseSuppliers(suppliers, new DataType[] { GEO_POINT }, GEOHASH, StGeohashTests::valueOf, StGeohashTests::boundedValueOf); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToStringTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToStringTests.java deleted file mode 100644 index 58feda75a8ab9..0000000000000 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohashToStringTests.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; - -import com.carrotsearch.randomizedtesting.annotations.Name; -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; -import org.elasticsearch.xpack.esql.expression.function.FunctionName; -import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geohash_to_string") -public class StGeohashToStringTests extends SpatialGridTypeConversionTestCases { - public StGeohashToStringTests(@Name("TestCase") Supplier testCaseSupplier) { - this.testCase = testCaseSupplier.get(); - } - - @ParametersFactory - public static Iterable parameters() { - final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "StGeohashToStringFromLongEvaluator[gridId=Attribute[channel=0]]", - KEYWORD, - g -> StGeohash.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeohashToStringTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "Attribute[channel=0]", - KEYWORD, - g -> new BytesRef(Geohash.stringEncode(StGeohash.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeohashToStringTests::valueOf - ); - return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); - } - - private static BytesRef valueOf(Object gridid) { - return (gridid instanceof Long hash) ? new BytesRef(Geohash.stringEncode(hash)) : (BytesRef) gridid; - } - - @Override - protected Expression build(Source source, List args) { - return new StGeohashToString(source, args.get(0)); - } -} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexTests.java index f52241806a3be..1e3319e1bf12e 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexTests.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.function.Supplier; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOHEX; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; import static org.hamcrest.Matchers.containsString; @@ -42,7 +44,7 @@ public static License.OperationMode licenseRequirement(List fieldTypes @ParametersFactory public static Iterable parameters() { final List suppliers = new ArrayList<>(); - addTestCaseSuppliers(suppliers, new DataType[] { DataType.GEO_POINT }, StGeohexTests::valueOf, StGeohexTests::boundedValueOf); + addTestCaseSuppliers(suppliers, new DataType[] { GEO_POINT }, GEOHEX, StGeohexTests::valueOf, StGeohexTests::boundedValueOf); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToStringTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToStringTests.java deleted file mode 100644 index bf3c734869330..0000000000000 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeohexToStringTests.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; - -import com.carrotsearch.randomizedtesting.annotations.Name; -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; -import org.elasticsearch.xpack.esql.expression.function.FunctionName; -import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geohex_to_string") -public class StGeohexToStringTests extends SpatialGridTypeConversionTestCases { - public StGeohexToStringTests(@Name("TestCase") Supplier testCaseSupplier) { - this.testCase = testCaseSupplier.get(); - } - - @ParametersFactory - public static Iterable parameters() { - final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "StGeohexToStringFromLongEvaluator[gridId=Attribute[channel=0]]", - KEYWORD, - g -> StGeohex.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeohexToStringTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "Attribute[channel=0]", - KEYWORD, - g -> new BytesRef(H3.h3ToString(StGeohex.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeohexToStringTests::valueOf - ); - return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); - } - - private static BytesRef valueOf(Object gridid) { - return (gridid instanceof Long hash) ? new BytesRef(H3.h3ToString(hash)) : (BytesRef) gridid; - } - - @Override - protected Expression build(Source source, List args) { - return new StGeohexToString(source, args.get(0)); - } -} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileTests.java index 5661f1eacf533..6c8582489e767 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileTests.java @@ -23,6 +23,8 @@ import java.util.function.Supplier; import static org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils.MAX_ZOOM; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEOTILE; +import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT; import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; import static org.hamcrest.Matchers.containsString; @@ -39,10 +41,11 @@ public static License.OperationMode licenseRequirement(List fieldTypes return SpatialGridFunctionTestCase.licenseRequirement(fieldTypes); } + @SuppressWarnings("checkstyle:LineLength") @ParametersFactory public static Iterable parameters() { final List suppliers = new ArrayList<>(); - addTestCaseSuppliers(suppliers, new DataType[] { DataType.GEO_POINT }, StGeotileTests::valueOf, StGeotileTests::boundedValueOf); + addTestCaseSuppliers(suppliers, new DataType[] { GEO_POINT }, GEOTILE, StGeotileTests::valueOf, StGeotileTests::boundedValueOf); return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToStringTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToStringTests.java deleted file mode 100644 index fd558887c0fda..0000000000000 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StGeotileToStringTests.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.esql.expression.function.scalar.spatial; - -import com.carrotsearch.randomizedtesting.annotations.Name; -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; -import org.elasticsearch.xpack.esql.expression.function.FunctionName; -import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD; -import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.UNSPECIFIED; - -@FunctionName("st_geotile_to_string") -public class StGeotileToStringTests extends SpatialGridTypeConversionTestCases { - public StGeotileToStringTests(@Name("TestCase") Supplier testCaseSupplier) { - this.testCase = testCaseSupplier.get(); - } - - @ParametersFactory - public static Iterable parameters() { - final List suppliers = new ArrayList<>(); - forUnaryGeoPoint( - DataType.LONG, - suppliers, - "StGeotileToStringFromLongEvaluator[gridId=Attribute[channel=0]]", - KEYWORD, - g -> StGeotile.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2), - StGeotileToStringTests::valueOf - ); - forUnaryGeoPoint( - DataType.KEYWORD, - suppliers, - "Attribute[channel=0]", - KEYWORD, - g -> new BytesRef(GeoTileUtils.stringEncode(StGeotile.unboundedGrid.calculateGridId(UNSPECIFIED.wkbAsPoint(g), 2))), - StGeotileToStringTests::valueOf - ); - return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); - } - - private static BytesRef valueOf(Object gridid) { - return (gridid instanceof Long hash) ? new BytesRef(GeoTileUtils.stringEncode(hash)) : (BytesRef) gridid; - } - - @Override - protected Expression build(Source source, List args) { - return new StGeotileToString(source, args.get(0)); - } -} diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/CastOperatorTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/CastOperatorTests.java index 40cb11ea511f0..8ed52cb50a898 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/CastOperatorTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/CastOperatorTests.java @@ -72,6 +72,9 @@ public TestCastOperator( "double", "geo_point", "geo_shape", + "geohash", + "geotile", + "geohex", "integer", "ip", "keyword", diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java index 4b9f21187f425..410919ac0fad5 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java @@ -236,6 +236,22 @@ public static Iterable parameters() { ) ); + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + suppliers.addAll( + TestCaseSupplier.forBinaryNotCasting( + "EqualsLongsEvaluator", + "lhs", + "rhs", + Object::equals, + DataType.BOOLEAN, + TestCaseSupplier.geoGridCases(gridType), + TestCaseSupplier.geoGridCases(gridType), + List.of(), + false + ) + ); + } + return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java index 95001366f1cad..f7646489419c3 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java @@ -233,6 +233,22 @@ public static Iterable parameters() { ) ); + for (DataType gridType : new DataType[] { DataType.GEOHASH, DataType.GEOTILE, DataType.GEOHEX }) { + suppliers.addAll( + TestCaseSupplier.forBinaryNotCasting( + "NotEqualsLongsEvaluator", + "lhs", + "rhs", + (l, r) -> false == l.equals(r), + DataType.BOOLEAN, + TestCaseSupplier.geoGridCases(gridType), + TestCaseSupplier.geoGridCases(gridType), + List.of(), + false + ) + ); + } + return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers); }