FORK capability available for release builds

Author: ioanatia

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

@@ -96,7 +96,7 @@ book_no:keyword | title:text                                            | author
 
 
 reranker after RRF
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 required_capability: rerank

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

@@ -3,7 +3,7 @@
 //
 
 simpleRrf
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 
@@ -22,7 +22,7 @@ _score:double | _fork:keyword | emp_no:integer
 ;
 
 rrfWithMatchAndScore
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 
@@ -44,7 +44,7 @@ _score:double | _fork:keyword  | _id:keyword
 ;
 
 rrfWithDisjunctionAndPostFilter
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 
@@ -66,7 +66,7 @@ _score:double | _fork:keyword  | _id:keyword
 ;
 
 rrfWithStats
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 
@@ -86,7 +86,7 @@ count_fork:long | _fork:keyword
 ;
 
 rrfWithMultipleForkBranches
-required_capability: fork
+required_capability: fork_v9
 required_capability: rrf
 required_capability: match_operator_colon
 
@@ -112,7 +112,7 @@ _score:double | author:keyword                    | title:keyword        | _fork
 ;
 
 rrfWithSemanticSearch
-required_capability: rrf
+required_capability: fork_v9
 required_capability: semantic_text_field_caps
 required_capability: metadata_score
 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ForkIT.java

