Skip to content

Commit f9db8ec

Browse files
authored
ES|QL: Fork - support GROK, CHANGE_POINT and COMPLETION in branches (#129249)
1 parent 0588808 commit f9db8ec

File tree

8 files changed

+1126
-608
lines changed

8 files changed

+1126
-608
lines changed

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import static org.elasticsearch.xpack.esql.CsvTestUtils.isEnabled;
4747
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES;
4848
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
49-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V7;
49+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V8;
5050
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
5151
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V2;
5252
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V7;
@@ -132,7 +132,7 @@ protected void shouldSkipTest(String testName) throws IOException {
132132
assumeFalse("LOOKUP JOIN not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName()));
133133
// Unmapped fields require a coorect capability response from every cluster, which isn't currently implemented.
134134
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
135-
assumeFalse("FORK not yet supported in CCS", testCase.requiredCapabilities.contains(FORK_V7.capabilityName()));
135+
assumeFalse("FORK not yet supported in CCS", testCase.requiredCapabilities.contains(FORK_V8.capabilityName()));
136136
}
137137

138138
@Override

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected void shouldSkipTest(String testName) throws IOException {
4747

4848
assumeFalse(
4949
"Tests using FORK or RRF already are skipped since we don't support multiple FORKs",
50-
testCase.requiredCapabilities.contains(FORK_V7.capabilityName()) || testCase.requiredCapabilities.contains(RRF.capabilityName())
50+
testCase.requiredCapabilities.contains(FORK_V8.capabilityName()) || testCase.requiredCapabilities.contains(RRF.capabilityName())
5151
);
5252

5353
assumeFalse(
@@ -60,6 +60,6 @@ protected void shouldSkipTest(String testName) throws IOException {
6060
testCase.requiredCapabilities.contains(IMPLICIT_CASTING_DATE_AND_DATE_NANOS.capabilityName())
6161
);
6262

63-
assumeTrue("Cluster needs to support FORK", hasCapabilities(client(), List.of(FORK_V7.capabilityName())));
63+
assumeTrue("Cluster needs to support FORK", hasCapabilities(client(), List.of(FORK_V8.capabilityName())));
6464
}
6565
}

0 commit comments

Comments
 (0)