Skip to content

Commit 59b7c00

Browse files
committed
Add capability
1 parent 5144975 commit 59b7c00

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
maxOfInt
66
required_capability: join_planning_v1
7+
required_capability: inlinestats_stubrelation_proper_replacement
78
// tag::max-languages[]
89
FROM employees
910
| KEEP emp_no, languages
@@ -26,6 +27,7 @@ emp_no:integer | languages:integer | max_lang:integer
2627

2728
maxOfIntByKeyword
2829
required_capability: join_planning_v1
30+
required_capability: inlinestats_stubrelation_proper_replacement
2931

3032
FROM employees
3133
| KEEP emp_no, languages, gender
@@ -44,6 +46,7 @@ emp_no:integer | languages:integer | gender:keyword | max_lang:integer
4446

4547
maxOfLongByKeyword
4648
required_capability: join_planning_v1
49+
required_capability: inlinestats_stubrelation_proper_replacement
4750

4851
FROM employees
4952
| KEEP emp_no, avg_worked_seconds, gender
@@ -59,6 +62,7 @@ emp_no:integer | avg_worked_seconds:long | gender:keyword | max_avg_worked_secon
5962

6063
maxOfLong
6164
required_capability: join_planning_v1
65+
required_capability: inlinestats_stubrelation_proper_replacement
6266

6367
FROM employees
6468
| KEEP emp_no, avg_worked_seconds, gender
@@ -72,6 +76,7 @@ emp_no:integer | avg_worked_seconds:long | gender:keyword | max_avg_worked_secon
7276

7377
maxOfLongByCalculatedKeyword
7478
required_capability: join_planning_v1
79+
required_capability: inlinestats_stubrelation_proper_replacement
7580

7681
// tag::longest-tenured-by-first[]
7782
FROM employees
@@ -95,6 +100,7 @@ emp_no:integer | avg_worked_seconds:long | last_name:keyword | SUBSTRING(last_na
95100

96101
maxOfLongByCalculatedNamedKeyword
97102
required_capability: join_planning_v1
103+
required_capability: inlinestats_stubrelation_proper_replacement
98104

99105
FROM employees
100106
| KEEP emp_no, avg_worked_seconds, last_name
@@ -133,6 +139,7 @@ emp_no:integer | avg_worked_seconds:long | last_name:keyword | max_avg_worked_se
133139

134140
maxOfLongByEvaledKeyword
135141
required_capability: join_planning_v1
142+
required_capability: inlinestats_stubrelation_proper_replacement
136143

137144
FROM employees
138145
| EVAL l = SUBSTRING(last_name, 0, 1)
@@ -153,6 +160,7 @@ emp_no:integer | avg_worked_seconds:long | l:keyword | max_avg_worked_seconds:lo
153160

154161
maxOfLongByInt
155162
required_capability: join_planning_v1
163+
required_capability: inlinestats_stubrelation_proper_replacement
156164

157165
FROM employees
158166
| KEEP emp_no, avg_worked_seconds, languages
@@ -171,6 +179,7 @@ emp_no:integer | avg_worked_seconds:long | languages:integer | max_avg_worked_se
171179

172180
maxOfLongByIntDouble
173181
required_capability: join_planning_v1
182+
required_capability: inlinestats_stubrelation_proper_replacement
174183

175184
FROM employees
176185
| KEEP emp_no, avg_worked_seconds, languages, height
@@ -330,7 +339,7 @@ required_capability: join_planning_v1
330339

331340
FROM airports
332341
| RENAME scalerank AS int
333-
| LOOKUP JOIN int_number_names ON int
342+
| LOOKUP int_number_names ON int
334343
| RENAME name as scalerank
335344
| DROP int
336345
| INLINESTATS count=COUNT(*) BY scalerank
@@ -368,6 +377,7 @@ abbrev:keyword | city:keyword | region:text | "COUNT(*)":long
368377

369378
beforeStats
370379
required_capability: join_planning_v1
380+
required_capability: inlinestats_stubrelation_proper_replacement
371381

372382
FROM airports
373383
| EVAL lat = ST_Y(location)
@@ -539,6 +549,7 @@ emp_no:integer | one:integer
539549

540550
percentile
541551
required_capability: join_planning_v1
552+
required_capability: inlinestats_stubrelation_proper_replacement
542553

543554
FROM employees
544555
| KEEP emp_no, salary

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,13 @@ public enum Cap {
808808
* and https://github.com/elastic/elasticsearch/issues/120803
809809
* Support for queries that have multiple SORTs that cannot become TopN
810810
*/
811-
REMOVE_REDUNDANT_SORT;
811+
REMOVE_REDUNDANT_SORT,
812+
813+
/**
814+
* Fixes a series of issues with inlinestats which had an incomplete implementation after lookup and inlinestats
815+
* were refactored.
816+
*/
817+
INLINESTATS_STUBRELATION_PROPER_REPLACEMENT;
812818

813819
private final boolean enabled;
814820

0 commit comments

Comments
 (0)