Merge branch 'main' into fix/139252

Author: prwhelan

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java

@@ -84,6 +84,7 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
             },
             bitsetFilterCache::getBitSetProducer,
             MapperMetrics.NOOP,
+            null,
             null
         );
 

benchmarks/src/main/java/org/elasticsearch/benchmark/indices/common/MappingParsingBenchmark.java

@@ -135,7 +135,7 @@ public void setUp() throws IOException {
             SimilarityService similarityService = new SimilarityService(indexSettings, null, Map.of());
             BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(indexSettings, BitsetFilterCache.Listener.NOOP);
             MapperService mapperService = new MapperService(
-                () -> TransportVersion.current(),
+                TransportVersion::current,
                 indexSettings,
                 IndexAnalyzers.of(Map.of()),
                 XContentParserConfiguration.EMPTY.withRegistry(new NamedXContentRegistry(ClusterModule.getNamedXWriteables()))
@@ -154,6 +154,7 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                 },
                 bitsetFilterCache::getBitSetProducer,
                 MapperMetrics.NOOP,
+                null,
                 null
             );
 

benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java

@@ -192,6 +192,7 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
             },
             query -> { throw new UnsupportedOperationException(); },
             MapperMetrics.NOOP,
+            null,
             null
         );
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

@@ -132,6 +132,7 @@ public void execute(Task t) {
                 "--add-opens=java.base/java.time=ALL-UNNAMED",
                 "--add-opens=java.management/java.lang.management=ALL-UNNAMED",
                 "--enable-native-access=ALL-UNNAMED",
+                "--add-modules=jdk.incubator.vector",
                 "-XX:+HeapDumpOnOutOfMemoryError"
             );
 

build-tools-internal/version.properties

@@ -19,7 +19,7 @@ commons_lang3     = 3.9
 google_oauth_client = 1.34.1
 awsv2sdk            = 2.31.78
 reactive_streams    = 1.0.4
-cuvs_java           = 25.10.0
+cuvs_java           = 25.12.0
 ldapsdk             = 7.0.3
 
 antlr4            = 4.13.1

docs/changelog/137397.yaml

@@ -0,0 +1,5 @@
+pr: 137397
+summary: Update `text_similarity_rank_retriever` to default to chunking settings optimal for inference ID
+area: Search
+type: enhancement
+issues: []

docs/changelog/139747.yaml

@@ -0,0 +1,5 @@
+pr: 139747
+summary: "Upgrade cuvs-java to version 25.12"
+area: Vector Search
+type: upgrade
+issues: []

docs/changelog/139798.yaml

@@ -0,0 +1,6 @@
+pr: 139798
+summary: Fix interpolation for data points at bucket boundaries
+area: ES|QL
+type: bug
+issues:
+ - 139732

docs/changelog/139808.yaml

@@ -0,0 +1,5 @@
+pr: 139808
+summary: Fix bug when downsampling exponential histograms with last value
+area: Downsampling
+type: bug
+issues: []

docs/changelog/139830.yaml

@@ -0,0 +1,5 @@
+pr: 139830
+summary: GA `chunk_rescorer` in `text_similarity_reranker`
+area: Relevance
+type: enhancement
+issues: []