Skip to content

Commit c209f02

Browse files
committed
Use different capability for csv tests
1 parent bfb9dee commit c209f02

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44

55
simpleFork
6-
required_capability: fork
6+
required_capability: fork_v3
77

88
FROM employees
99
| FORK ( WHERE emp_no == 10001 )
@@ -18,7 +18,7 @@ emp_no:integer | _fork:keyword
1818
;
1919

2020
forkWithWhereSortAndLimit
21-
required_capability: fork
21+
required_capability: fork_v3
2222

2323
FROM employees
2424
| FORK ( WHERE hire_date < "1985-03-01T00:00:00Z" | SORT first_name | LIMIT 5 )
@@ -38,7 +38,7 @@ emp_no:integer | first_name:keyword | _fork:keyword
3838
;
3939

4040
fiveFork
41-
required_capability: fork
41+
required_capability: fork_v3
4242

4343
FROM employees
4444
| FORK ( WHERE emp_no == 10005 )
@@ -59,7 +59,7 @@ fork5 | 10001
5959
;
6060

6161
forkWithWhereSortDescAndLimit
62-
required_capability: fork
62+
required_capability: fork_v3
6363

6464
FROM employees
6565
| FORK ( WHERE hire_date < "1985-03-01T00:00:00Z" | SORT first_name DESC | LIMIT 2 )
@@ -76,7 +76,7 @@ fork2 | 10087 | Xinglin
7676
;
7777

7878
forkWithCommonPrefilter
79-
required_capability: fork
79+
required_capability: fork_v3
8080

8181
FROM employees
8282
| WHERE emp_no > 10050
@@ -94,7 +94,7 @@ fork2 | 10100
9494
;
9595

9696
forkWithSemanticSearchAndScore
97-
required_capability: fork
97+
required_capability: fork_v3
9898
required_capability: semantic_text_field_caps
9999
required_capability: metadata_score
100100

@@ -114,7 +114,7 @@ fork2 | 6.093784261960139E18 | 2 | all we have to decide is w
114114
;
115115

116116
forkWithEvals
117-
required_capability: fork_v2
117+
required_capability: fork_v3
118118

119119
FROM employees
120120
| FORK (WHERE emp_no == 10048 OR emp_no == 10081 | EVAL x = "abc" | EVAL y = 1)
@@ -131,7 +131,7 @@ fork2 | 10087 | def | null | 2
131131
;
132132

133133
forkWithStats
134-
required_capability: fork_v2
134+
required_capability: fork_v3
135135

136136
FROM employees
137137
| FORK (WHERE emp_no == 10048 OR emp_no == 10081)
@@ -152,7 +152,7 @@ fork4 | null | 100 | 10001 | null
152152
;
153153

154154
forkWithDissect
155-
required_capability: fork_v2
155+
required_capability: fork_v3
156156

157157
FROM employees
158158
| WHERE emp_no == 10048 OR emp_no == 10081
@@ -172,7 +172,7 @@ fork2 | 10081 | Rosen | 10081 | null | Zhongwei
172172
;
173173

174174
forkWithMixOfCommands
175-
required_capability: fork_v2
175+
required_capability: fork_v3
176176

177177
FROM employees
178178
| WHERE emp_no == 10048 OR emp_no == 10081

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,9 +978,9 @@ public enum Cap {
978978
MAX_OVER_TIME(Build.current().isSnapshot()),
979979

980980
/**
981-
* Support STATS/EVAL/DISSECT in Fork branches
981+
* Support streaming of sub plan results
982982
*/
983-
FORK_V2(Build.current().isSnapshot()),
983+
FORK_V3(Build.current().isSnapshot()),
984984

985985
/**
986986
* Does the usage information for ESQL contain a histogram of {@code took} values?

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public final void test() throws Throwable {
309309
);
310310
assumeFalse(
311311
"CSV tests cannot currently handle FORK",
312-
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.FORK.capabilityName())
312+
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.FORK_V3.capabilityName())
313313
);
314314

315315
if (Build.current().isSnapshot()) {

0 commit comments

Comments
 (0)