Skip to content

Commit eaa9a82

Browse files
astefanastefan
committed
Add capability
1 parent 5cfd6d5 commit eaa9a82

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
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
@@ -48,7 +48,7 @@
4848
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
4949
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
5050
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V2;
51-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V3;
51+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V4;
5252
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_LOOKUP_V12;
5353
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_PLANNING_V1;
5454
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METADATA_FIELDS_REMOTE_TEST;
@@ -126,7 +126,7 @@ protected void shouldSkipTest(String testName) throws IOException {
126126
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS.capabilityName()));
127127
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V2.capabilityName()));
128128
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_PLANNING_V1.capabilityName()));
129-
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V3.capabilityName()));
129+
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V4.capabilityName()));
130130
assumeFalse("LOOKUP JOIN not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName()));
131131
// Unmapped fields require a coorect capability response from every cluster, which isn't currently implemented.
132132
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));

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

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

55
maxOfInt
6-
required_capability: inlinestats_v3
6+
required_capability: inlinestats_v4
77
// tag::max-languages[]
88
FROM employees
99
| KEEP emp_no, languages
@@ -25,7 +25,7 @@ emp_no:integer | languages:integer | max_lang:integer
2525
;
2626

2727
maxOfIntByKeyword
28-
required_capability: inlinestats_v3
28+
required_capability: inlinestats_v4
2929

3030
FROM employees
3131
| KEEP emp_no, languages, gender
@@ -43,7 +43,7 @@ emp_no:integer | languages:integer | max_lang:integer | gender:keyword
4343
;
4444

4545
maxOfLongByKeyword
46-
required_capability: inlinestats_v3
46+
required_capability: inlinestats_v4
4747

4848
FROM employees
4949
| KEEP emp_no, avg_worked_seconds, gender
@@ -58,7 +58,7 @@ emp_no:integer | avg_worked_seconds:long | max_avg_worked_seconds:long | gender:
5858
;
5959

6060
maxOfLong
61-
required_capability: inlinestats_v3
61+
required_capability: inlinestats_v4
6262

6363
FROM employees
6464
| KEEP emp_no, avg_worked_seconds, gender
@@ -71,7 +71,7 @@ emp_no:integer | avg_worked_seconds:long | gender:keyword | max_avg_worked_secon
7171
;
7272

7373
maxOfLongByCalculatedKeyword
74-
required_capability: inlinestats_v3
74+
required_capability: inlinestats_v4
7575

7676
// tag::longest-tenured-by-first[]
7777
FROM employees
@@ -94,7 +94,7 @@ emp_no:integer | avg_worked_seconds:long | last_name:keyword | max_avg_worked_se
9494
;
9595

9696
maxOfLongByCalculatedNamedKeyword
97-
required_capability: inlinestats_v3
97+
required_capability: inlinestats_v4
9898

9999
FROM employees
100100
| KEEP emp_no, avg_worked_seconds, last_name
@@ -113,7 +113,7 @@ emp_no:integer | avg_worked_seconds:long | last_name:keyword | max_avg_worked_se
113113
;
114114

115115
maxOfLongByCalculatedDroppedKeyword
116-
required_capability: join_planning_v1
116+
required_capability: inlinestats_v4
117117

118118
FROM employees
119119
| INLINESTATS max_avg_worked_seconds = MAX(avg_worked_seconds) BY l = SUBSTRING(last_name, 0, 1)
@@ -132,7 +132,7 @@ emp_no:integer | avg_worked_seconds:long | last_name:keyword | max_avg_worked_se
132132
;
133133

134134
maxOfLongByEvaledKeyword
135-
required_capability: inlinestats_v3
135+
required_capability: inlinestats_v4
136136

137137
FROM employees
138138
| EVAL l = SUBSTRING(last_name, 0, 1)
@@ -152,7 +152,7 @@ emp_no:integer | avg_worked_seconds:long | max_avg_worked_seconds:long | l:keywo
152152
;
153153

154154
maxOfLongByInt
155-
required_capability: inlinestats_v3
155+
required_capability: inlinestats_v4
156156

157157
FROM employees
158158
| KEEP emp_no, avg_worked_seconds, languages
@@ -170,7 +170,7 @@ emp_no:integer | avg_worked_seconds:long | max_avg_worked_seconds:long | languag
170170
;
171171

172172
maxOfLongByIntDouble
173-
required_capability: inlinestats_v3
173+
required_capability: inlinestats_v4
174174

175175
FROM employees
176176
| KEEP emp_no, avg_worked_seconds, languages, height
@@ -244,7 +244,7 @@ abbrev:keyword | type:keyword | scalerank:integer | min_scalerank:integer
244244
;
245245

246246
byMvExpand
247-
required_capability: join_planning_v1
247+
required_capability: inlinestats_v4
248248

249249
// tag::extreme-airports[]
250250
FROM airports
@@ -308,7 +308,7 @@ count:long | country:keyword | avg:double
308308
;
309309

310310
afterWhere
311-
required_capability: join_planning_v1
311+
required_capability: inlinestats_v4
312312

313313
FROM airports
314314
| WHERE country != "United States"
@@ -367,7 +367,7 @@ abbrev:keyword | city:keyword | region:text | "COUNT(*)":long
367367
;
368368

369369
beforeStats
370-
required_capability: inlinestats_v3
370+
required_capability: inlinestats_v4
371371

372372
FROM airports
373373
| EVAL lat = ST_Y(location)
@@ -380,7 +380,7 @@ northern:long | southern:long
380380
;
381381

382382
beforeKeepSort
383-
required_capability: join_planning_v1
383+
required_capability: inlinestats_v4
384384

385385
FROM employees
386386
| INLINESTATS max_salary = MAX(salary) by languages
@@ -501,7 +501,7 @@ Zürich | Zürich
501501
;
502502

503503
byConstant
504-
required_capability: join_planning_v1
504+
required_capability: inlinestats_v4
505505

506506
FROM employees
507507
| KEEP emp_no, languages
@@ -520,7 +520,7 @@ emp_no:integer | languages:integer | max_lang:integer | y:integer
520520
;
521521

522522
aggConstant
523-
required_capability: join_planning_v1
523+
required_capability: inlinestats_v4
524524

525525
FROM employees
526526
| KEEP emp_no
@@ -538,7 +538,7 @@ one:integer | emp_no:integer
538538
;
539539

540540
percentile
541-
required_capability: inlinestats_v3
541+
required_capability: inlinestats_v4
542542

543543
FROM employees
544544
| KEEP emp_no, salary
@@ -557,7 +557,7 @@ emp_no:integer | salary:integer | ninety_fifth_salary:double
557557
;
558558

559559
byTwoCalculated
560-
required_capability: join_planning_v1
560+
required_capability: inlinestats_v4
561561

562562
FROM airports
563563
| WHERE abbrev IS NOT NULL
@@ -642,7 +642,7 @@ abbrev:keyword | scalerank:integer | location:geo_point
642642
;
643643

644644
groupShadowsField
645-
required_capability: join_planning_v1
645+
required_capability: inlinestats_v4
646646

647647
FROM employees
648648
| KEEP emp_no, salary, hire_date
@@ -661,7 +661,7 @@ emp_no:integer | salary:integer | avg_salary:double | hire_date:datetime
661661
;
662662

663663
groupByRenamedColumn-Ignore
664-
664+
required_capability: inlinestats_v4
665665
FROM employees
666666
| KEEP emp_no, languages, gender
667667
| INLINESTATS max_lang = MAX(languages) BY y = gender

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ public enum Cap {
835835
* Fixes a series of issues with inlinestats which had an incomplete implementation after lookup and inlinestats
836836
* were refactored.
837837
*/
838-
INLINESTATS_V3(EsqlPlugin.INLINESTATS_FEATURE_FLAG),
838+
INLINESTATS_V4(EsqlPlugin.INLINESTATS_FEATURE_FLAG),
839839

840840
/**
841841
* Support partial_results

0 commit comments

Comments
 (0)