Merge branch 'main' into test-failure/SearchWithRandomDisconnectsIT_testSearchWithRandomDisconnects

Author: drempapis

muted-tests.yml

@@ -483,9 +483,6 @@ tests:
 - class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
   method: testRevertModelSnapshot_DeleteInterveningResults
   issue: https://github.com/elastic/elasticsearch/issues/132349
-- class: org.elasticsearch.xpack.sql.action.SqlSearchPageTimeoutIT
-  method: testSearchContextIsCleanedUpAfterPageTimeoutForAggregationQueries
-  issue: https://github.com/elastic/elasticsearch/issues/132619
 - class: org.elasticsearch.xpack.ml.integration.TextEmbeddingQueryIT
   method: testHybridSearch
   issue: https://github.com/elastic/elasticsearch/issues/132703
@@ -510,6 +507,27 @@ tests:
 - class: org.elasticsearch.gradle.internal.transport.TransportVersionManagementPluginFuncTest
   method: cannot change committed ids to a branch
   issue: https://github.com/elastic/elasticsearch/issues/132790
+- class: org.elasticsearch.xpack.esql.CsvTests
+  method: test {csv-spec:spatial.ConvertFromStringParseError}
+  issue: https://github.com/elastic/elasticsearch/issues/132805
+- class: org.elasticsearch.xpack.esql.CsvTests
+  method: test {csv-spec:floats.ScalbWithHugeScaleFactor}
+  issue: https://github.com/elastic/elasticsearch/issues/132806
+- class: org.elasticsearch.reservedstate.service.FileSettingsServiceIT
+  method: testSettingsAppliedOnStart
+  issue: https://github.com/elastic/elasticsearch/issues/131210
+- class: org.elasticsearch.index.mapper.vectors.SparseVectorFieldMapperTests
+  method: testPruningScenarios
+  issue: https://github.com/elastic/elasticsearch/issues/132810
+- class: org.elasticsearch.xpack.esql.CsvTests
+  method: test {csv-spec:spatial_shapes.ConvertFromStringParseError}
+  issue: https://github.com/elastic/elasticsearch/issues/132812
+- class: org.elasticsearch.xpack.esql.CsvTests
+  method: test {csv-spec:string.MvStringNotEqualsLong}
+  issue: https://github.com/elastic/elasticsearch/issues/132813
+- class: org.elasticsearch.xpack.esql.CsvTests
+  method: test {csv-spec:spatial.ConvertCartesianFromStringParseError}
+  issue: https://github.com/elastic/elasticsearch/issues/132814
 
 # Examples:
 #

x-pack/plugin/esql/qa/testFixtures/src/main/resources/knn-function.csv-spec

@@ -70,15 +70,15 @@ yellow     | [255.0, 255.0, 0.0]
 knnWithPrefilter
 required_capability: knn_function_v3
 
-from colors metadata _score
-| where knn(rgb_vector, [128,128,0], 10) and (match(color, "olive") or match(color, "green")) 
-| sort _score desc, color asc
-| keep color, rgb_vector
+from colors
+| where knn(rgb_vector, [120,180,0], 10) and (match(color, "olive") or match(color, "green")) 
+| sort color asc
+| keep color
 ;
 
-color:text       | rgb_vector:dense_vector
-olive            | [128.0, 128.0, 0.0]
-green            | [0.0, 128.0, 0.0]
+color:text
+green
+olive
 ;
 
 knnWithNegatedPrefilter

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/FieldNameUtilsTests.java

@@ -2243,6 +2243,8 @@ public void testForkRef4() {
     }
 
     public void testRerankerAfterFuse() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM books METADATA _id, _index, _score
             | FORK ( WHERE title:"Tolkien" | SORT _score, _id DESC | LIMIT 3 )
@@ -2256,6 +2258,8 @@ public void testRerankerAfterFuse() {
     }
 
     public void testSimpleFuse() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM employees METADATA _id, _index, _score
             | FORK ( WHERE emp_no:10001 )
