Merge remote-tracking branch 'upstream/main' into lenient-rerankers

Author: thecoop

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/AggregatorBenchmark.java

@@ -155,7 +155,7 @@ private static Operator operator(DriverContext driverContext, String grouping, S
 
         if (grouping.equals("none")) {
             return new AggregationOperator(
-                List.of(supplier(op, dataType, filter, 0).aggregatorFactory(AggregatorMode.SINGLE).apply(driverContext)),
+                List.of(supplier(op, dataType, filter).aggregatorFactory(AggregatorMode.SINGLE, List.of(0)).apply(driverContext)),
                 driverContext
             );
         }
@@ -182,33 +182,33 @@ private static Operator operator(DriverContext driverContext, String grouping, S
             default -> throw new IllegalArgumentException("unsupported grouping [" + grouping + "]");
         };
         return new HashAggregationOperator(
-            List.of(supplier(op, dataType, filter, groups.size()).groupingAggregatorFactory(AggregatorMode.SINGLE)),
+            List.of(supplier(op, dataType, filter).groupingAggregatorFactory(AggregatorMode.SINGLE, List.of(groups.size()))),
             () -> BlockHash.build(groups, driverContext.blockFactory(), 16 * 1024, false),
             driverContext
         );
     }
 
-    private static AggregatorFunctionSupplier supplier(String op, String dataType, String filter, int dataChannel) {
+    private static AggregatorFunctionSupplier supplier(String op, String dataType, String filter) {
         return filtered(switch (op) {
-            case COUNT -> CountAggregatorFunction.supplier(List.of(dataChannel));
+            case COUNT -> CountAggregatorFunction.supplier();
             case COUNT_DISTINCT -> switch (dataType) {
-                case LONGS -> new CountDistinctLongAggregatorFunctionSupplier(List.of(dataChannel), 3000);
-                case DOUBLES -> new CountDistinctDoubleAggregatorFunctionSupplier(List.of(dataChannel), 3000);
+                case LONGS -> new CountDistinctLongAggregatorFunctionSupplier(3000);
+                case DOUBLES -> new CountDistinctDoubleAggregatorFunctionSupplier(3000);
                 default -> throw new IllegalArgumentException("unsupported data type [" + dataType + "]");
             };
             case MAX -> switch (dataType) {
-                case LONGS -> new MaxLongAggregatorFunctionSupplier(List.of(dataChannel));
-                case DOUBLES -> new MaxDoubleAggregatorFunctionSupplier(List.of(dataChannel));
+                case LONGS -> new MaxLongAggregatorFunctionSupplier();
+                case DOUBLES -> new MaxDoubleAggregatorFunctionSupplier();
                 default -> throw new IllegalArgumentException("unsupported data type [" + dataType + "]");
             };
             case MIN -> switch (dataType) {
-                case LONGS -> new MinLongAggregatorFunctionSupplier(List.of(dataChannel));
-                case DOUBLES -> new MinDoubleAggregatorFunctionSupplier(List.of(dataChannel));
+                case LONGS -> new MinLongAggregatorFunctionSupplier();
+                case DOUBLES -> new MinDoubleAggregatorFunctionSupplier();
                 default -> throw new IllegalArgumentException("unsupported data type [" + dataType + "]");
             };
             case SUM -> switch (dataType) {
-                case LONGS -> new SumLongAggregatorFunctionSupplier(List.of(dataChannel));
-                case DOUBLES -> new SumDoubleAggregatorFunctionSupplier(List.of(dataChannel));
+                case LONGS -> new SumLongAggregatorFunctionSupplier();
+                case DOUBLES -> new SumDoubleAggregatorFunctionSupplier();
                 default -> throw new IllegalArgumentException("unsupported data type [" + dataType + "]");
             };
             default -> throw new IllegalArgumentException("unsupported op [" + op + "]");

docs/changelog/120998.yaml

@@ -0,0 +1,5 @@
+pr: 120998
+summary: ES|QL `change_point` processing command
+area: Machine Learning
+type: feature
+issues: []

docs/changelog/121156.yaml

@@ -0,0 +1,5 @@
+pr: 121156
+summary: Remove redundant sorts from execution plan
+area: ES|QL
+type: bug
+issues: []

docs/changelog/121720.yaml

@@ -0,0 +1,5 @@
+pr: 121720
+summary: Skip fetching _inference_fields field in legacy semantic_text format
+area: Search
+type: bug
+issues: []

docs/changelog/122011.yaml

@@ -0,0 +1,5 @@
+pr: 122011
+summary: Fix JOIN command validation (not supported)
+area: EQL
+type: bug
+issues: []

gradle/verification-metadata.xml

@@ -904,14 +904,14 @@
             <sha256 value="f8f5c726c8c615a94d9d6cd1073787f9c554841ae24c8bab5cd73481ea2021a8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.maxmind.db" name="maxmind-db" version="3.1.0">
-         <artifact name="maxmind-db-3.1.0.jar">
-            <sha256 value="2c8033081b1215dc57f5ae0e0de95cf91eb54144fccae4db35a47eb5d1101afc" origin="Generated by Gradle"/>
+      <component group="com.maxmind.db" name="maxmind-db" version="3.1.1">
+         <artifact name="maxmind-db-3.1.1.jar">
+            <sha256 value="16ff5f6779f1964bf814150f73a8af1e657bd669ad9fd13040bcd406460007e1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.maxmind.geoip2" name="geoip2" version="4.2.0">
-         <artifact name="geoip2-4.2.0.jar">
-            <sha256 value="5981ac68332deebdf52e7a7f96a0bef5f320012fa930f3778ee1e9c827a80dbd" origin="Generated by Gradle"/>
+      <component group="com.maxmind.geoip2" name="geoip2" version="4.2.1">
+         <artifact name="geoip2-4.2.1.jar">
+            <sha256 value="1492bf8d29f8059c9e2f6ec2ce85c5e05e2d379a366427c8923fef124801c118" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.microsoft.azure" name="azure-core" version="0.9.3">

modules/ingest-geoip/build.gradle

@@ -28,12 +28,12 @@ tasks.named('internalClusterTestTestingConventions').configure {
 }
 
 dependencies {
-  implementation('com.maxmind.geoip2:geoip2:4.2.0')
+  implementation('com.maxmind.geoip2:geoip2:4.2.1')
   // geoip2 dependencies:
   runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
   runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
   runtimeOnly("com.fasterxml.jackson.core:jackson-core:${versions.jackson}")
-  implementation('com.maxmind.db:maxmind-db:3.1.0')
+  implementation('com.maxmind.db:maxmind-db:3.1.1')
 
   testImplementation 'org.elasticsearch:geolite2-databases:20191119'
   internalClusterTestImplementation project(':modules:reindex')

muted-tests.yml

@@ -361,9 +361,6 @@ tests:
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/cat/health/cat-health-no-timestamp-example}
   issue: https://github.com/elastic/elasticsearch/issues/121867
-- class: org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests
-  method: testCreateAndRestorePartialSearchableSnapshot
-  issue: https://github.com/elastic/elasticsearch/issues/121927
 - class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
   method: test {yaml=analysis-common/40_token_filters/stemmer_override file access}
   issue: https://github.com/elastic/elasticsearch/issues/121625
@@ -410,6 +407,15 @@ tests:
 - class: org.elasticsearch.search.SearchCancellationIT
   method: testCancelFailedSearchWhenPartialResultDisallowed
   issue: https://github.com/elastic/elasticsearch/issues/121719
+- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
+  method: testChangePoint
+  issue: https://github.com/elastic/elasticsearch/issues/122179
+- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
+  method: testChangePoint_keySortable
+  issue: https://github.com/elastic/elasticsearch/issues/122180
+- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
+  method: testChangePoint_valueNumeric
+  issue: https://github.com/elastic/elasticsearch/issues/122181
 
 # Examples:
 #