Update Count, Sample and Values to accept unsigned_long, and normalize their error messages

Author: ivancea

docs/reference/query-languages/esql/_snippets/functions/types/count.md

@@ -77,9 +77,11 @@ public Count(
                 "aggregate_metric_double",
                 "boolean",
                 "cartesian_point",
+                "cartesian_shape",
                 "date",
                 "double",
                 "geo_point",
+                "geo_shape",
                 "integer",
                 "ip",
                 "keyword",

docs/reference/query-languages/esql/_snippets/functions/types/sample.md

@@ -37,6 +37,7 @@
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNullAndFoldable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
 
 public class Sample extends AggregateFunction implements ToAggregator {
@@ -56,6 +57,7 @@ public class Sample extends AggregateFunction implements ToAggregator {
             "ip",
             "keyword",
             "long",
+            "unsigned_long",
             "version" },
         description = "Collects sample values for a field.",
         type = FunctionType.AGGREGATE,
@@ -78,6 +80,7 @@ public Sample(
                 "ip",
                 "keyword",
                 "long",
+                "unsigned_long",
                 "text",
                 "version" },
             description = "The field to collect sample values for."
@@ -109,7 +112,7 @@ protected TypeResolution resolveType() {
         if (childrenResolved() == false) {
             return new TypeResolution("Unresolved children");
         }
-        var typeResolution = isType(field(), dt -> dt != DataType.UNSIGNED_LONG, sourceText(), FIRST, "any type except unsigned_long").and(
+        var typeResolution = isRepresentableExceptCounters(field(), sourceText(), FIRST).and(
             isNotNullAndFoldable(limitField(), sourceText(), SECOND)
         ).and(isType(limitField(), dt -> dt == DataType.INTEGER, sourceText(), SECOND, "integer"));
         if (typeResolution.unresolved()) {

docs/reference/query-languages/esql/_snippets/functions/types/values.md

@@ -44,6 +44,7 @@ public class Values extends AggregateFunction implements ToAggregator {
     private static final Map<DataType, Supplier<AggregatorFunctionSupplier>> SUPPLIERS = Map.ofEntries(
         Map.entry(DataType.INTEGER, ValuesIntAggregatorFunctionSupplier::new),
         Map.entry(DataType.LONG, ValuesLongAggregatorFunctionSupplier::new),
+        Map.entry(DataType.UNSIGNED_LONG, ValuesLongAggregatorFunctionSupplier::new),
         Map.entry(DataType.DATETIME, ValuesLongAggregatorFunctionSupplier::new),
         Map.entry(DataType.DATE_NANOS, ValuesLongAggregatorFunctionSupplier::new),
         Map.entry(DataType.DOUBLE, ValuesDoubleAggregatorFunctionSupplier::new),
@@ -72,6 +73,7 @@ public class Values extends AggregateFunction implements ToAggregator {
             "ip",
             "keyword",
             "long",
+            "unsigned_long",
             "version" },
         preview = true,
         appliesTo = { @FunctionAppliesTo(lifeCycle = FunctionAppliesToLifecycle.PREVIEW) },
@@ -111,6 +113,7 @@ public Values(
                 "ip",
                 "keyword",
                 "long",
+                "unsigned_long",
                 "text",
                 "version" }
         ) Expression v
@@ -153,7 +156,7 @@ public DataType dataType() {
 
     @Override
     protected TypeResolution resolveType() {
-        return TypeResolutions.isType(field(), SUPPLIERS::containsKey, sourceText(), DEFAULT, "any type except unsigned_long");
+        return TypeResolutions.isRepresentableExceptCounters(field(), sourceText(), DEFAULT);
     }
 
     @Override

docs/reference/query-languages/esql/kibana/definition/functions/count.json

@@ -46,7 +46,8 @@ public static Iterable<Object[]> parameters() {
             MultiRowTestCaseSupplier.ipCases(1, 1000),
             MultiRowTestCaseSupplier.versionCases(1, 1000),
             MultiRowTestCaseSupplier.geoPointCases(1, 1000, IncludingAltitude.YES),
-            MultiRowTestCaseSupplier.cartesianPointCases(1, 1000, IncludingAltitude.YES),
+            MultiRowTestCaseSupplier.geoShapeCasesWithoutCircle(1, 1000, IncludingAltitude.YES),
+            MultiRowTestCaseSupplier.cartesianShapeCasesWithoutCircle(1, 1000, IncludingAltitude.YES),
             MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.KEYWORD),
             MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.TEXT)
         ).flatMap(List::stream).map(CountTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers));