Skip to content

FORK: Allow all processing commands #129465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 17, 2025
+1,841 −1,693
Merged

FORK: Allow all processing commands #129465

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f50233
Allow all processing commands
ioanatia Jun 16, 2025
8b801bb
Fix for KEEP/DROP/RENAME/MV_EXPAND/ENRICH
ioanatia Jun 16, 2025
63099e4
Parser allows fork within fork and change_point
ioanatia Jun 16, 2025
9f671b7
Add StatementParserTests
ioanatia Jun 16, 2025
41cd3a0
Bump capability for bwc tests
ioanatia Jun 16, 2025
04952c0
Include SAMPLE command and fix typo
ioanatia Jun 17, 2025
542c3d3
Merge remote-tracking branch 'elasticsearch/main' into fork_grammar
ioanatia Jun 17, 2025
37183b4
Add more tests for unclosed paranthesis
ioanatia Jun 17, 2025
6f52fe9
[CI] Auto commit changes from spotless
Jun 17, 2025
2ce80c7
Address review comments
ioanatia Jun 17, 2025
0e64c25
Merge remote-tracking branch 'elasticsearch/main' into fork_grammar
ioanatia Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import static org.elasticsearch.xpack.esql.CsvTestUtils.isEnabled;
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES;
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V8;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V2;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V7;
Expand Down Expand Up @@ -132,7 +132,7 @@ protected void shouldSkipTest(String testName) throws IOException {
assumeFalse("LOOKUP JOIN not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName()));
// Unmapped fields require a coorect capability response from every cluster, which isn't currently implemented.
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
assumeFalse("FORK not yet supported in CCS", testCase.requiredCapabilities.contains(FORK_V8.capabilityName()));
assumeFalse("FORK not yet supported in CCS", testCase.requiredCapabilities.contains(FORK_V9.capabilityName()));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected void shouldSkipTest(String testName) throws IOException {

assumeFalse(
"Tests using FORK or RRF already are skipped since we don't support multiple FORKs",
testCase.requiredCapabilities.contains(FORK_V8.capabilityName()) || testCase.requiredCapabilities.contains(RRF.capabilityName())
testCase.requiredCapabilities.contains(FORK_V9.capabilityName()) || testCase.requiredCapabilities.contains(RRF.capabilityName())
);

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

assumeTrue("Cluster needs to support FORK", hasCapabilities(client(), List.of(FORK_V8.capabilityName())));
assumeTrue("Cluster needs to support FORK", hasCapabilities(client(), List.of(FORK_V9.capabilityName())));
}
}
Loading