Skip to content

Commit cc061c3

Browse files
bpinteaMax Hniebergall
authored andcommitted
ESQL: Disable tests planned incorrectly on pre-8.13 (failing BWC) (elastic#118655) (elastic#118685)
* ESQL: Disable grok.OverwriteName* on pre-8.13 BWC tests (elastic#118655) This prevents two tests in `grok` and `dissect` suites - `overwriteName` and `overwriteNameWhere` and one in the `stats` suite - `byStringAndLongWithAlias` - to run against pre-8.13.0 versions. Reason being that coordinators prior to that version can generate invalid node plans, that'd fail (verification) on 8.18+ nodes. (cherry picked from commit 0441555) * re-enabled disabled tests
1 parent 7e57d58 commit cc061c3

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

muted-tests.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -425,24 +425,9 @@ tests:
425425
- class: org.elasticsearch.discovery.ec2.DiscoveryEc2AvailabilityZoneAttributeNoImdsIT
426426
method: testAvailabilityZoneAttribute
427427
issue: https://github.com/elastic/elasticsearch/issues/118564
428-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
429-
method: test {grok.OverwriteName SYNC}
430-
issue: https://github.com/elastic/elasticsearch/issues/118631
431-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
432-
method: test {stats.ByStringAndLongWithAlias SYNC}
433-
issue: https://github.com/elastic/elasticsearch/issues/118632
434-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
435-
method: test {dissect.OverwriteNameWhere SYNC}
436-
issue: https://github.com/elastic/elasticsearch/issues/118633
437428
- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
438429
method: testRetryPointInTime
439430
issue: https://github.com/elastic/elasticsearch/issues/118514
440-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
441-
method: test {grok.OverwriteNameWhere SYNC}
442-
issue: https://github.com/elastic/elasticsearch/issues/118638
443-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
444-
method: test {dissect.OverwriteName SYNC}
445-
issue: https://github.com/elastic/elasticsearch/issues/118667
446431
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
447432
method: test {stats.ByDateAndKeywordAndIntWithAlias SYNC}
448433
issue: https://github.com/elastic/elasticsearch/issues/118668

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ null | null | null
223223
;
224224

225225

226-
overwriteName
226+
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
227+
overwriteName#[skip:-8.12.99]
227228
from employees | sort emp_no asc | eval full_name = concat(first_name, " ", last_name) | dissect full_name "%{emp_no} %{b}" | keep full_name, emp_no, b | limit 3;
228229

229230
full_name:keyword | emp_no:keyword | b:keyword
@@ -244,7 +245,8 @@ emp_no:integer | first_name:keyword | rest:keyword
244245
;
245246

246247

247-
overwriteNameWhere
248+
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
249+
overwriteNameWhere#[skip:-8.12.99]
248250
from employees | sort emp_no asc | eval full_name = concat(first_name, " ", last_name) | dissect full_name "%{emp_no} %{b}" | where emp_no == "Bezalel" | keep full_name, emp_no, b | limit 3;
249251

250252
full_name:keyword | emp_no:keyword | b:keyword

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ null | null | null
199199
;
200200

201201

202-
overwriteName
202+
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
203+
overwriteName#[skip:-8.12.99]
203204
from employees | sort emp_no asc | eval full_name = concat(first_name, " ", last_name) | grok full_name "%{WORD:emp_no} %{WORD:b}" | keep full_name, emp_no, b | limit 3;
204205

205206
full_name:keyword | emp_no:keyword | b:keyword
@@ -209,7 +210,8 @@ Parto Bamford | Parto | Bamford
209210
;
210211

211212

212-
overwriteNameWhere
213+
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
214+
overwriteNameWhere#[skip:-8.12.99]
213215
from employees | sort emp_no asc | eval full_name = concat(first_name, " ", last_name) | grok full_name "%{WORD:emp_no} %{WORD:b}" | where emp_no == "Bezalel" | keep full_name, emp_no, b | limit 3;
214216

215217
full_name:keyword | emp_no:keyword | b:keyword

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ c:long | gender:keyword | trunk_worked_seconds:long
564564
0 | null | 200000000
565565
;
566566

567-
byStringAndLongWithAlias
567+
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
568+
byStringAndLongWithAlias#[skip:-8.12.99]
568569
FROM employees
569570
| EVAL trunk_worked_seconds = avg_worked_seconds / 100000000 * 100000000
570571
| RENAME gender as g, trunk_worked_seconds as tws

0 commit comments

Comments
 (0)