Skip to content

Commit

Permalink
ESQL: Disable tests planned incorrectly on pre-8.13 (failing BWC) (el…
Browse files Browse the repository at this point in the history
…astic#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
  • Loading branch information
bpintea authored Dec 16, 2024
1 parent 36826a4 commit 7846d8d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 20 deletions.
15 changes: 0 additions & 15 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -425,24 +425,9 @@ tests:
- class: org.elasticsearch.discovery.ec2.DiscoveryEc2AvailabilityZoneAttributeNoImdsIT
method: testAvailabilityZoneAttribute
issue: https://github.com/elastic/elasticsearch/issues/118564
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {grok.OverwriteName SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118631
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {stats.ByStringAndLongWithAlias SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118632
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {dissect.OverwriteNameWhere SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118633
- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
method: testRetryPointInTime
issue: https://github.com/elastic/elasticsearch/issues/118514
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {grok.OverwriteNameWhere SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118638
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {dissect.OverwriteName SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118667
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {stats.ByDateAndKeywordAndIntWithAlias SYNC}
issue: https://github.com/elastic/elasticsearch/issues/118668
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ null | null | null
;


overwriteName
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
overwriteName#[skip:-8.12.99]
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;

full_name:keyword | emp_no:keyword | b:keyword
Expand All @@ -244,7 +245,8 @@ emp_no:integer | first_name:keyword | rest:keyword
;


overwriteNameWhere
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
overwriteNameWhere#[skip:-8.12.99]
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;

full_name:keyword | emp_no:keyword | b:keyword
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ null | null | null
;


overwriteName
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
overwriteName#[skip:-8.12.99]
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;

full_name:keyword | emp_no:keyword | b:keyword
Expand All @@ -209,7 +210,8 @@ Parto Bamford | Parto | Bamford
;


overwriteNameWhere
// the query is incorrectly physically plan (fails the verification) in pre-8.13.0 versions
overwriteNameWhere#[skip:-8.12.99]
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;

full_name:keyword | emp_no:keyword | b:keyword
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ c:long | gender:keyword | trunk_worked_seconds:long
0 | null | 200000000
;

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

0 comments on commit 7846d8d

Please sign in to comment.