Merge branch '8.x' into backport/8.x/pr-119586

docs/changelog/119011.yaml

@@ -0,0 +1,5 @@
+pr: 119011
+summary: "Add support for knn vector queries on `semantic_text` fields"
+area: Search
+type: enhancement
+issues: []

docs/changelog/119637.yaml

@@ -0,0 +1,5 @@
+pr: 119637
+summary: Fix spike detection for short spikes at the tail of the data
+area: Machine Learning
+type: bug
+issues: []

docs/reference/troubleshooting/common-issues/rejected-requests.asciidoc

@@ -63,7 +63,7 @@ These stats are cumulative from node startup.
 
 Indexing pressure rejections appear as an
 `EsRejectedExecutionException`, and indicate that they were rejected due
-to `coordinating_and_primary_bytes`, `coordinating`, `primary`, or `replica`.
+to `combined_coordinating_and_primary`, `coordinating`, `primary`, or `replica`.
 
 These errors are often related to <<task-queue-backlog,backlogged tasks>>,
 <<docs-bulk,bulk index>> sizing, or the ingest target's
@@ -77,4 +77,4 @@ These errors are often related to <<task-queue-backlog,backlogged tasks>>,
 
 If {es} regularly rejects requests and other tasks, your cluster likely has high
 CPU usage or high JVM memory pressure. For tips, see <<high-cpu-usage>> and
-<<high-jvm-memory-pressure>>.
+<<high-jvm-memory-pressure>>.

qa/mixed-cluster/build.gradle

@@ -64,6 +64,9 @@ excludeList.add('cluster.desired_nodes/20_dry_run/Test validation works for dry
 // Excluded because they create dot-prefixed indices on older versions
 excludeList.add('indices.resolve_index/20_resolve_system_index/*')
 
+// Can't work until auto-expand replicas is 0-1 for synonyms index
+excludeList.add("synonyms/90_synonyms_reloading_for_synset/Reload analyzers for specific synonym set")
+
 def clusterPath = getPath()
 
 buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -154,6 +154,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion TRANSFORMS_UPGRADE_MODE = def(8_814_00_0);
     public static final TransportVersion NODE_SHUTDOWN_EPHEMERAL_ID_ADDED = def(8_815_00_0);
     public static final TransportVersion ESQL_CCS_TELEMETRY_STATS = def(8_816_00_0);
+    public static final TransportVersion TEXT_EMBEDDING_QUERY_VECTOR_BUILDER_INFER_MODEL_ID = def(8_817_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java

@@ -59,13 +59,6 @@ public BucketsAggregator(
         docCountProvider = new DocCountProvider();
     }
 
-    /**
-     * Return an upper bound of the maximum bucket ordinal seen so far.
-     */
-    public final long maxBucketOrd() {
-        return docCounts.size();
-    }
-
     /**
      * Ensure there are at least <code>maxBucketOrd</code> buckets available.
      */

server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java

@@ -271,13 +271,6 @@ public InternalAggregation finalizeSampling(SamplingContext samplingContext) {
         );
     }
 
-    private Bucket reduceBucket(List<Bucket> buckets, AggregationReduceContext context) {
-        assert buckets.isEmpty() == false;
-        final List<InternalAggregations> aggregations = new BucketAggregationList<>(buckets);
-        final InternalAggregations aggs = InternalAggregations.reduce(aggregations, context);
-        return createBucket(aggs, buckets.get(0));
-    }
-
     @Override
     public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
         if (keyed) {

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ChiSquare.java

@@ -38,10 +38,7 @@ public ChiSquare(StreamInput in) throws IOException {
 
     @Override
     public boolean equals(Object other) {
-        if ((other instanceof ChiSquare) == false) {
-            return false;
-        }
-        return super.equals(other);
+        return other instanceof ChiSquare && super.equals(other);
     }
 
     @Override
@@ -80,17 +77,4 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public static class ChiSquareBuilder extends NXYSignificanceHeuristic.NXYBuilder {
-        public ChiSquareBuilder(boolean includeNegatives, boolean backgroundIsSuperset) {
-            super(includeNegatives, backgroundIsSuperset);
-        }
-
-        @Override
-        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject(NAME);
-            super.build(builder);
-            builder.endObject();
-            return builder;
-        }
-    }
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/GND.java

@@ -46,10 +46,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public boolean equals(Object other) {
-        if ((other instanceof GND) == false) {
-            return false;
-        }
-        return super.equals(other);
+        return other instanceof GND && super.equals(other);
     }
 
     @Override
@@ -99,17 +96,4 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public static class GNDBuilder extends NXYBuilder {
-        public GNDBuilder(boolean backgroundIsSuperset) {
-            super(true, backgroundIsSuperset);
-        }
-
-        @Override
-        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject(NAME);
-            builder.field(BACKGROUND_IS_SUPERSET.getPreferredName(), backgroundIsSuperset);
-            builder.endObject();
-            return builder;
-        }
-    }
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/JLHScore.java

@@ -90,23 +90,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null || obj.getClass() != getClass()) {
-            return false;
-        }
-        return true;
+        return obj != null && obj.getClass() == getClass();
     }
 
     @Override
     public int hashCode() {
         return getClass().hashCode();
     }
 
-    public static class JLHScoreBuilder implements SignificanceHeuristicBuilder {
-
-        @Override
-        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject(NAME).endObject();
-            return builder;
-        }
-    }
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/MutualInformation.java

@@ -40,10 +40,7 @@ public MutualInformation(StreamInput in) throws IOException {
 
     @Override
     public boolean equals(Object other) {
-        if ((other instanceof MutualInformation) == false) {
-            return false;
-        }
-        return super.equals(other);
+        return other instanceof MutualInformation && super.equals(other);
     }
 
     @Override
@@ -119,17 +116,4 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public static class MutualInformationBuilder extends NXYBuilder {
-        public MutualInformationBuilder(boolean includeNegatives, boolean backgroundIsSuperset) {
-            super(includeNegatives, backgroundIsSuperset);
-        }
-
-        @Override
-        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject(NAME);
-            super.build(builder);
-            builder.endObject();
-            return builder;
-        }
-    }
 }