@@ -32,7 +32,7 @@ public class ForkIT extends AbstractEsqlIntegTestCase {
 
     @Before
     public void setupIndex() {
-        assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK.isEnabled());
+        assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK_V9.isEnabled());
         createAndPopulateIndices();
     }
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -917,11 +917,6 @@ public enum Cap {
          */
         AGGREGATE_METRIC_DOUBLE_RENDERING(AGGREGATE_METRIC_DOUBLE_FEATURE_FLAG),
 
-        /**
-         * Support for FORK command
-         */
-        FORK(Build.current().isSnapshot()),
-
         /**
          * Support for RERANK command
          */
@@ -1038,9 +1033,9 @@ public enum Cap {
         MAX_OVER_TIME(Build.current().isSnapshot()),
 
         /**
-         * Support streaming of sub plan results
+         * Support for FORK out of snapshot
          */
-        FORK_V9(Build.current().isSnapshot()),
+        FORK_V9,
 
         /**
          * Support for the {@code leading_zeros} named parameter.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java

@@ -3066,8 +3066,6 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithCa
     }
 
     public void testBasicFork() {
-        assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         LogicalPlan plan = analyze("""
             from test
             | KEEP emp_no, first_name, last_name
@@ -3172,8 +3170,6 @@ public void testBasicFork() {
     }
 
     public void testForkBranchesWithDifferentSchemas() {
-        assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         LogicalPlan plan = analyze("""
             from test
             | WHERE first_name == "Chris"
@@ -3299,8 +3295,6 @@ public void testForkBranchesWithDifferentSchemas() {
     }
 
     public void testForkError() {
-        assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         var e = expectThrows(VerificationException.class, () -> analyze("""
             from test
             | FORK ( WHERE emp_no > 1 )
@@ -3421,8 +3415,6 @@ public void testValidRrf() {
     }
 
     public void testRrfError() {
-        assumeTrue("requires RRF capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         var e = expectThrows(VerificationException.class, () -> analyze("""
             from test
             | rrf

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

@@ -3279,8 +3279,6 @@ public void testInvalidInsistAsterisk() {
     }
 
     public void testValidFork() {
-        assumeTrue("FORK requires corresponding capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         var plan = statement("""
             FROM foo*
             | FORK ( WHERE a:"baz" | LIMIT 11 )
@@ -3369,6 +3367,33 @@ public void testValidFork() {
         assertThat(dissect.parser().pattern(), equalTo("%{d} %{e} %{f}"));
     }
 
+    public void testForkAllReleasedCommands() {
+        var query = """
+            FROM foo*
+            | FORK
+               ( SORT c )
+               ( LIMIT 5 )
+               ( DISSECT a "%{d} %{e} %{f}" )
+               ( GROK a "%{WORD:foo}" )
+               ( STATS x = MIN(a), y = MAX(b) WHERE d > 1000 )
+               ( EVAL xyz = ( (a/b) * (b/a)) )
+               ( WHERE a < 1 )
+               ( KEEP a )
+               ( DROP b )
+               ( RENAME a as c )
+               ( MV_EXPAND a )
+               ( CHANGE_POINT a on b )
+               ( LOOKUP JOIN idx2 ON f1 )
+               ( ENRICH idx2 on f1 with f2 = f3 )
+               ( FORK ( WHERE a:"baz" ) ( EVAL x = [ 1, 2, 3 ] ) )
+               ( COMPLETION a = b WITH c )
+            | KEEP a
+            """;
+
+        var plan = statement(query);
+        assertThat(plan, instanceOf(Keep.class));
+    }
+
     public void testForkAllCommands() {
         assumeTrue("requires snapshot build", Build.current().isSnapshot());
 
@@ -3380,21 +3405,21 @@ public void testForkAllCommands() {
                ( DISSECT a "%{d} %{e} %{f}" )
                ( GROK a "%{WORD:foo}" )
                ( STATS x = MIN(a), y = MAX(b) WHERE d > 1000 )
-               ( INLINESTATS x = MIN(a), y = MAX(b) WHERE d > 1000 )
                ( EVAL xyz = ( (a/b) * (b/a)) )
                ( WHERE a < 1 )
                ( KEEP a )
                ( DROP b )
                ( RENAME a as c )
                ( MV_EXPAND a )
-               ( INSIST_🐔 a )
                ( CHANGE_POINT a on b )
                ( LOOKUP JOIN idx2 ON f1 )
-               ( LOOKUP_🐔 a on b )
                ( ENRICH idx2 on f1 with f2 = f3 )
                ( FORK ( WHERE a:"baz" ) ( EVAL x = [ 1, 2, 3 ] ) )
                ( COMPLETION a = b WITH c )
                ( SAMPLE 0.99 )
+               ( INLINESTATS x = MIN(a), y = MAX(b) WHERE d > 1000 )
+               ( INSIST_🐔 a )
+               ( LOOKUP_🐔 a on b )
             | KEEP a
             """;
 
@@ -3403,8 +3428,6 @@ public void testForkAllCommands() {
     }
 
     public void testInvalidFork() {
-        assumeTrue("FORK requires corresponding capability", EsqlCapabilities.Cap.FORK.isEnabled());
-
         expectError("FROM foo* | FORK (WHERE a:\"baz\")", "line 1:13: Fork requires at least two branches");
         expectError("FROM foo* | FORK (LIMIT 10)", "line 1:13: Fork requires at least two branches");
         expectError("FROM foo* | FORK (SORT a)", "line 1:13: Fork requires at least two branches");

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

@@ -1999,8 +1999,6 @@ public void testDropWildcardFields_WithLookupJoin() {
     }
 
     public void testForkFieldsWithKeepAfterFork() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames("""
             FROM test
             | WHERE a > 2000
@@ -2013,8 +2011,6 @@ public void testForkFieldsWithKeepAfterFork() {
     }
 
     public void testForkFieldsWithKeepBeforeFork() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames("""
             FROM test
             | KEEP a, b, c, d, x, y
@@ -2027,8 +2023,6 @@ public void testForkFieldsWithKeepBeforeFork() {
     }
 
     public void testForkFieldsWithNoProjection() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames("""
             FROM test
             | WHERE a > 2000
@@ -2040,8 +2034,6 @@ public void testForkFieldsWithNoProjection() {
     }
 
     public void testForkFieldsWithStatsInOneBranch() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames("""
             FROM test
             | WHERE a > 2000
@@ -2053,9 +2045,6 @@ public void testForkFieldsWithStatsInOneBranch() {
     }
 
     public void testForkFieldsWithEnrichAndLookupJoins() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
-
         assertFieldNames("""
             FROM test
             | KEEP a, b, abc, def, z, xyz
@@ -2070,8 +2059,6 @@ public void testForkFieldsWithEnrichAndLookupJoins() {
     }
 
     public void testForkWithStatsInAllBranches() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames("""
             FROM test
             | WHERE a > 2000
@@ -2084,8 +2071,6 @@ public void testForkWithStatsInAllBranches() {
     }
 
     public void testForkWithStatsAndWhere() {
-        assumeTrue("FORK available as snapshot only", EsqlCapabilities.Cap.FORK.isEnabled());
-
         assertFieldNames(" FROM employees | FORK ( WHERE true | stats min(salary) by gender) ( WHERE true | LIMIT 3 )", ALL_FIELDS);
     }