Merge branch 'main' into query_visit_percentage

Author: john-wagster

muted-tests.yml

@@ -549,10 +549,6 @@ tests:
 - class: org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDeciderIT
   method: testShardsAreKeptInPreferredTierUntilTheNextTierIsInItsFinalState
   issue: https://github.com/elastic/elasticsearch/issues/134050
-- class: org.elasticsearch.xpack.esql.expression.function.aggregate.ValuesTests
-  issue: https://github.com/elastic/elasticsearch/issues/134072
-- class: org.elasticsearch.xpack.esql.expression.function.aggregate.SampleTests
-  issue: https://github.com/elastic/elasticsearch/issues/134072
 
 # Examples:
 #

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java

@@ -535,7 +535,7 @@ protected static String standardAggregatorName(String prefix, DataType type) {
             case DOUBLE, COUNTER_DOUBLE -> "Double";
             case INTEGER, COUNTER_INTEGER -> "Int";
             case IP -> "Ip";
-            case DATETIME, DATE_NANOS, LONG, COUNTER_LONG, UNSIGNED_LONG -> "Long";
+            case DATETIME, DATE_NANOS, LONG, COUNTER_LONG, UNSIGNED_LONG, GEOHASH, GEOTILE, GEOHEX -> "Long";
             case NULL -> "Null";
             default -> throw new UnsupportedOperationException("name for [" + type + "]");
         };