Merge branch '9.2' into 9.2-lucene_10_3_1

Author: thecoop

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

@@ -1407,7 +1407,7 @@ private void createConfiguration() {
         // Limit the number of allocated processors for all nodes in the cluster by default.
         // This is to ensure that the tests run consistently across different environments.
         String processorCount = shouldConfigureTestClustersWithOneProcessor() ? "1" : "2";
-        if (getVersion().onOrAfter("7.6.0")) {
+        if (getVersion().onOrAfter("7.4.0")) {
             baseConfig.put("node.processors", processorCount);
         } else {
             baseConfig.put("processors", processorCount);

docs/changelog/135446.yaml

@@ -0,0 +1,5 @@
+pr: 135446
+summary: Fix projection generation when pruning left join
+area: ES|QL
+type: bug
+issues: []

docs/changelog/135966.yaml

@@ -0,0 +1,6 @@
+pr: 135966
+summary: Ensure queued `AbstractRunnables` are notified when executor stops
+area: Machine Learning
+type: bug
+issues:
+ - 134651

docs/changelog/136017.yaml

@@ -0,0 +1,5 @@
+pr: 136017
+summary: Cohere service Model Id field is required
+area: Machine Learning
+type: bug
+issues: []

docs/reference/elasticsearch/mapping-reference/semantic-text.md

@@ -611,6 +611,31 @@ PUT test-index
 }
 ```
 
+## Querying `semantic_text` fields [querying-semantic-text-fields]
+
+You can query `semantic_text` fields using the following query types:
+
+- Match query: The recommended method for querying `semantic_text` fields. You can use [Query DSL](/reference/query-languages/query-dsl/query-dsl-match-query.md) or [ES|QL](/reference/query-languages/esql/functions-operators/search-functions.md#esql-match) syntax.
+<!--
+Refer to examples of match queries on `semantic_text` fields. 
+-->
+
+- [kNN query](/reference/query-languages/query-dsl/query-dsl-knn-query.md): Finds the nearest vectors to a query vector using a similarity metric, mainly for advanced or combined search use cases. 
+<!-- 
+Refer to examples of kNN queries on `semantic_text` fields. 
+-->
+
+- [Sparse vector query](/reference/query-languages/query-dsl/query-dsl-sparse-vector-query.md): Executes searches using sparse vectors generated by a sparse retrieval model such as [ELSER](docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md).
+<!-- 
+Refer to examples of sparse vector queries on `semantic_text` fields.
+-->
+
+- [Semantic query](/reference/query-languages/query-dsl/query-dsl-semantic-query.md): We don't recommend this legacy query type for _new_ projects, because the alternatives in this list enable more flexibility and customization. The `semantic` query remains available to support existing implementations.
+<!-- 
+Refer to examples of semantic queries on `semantic_text` fields.
+-->
+
+
 ## Troubleshooting semantic_text fields [troubleshooting-semantic-text-fields]
 
 If you want to verify that your embeddings look correct, you can view the

docs/reference/query-languages/query-dsl/query-dsl-semantic-query.md

@@ -9,6 +9,10 @@ applies_to:
 
 # Semantic query [query-dsl-semantic-query]
 
+::::{note}
+We don't recommend this legacy query type for _new_ projects. Use the match query (with [QueryDSL](/reference/query-languages/query-dsl/query-dsl-match-query.md) or [ESQL](/reference/query-languages/esql/functions-operators/search-functions.md#esql-match)) instead. The semantic query remains available to support existing implementations.
+::::
+
 The `semantic` query type enables you to perform [semantic search](docs-content://solutions/search/semantic-search.md) on data stored in a [`semantic_text`](/reference/elasticsearch/mapping-reference/semantic-text.md) field.
 
 

gradle/verification-metadata.xml

@@ -1199,9 +1199,9 @@
             <sha256 value="64fab42f17bf8e0efb193dd34da716ef7abb7515234036119df1776b808dc066" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.nvidia.cuvs" name="cuvs-java" version="25.10.0">
-         <artifact name="cuvs-java-25.10.0.jar">
-            <sha256 value="2d4cca3b6b6c7c4d3c1a2f57c00cb55f7a45699536ad356699f32bcea7714539" origin="Generated by Gradle"/>
+      <component group="com.nvidia.cuvs" name="cuvs-java" version="25.10.0-815d86dd">
+         <artifact name="cuvs-java-25.10.0-815d86dd.jar">
+            <sha256 value="b15a5f63b7cc2349444ee5470dfe7a316ccd11b6fcc4be3dd4b11aaeb2ae65fe" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.perforce" name="p4java" version="2015.2.1365273">

muted-tests.yml

@@ -633,39 +633,15 @@ tests:
 - class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
   method: testMatchAllQuery
   issue: https://github.com/elastic/elasticsearch/issues/135820
-- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
-  method: testRollupIndex {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135906
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testSingleDoc {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135908
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testRollover {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135952
 - class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
   method: testGetAdditionalIndexSettingsMappingsMerging
   issue: https://github.com/elastic/elasticsearch/issues/135884
 - class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
   method: testStopQueryInlineStats
   issue: https://github.com/elastic/elasticsearch/issues/135032
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testResize {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135909
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testSearchTimeSeriesMode {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135963
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testClusterState {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135960
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testForbidDisableSoftDeletesOnRestore {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135937
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testRomanianAnalyzerBWC {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135948
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testRecovery {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/135953
+- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
+  method: testGetAdditionalIndexSettings
+  issue: https://github.com/elastic/elasticsearch/issues/135972
 
 # Examples:
 #

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

@@ -57,7 +57,7 @@ private static ElasticsearchCluster buildCluster() {
             .apply(() -> clusterConfig)
             .feature(FeatureFlag.TIME_SERIES_MODE);
 
-        if (oldVersion.before(Version.fromString("8.18.0"))) {
+        if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
             cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
             cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
         }

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

@@ -118,7 +118,7 @@ private static ElasticsearchCluster buildCluster() {
             .apply(() -> clusterConfig)
             .feature(FeatureFlag.TIME_SERIES_MODE);
 
-        if (oldVersion.before(Version.fromString("8.18.0"))) {
+        if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
             cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
             cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
         }