Merge remote-tracking branch 'upstream/main' into include-default-index-sort-2

Author: jordan-powers

docs/changelog/135851.yaml

@@ -0,0 +1,5 @@
+pr: 135851
+summary: DiskBBQ - missing min competitive similarity check on tail docs
+area: Vector Search
+type: bug
+issues: []

muted-tests.yml

@@ -630,6 +630,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
   method: testOneRemoteClusterPartial
   issue: https://github.com/elastic/elasticsearch/issues/124055
+- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
+  method: testGetAdditionalIndexSettingsMappingsMerging
+  issue: https://github.com/elastic/elasticsearch/issues/135884
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java

@@ -568,7 +568,9 @@ public int visit(KnnCollector knnCollector) throws IOException {
                         qcDist
                     );
                     scoredDocs++;
-                    knnCollector.collect(doc, score);
+                    if (knnCollector.minCompetitiveSimilarity() < score) {
+                        knnCollector.collect(doc, score);
+                    }
                 } else {
                     indexInput.skipBytes(quantizedByteLength);
                 }