@@ -2267,6 +2271,8 @@ public void testSimpleFuse() {
     }
 
     public void testFuseWithMatchAndScore() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM books METADATA _id, _index, _score
             | FORK ( WHERE title:"Tolkien" | SORT _score, _id DESC | LIMIT 3 )
@@ -2279,6 +2285,8 @@ public void testFuseWithMatchAndScore() {
     }
 
     public void testFuseWithDisjunctionAndPostFilter() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM books METADATA _id, _index, _score
             | FORK ( WHERE title:"Tolkien" OR author:"Tolkien" | SORT _score, _id DESC | LIMIT 3 )
@@ -2292,6 +2300,8 @@ public void testFuseWithDisjunctionAndPostFilter() {
     }
 
     public void testFuseWithStats() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM books METADATA _id, _index, _score
             | FORK ( WHERE title:"Tolkien" | SORT _score, _id DESC | LIMIT 3 )
@@ -2303,6 +2313,8 @@ public void testFuseWithStats() {
     }
 
     public void testFuseWithMultipleForkBranches() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM books METADATA _id, _index, _score
             | FORK (WHERE author:"Keith Faulkner" AND qstr("author:Rory or author:Beverlie") | SORT _score, _id DESC | LIMIT 3)
@@ -2318,6 +2330,8 @@ public void testFuseWithMultipleForkBranches() {
     }
 
     public void testFuseWithSemanticSearch() {
+        assumeTrue("FUSE required", EsqlCapabilities.Cap.FUSE.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM semantic_text METADATA _id, _score, _index
             | FORK ( WHERE semantic_text_field:"something" | SORT _score DESC | LIMIT 2)
@@ -2503,6 +2517,8 @@ public void testForkWithUnsupportedAttributes() {
     }
 
     public void testForkAfterLookupJoin() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames(
             """
                 FROM employees
@@ -2529,6 +2545,8 @@ public void testForkAfterLookupJoin() {
     }
 
     public void testForkBeforeLookupJoin() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames(
             """
                 FROM employees
@@ -2555,6 +2573,8 @@ public void testForkBeforeLookupJoin() {
     }
 
     public void testForkBranchWithLookupJoin() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames(
             """
                 FROM employees
@@ -2826,6 +2846,8 @@ public void testForkAfterMvExpand() {
     }
 
     public void testForkBeforeInlineStatsIgnore() {
+        assumeTrue("INLINESTATS required", EsqlCapabilities.Cap.INLINESTATS_V9.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM employees
             | KEEP emp_no, languages, gender
@@ -2837,6 +2859,8 @@ public void testForkBeforeInlineStatsIgnore() {
     }
 
     public void testForkBranchWithInlineStatsIgnore() {
+        assumeTrue("INLINESTATS required", EsqlCapabilities.Cap.INLINESTATS_V9.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM employees
             | KEEP emp_no, languages, gender
@@ -2849,6 +2873,8 @@ public void testForkBranchWithInlineStatsIgnore() {
     }
 
     public void testForkAfterInlineStatsIgnore() {
+        assumeTrue("INLINESTATS required", EsqlCapabilities.Cap.INLINESTATS_V9.isEnabled());
+        assertTrue("FORK required", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         assertFieldNames("""
             FROM employees
             | KEEP emp_no, languages, gender

x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlSearchPageTimeoutIT.java

@@ -47,7 +47,7 @@ public void testSearchContextIsCleanedUpAfterPageTimeout(String query) throws Ex
 
         SqlQueryResponse response = new SqlQueryRequestBuilder(client()).query(query)
             .fetchSize(1)
-            .pageTimeout(TimeValue.timeValueMillis(500))
+            .pageTimeout(TimeValue.timeValueMillis(1000))
             .get();
 
         assertTrue(response.hasCursor());