Skip to content

Commit

Permalink
ESQL: Skip retrofitted tests (elastic#111019)
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-spies authored Jul 18, 2024
1 parent e33a8dc commit 548aea5
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 32 deletions.
5 changes: 0 additions & 5 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ tests:
- class: org.elasticsearch.nativeaccess.VectorSystemPropertyTests
method: testSystemPropertyDisabled
issue: https://github.com/elastic/elasticsearch/issues/110949
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: "test {stats.Count_or_null SYNC #2}"
issue: https://github.com/elastic/elasticsearch/issues/110950
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
issue: https://github.com/elastic/elasticsearch/issues/110978
- class: org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT
method: testEnterpriseDownloaderTask
issue: https://github.com/elastic/elasticsearch/issues/111002
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ROW left = "left", foo = "foo", client_ip = "172.21.0.5", env = "env", right = "
left:keyword | client_ip:keyword | env:keyword | right:keyword | foo:keyword
;

shadowingSubfields
shadowingSubfields#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
required_capability: enrich_load
FROM addresses
| KEEP city.country.continent.planet.name, city.country.name, city.name
Expand All @@ -84,8 +84,7 @@ United States of America | South San Francisco | San Francisco Int'l
Japan | Tokyo | null
;

shadowingSubfieldsLimit0
required_capability: enrich_load
shadowingSubfieldsLimit0#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
FROM addresses
| KEEP city.country.continent.planet.name, city.country.name, city.name
| EVAL city.name = REPLACE(city.name, "San Francisco", "South San Francisco")
Expand Down Expand Up @@ -135,7 +134,7 @@ ROW left = "left", airport = "Zurich Airport ZRH", city = "Zürich", middle = "m
left:keyword | city:keyword | middle:keyword | right:keyword | airport:text | region:text | city_boundary:geo_shape
;

shadowingInternal
shadowingInternal#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
required_capability: enrich_load
ROW city = "Zürich"
| ENRICH city_names ON city WITH x = airport, x = region
Expand All @@ -145,7 +144,7 @@ city:keyword | x:text
Zürich | Bezirk Zürich
;

shadowingInternalImplicit
shadowingInternalImplicit#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
required_capability: enrich_load
ROW city = "Zürich"
| ENRICH city_names ON city WITH airport = region
Expand All @@ -155,7 +154,7 @@ city:keyword | airport:text
Zürich | Bezirk Zürich
;

shadowingInternalImplicit2
shadowingInternalImplicit2#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
required_capability: enrich_load
ROW city = "Zürich"
| ENRICH city_names ON city WITH airport, airport = region
Expand All @@ -165,7 +164,7 @@ city:keyword | airport:text
Zürich | Bezirk Zürich
;

shadowingInternalImplicit3
shadowingInternalImplicit3#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
required_capability: enrich_load
ROW city = "Zürich"
| ENRICH city_names ON city WITH airport = region, airport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ left:keyword | right:keyword | x:integer
left | right | 1
;

shadowingSubfields
shadowingSubfields#[skip:-8.13.3,reason:fixed in 8.13]
FROM addresses
| KEEP city.country.continent.planet.name, city.country.name, city.name
| EVAL city.country.continent.planet.name = to_upper(city.country.continent.planet.name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ c:i
1
;

shadowingInternal
shadowingInternal#[skip:-8.13.3,reason:fixed in 8.13]
FROM employees
| SORT emp_no ASC
| KEEP last_name, emp_no, last_name
Expand All @@ -552,7 +552,7 @@ emp_no:integer | last_name:keyword
10002 | Simmel
;

shadowingInternalWildcard
shadowingInternalWildcard#[skip:-8.13.3,reason:fixed in 8.13]
FROM employees
| SORT emp_no ASC
| KEEP last*name, emp_no, last*name, first_name, last*, gender, last*
Expand All @@ -564,7 +564,7 @@ emp_no:integer | first_name:keyword | gender:keyword | last_name:keyword
10002 | Bezalel | F | Simmel
;

shadowingInternalWildcardAndExplicit
shadowingInternalWildcardAndExplicit#[skip:-8.13.3,reason:fixed in 8.13]
FROM employees
| SORT emp_no ASC
| KEEP last*name, emp_no, last_name, first_name, last*, languages, last_name, gender, last*name
Expand All @@ -576,7 +576,7 @@ emp_no:integer | first_name:keyword | languages:integer | last_name:keyword | ge
10002 | Bezalel | 5 | Simmel | F
;

shadowingSubfields
shadowingSubfields#[skip:-8.13.3,reason:fixed in 8.13]
FROM addresses
| KEEP city.country.continent.planet.name, city.country.continent.name, city.country.name, city.name, city.country.continent.planet.name
| SORT city.name
Expand All @@ -588,7 +588,7 @@ North America | United States of America | San Francisco
Asia | Japan | Tokyo | Earth
;

shadowingSubfieldsWildcard
shadowingSubfieldsWildcard#[skip:-8.13.3,reason:fixed in 8.13]
FROM addresses
| KEEP *name, city.country.continent.planet.name
| SORT city.name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ word_count:long
// end::docsCountWithExpression-result[]
;

count_or_null
count_where#[skip:-8.12.1,reason:implemented in 8.12]
// tag::count-where[]
ROW n=1
| WHERE n < 0
Expand All @@ -1173,7 +1173,7 @@ COUNT(n):long
;


count_or_null
count_or_null#[skip:-8.14.1,reason:implemented in 8.14]
// tag::count-or-null[]
ROW n=1
| STATS COUNT(n > 0 OR NULL), COUNT(n < 0 OR NULL)
Expand Down Expand Up @@ -1895,7 +1895,7 @@ x:integer
10001
;

shadowingInternalWithGroup
shadowingInternalWithGroup#[skip:-8.14.1,reason:implemented in 8.14]
FROM employees
| STATS x = MAX(emp_no), x = MIN(emp_no) BY x = gender
| SORT x ASC
Expand Down Expand Up @@ -1947,8 +1947,7 @@ MIN(i):integer | a:keyword | b:integer
// end::multi-mv-group-result[]
;

statsByConstant
required_capability: stats_by_constant
statsByConstant#[skip:-8.14.1,reason:implemented in 8.14]
from employees
| stats m = max(salary), a = round(avg(salary)) by 0
;
Expand All @@ -1957,8 +1956,7 @@ m:integer |a:double |0:integer
74999 |48249.0 |0
;

statsByConstantFromStats
required_capability: stats_by_constant
statsByConstantFromStats#[skip:-8.12.1,reason:implemented in 8.12]
from employees
| stats c = count(languages)
| stats a = count(*) by c
Expand All @@ -1968,8 +1966,7 @@ a:long |c:long
1 |90
;

statsByConstantFromEval
required_capability: stats_by_constant
statsByConstantFromEval#[skip:-8.14.1,reason:implemented in 8.14]
from employees
| eval x = 0
| stats m = max(salary), a = round(avg(salary)) by x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@ public enum Cap {
*/
RANGEQUERY_FOR_DATETIME,

/**
* Add tests for #105383, STATS BY constant.
*/
STATS_BY_CONSTANT,

/**
* Fix for non-unique attribute names in ROW and logical plans.
* https://github.com/elastic/elasticsearch/issues/110541
Expand Down

0 comments on commit 548aea5

Please sign in to comment.