Merge branch 'main' of github.com:elastic/elasticsearch into ml-cs-validation

Author: jonathan-buttner

libs/simdvec/src/test/java/org/elasticsearch/simdvec/internal/vectorization/ES91OSQVectorScorerTests.java

@@ -125,12 +125,21 @@ public void testScore() throws Exception {
                             scores2
                         );
                         for (int j = 0; j < ES91OSQVectorsScorer.BULK_SIZE; j++) {
-                            if (scores1[j] > (maxDims * Short.MAX_VALUE)) {
-                                int diff = (int) (scores1[j] - scores2[j]);
-                                assertThat("defaultScores: " + scores1[j] + " bulkScores: " + scores2[j], Math.abs(diff), lessThan(65));
-                            } else if (scores1[j] > (maxDims * Byte.MAX_VALUE)) {
-                                int diff = (int) (scores1[j] - scores2[j]);
-                                assertThat("defaultScores: " + scores1[j] + " bulkScores: " + scores2[j], Math.abs(diff), lessThan(9));
+                            if (scores1[j] == scores2[j]) {
+                                continue;
+                            }
+                            if (scores1[j] > (maxDims * Byte.MAX_VALUE)) {
+                                float diff = Math.abs(scores1[j] - scores2[j]);
+                                assertThat(
+                                    "defaultScores: " + scores1[j] + " bulkScores: " + scores2[j],
+                                    diff / scores1[j],
+                                    lessThan(1e-5f)
+                                );
+                                assertThat(
+                                    "defaultScores: " + scores1[j] + " bulkScores: " + scores2[j],
+                                    diff / scores2[j],
+                                    lessThan(1e-5f)
+                                );
                             } else {
                                 assertEquals(scores1[j], scores2[j], 1e-2f);
                             }

muted-tests.yml

@@ -571,15 +571,21 @@ tests:
 - class: org.elasticsearch.search.query.VectorIT
   method: testFilteredQueryStrategy
   issue: https://github.com/elastic/elasticsearch/issues/129517
-- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
-  method: testInvalidJoinPatterns
-  issue: https://github.com/elastic/elasticsearch/issues/129598
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
   method: test
   issue: https://github.com/elastic/elasticsearch/issues/129453
 - class: org.elasticsearch.server.cli.MachineDependentHeapTests
   method: testMlOnlyOptions
   issue: https://github.com/elastic/elasticsearch/issues/129236
+- class: org.elasticsearch.upgrades.RunningSnapshotIT
+  method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=1}
+  issue: https://github.com/elastic/elasticsearch/issues/129644
+- class: org.elasticsearch.upgrades.RunningSnapshotIT
+  method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=2}
+  issue: https://github.com/elastic/elasticsearch/issues/129645
+- class: org.elasticsearch.upgrades.RunningSnapshotIT
+  method: testRunningSnapshotCompleteAfterUpgrade {upgradedNodes=3}
+  issue: https://github.com/elastic/elasticsearch/issues/129646
 
 # Examples:
 #

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -3204,7 +3204,7 @@ public void testInvalidJoinPatterns() {
         {
             var fromPatterns = randomIndexPattern();
             // Generate a syntactically invalid (partial quoted) pattern.
-            var joinPattern = randomIdentifier() + ":" + quote(randomIndexPatterns(without(CROSS_CLUSTER)));
+            var joinPattern = randomIdentifier() + ":" + quote(randomIndexPattern(without(CROSS_CLUSTER)));
             expectError(
                 "FROM " + fromPatterns + " | LOOKUP JOIN " + joinPattern + " ON " + randomIdentifier(),
                 // Since the from pattern is partially quoted, we get an error at the beginning of the partially quoted