From fb7b9595ffa3acf66cecfa7573363926f5d67ae9 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 29 Sep 2023 07:54:19 -0400 Subject: [PATCH] ESQL: AwaitsFix some tests that are failing These tests started failing after a combination of #100029 and #100016 which passed CI individually but aren't happy together. Proper fix incoming, but for now let's unblock some folks. --- .../qa/testFixtures/src/main/resources/math.csv-spec | 3 ++- .../src/main/resources/metadata-ignoreCsvTests.csv-spec | 3 ++- .../src/main/resources/unsigned_long.csv-spec | 6 ++++-- .../qa/testFixtures/src/main/resources/version.csv-spec | 9 ++++++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/math.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/math.csv-spec index ebd54c4e384a7..a423db2f47df1 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/math.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/math.csv-spec @@ -200,7 +200,8 @@ height:double | s:double 1.53 | 0.34 ; -powSalarySquared +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +powSalarySquared-Ignore from employees | eval s = pow(to_long(salary) - 75000, 2) + 10000 | keep salary, s | sort salary desc | limit 4; salary:integer | s:long diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-ignoreCsvTests.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-ignoreCsvTests.csv-spec index ee2d3ab6db801..a38f442f6c1d9 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-ignoreCsvTests.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-ignoreCsvTests.csv-spec @@ -112,7 +112,8 @@ emp_no:integer |_index:integer |_version:keyword 10003 |3 |version ; -multipleIndices +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +multipleIndices-Ignore // tag::multipleIndices[] FROM ul_logs, apps [METADATA _index, _version] | WHERE id IN (13, 14) AND _version == 1 diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/unsigned_long.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/unsigned_long.csv-spec index 9f5d7be3e63e0..bccb5a7083dac 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/unsigned_long.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/unsigned_long.csv-spec @@ -138,7 +138,8 @@ FROM ul_logs 2017-11-10T20:34:43.000Z | 17764691215469285192 | 1.75E19 ; -toDegrees +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +toDegrees-Ignore FROM ul_logs | WHERE bytes_in == bytes_out | EVAL deg = TO_DEGREES(bytes_in) | KEEP bytes_in, deg ; @@ -147,7 +148,8 @@ FROM ul_logs | WHERE bytes_in == bytes_out | EVAL deg = TO_DEGREES(bytes_in) | K ; -toRadians +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +toRadians-Ignore FROM ul_logs | WHERE bytes_in == bytes_out | EVAL rad = TO_RADIANS(bytes_in) | KEEP bytes_in, rad ; diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/version.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/version.csv-spec index df1fa6e67f279..d51cb7b5d2bd0 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/version.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/version.csv-spec @@ -139,7 +139,8 @@ id:i |name:s |version:v 9 |iiiii |bad ; -orderByVersionMultipleCasts +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +orderByVersionMultipleCasts-Ignore FROM apps | EVAL o = TO_VER(CONCAT("1.", TO_STR(version))) | SORT o, id; id:i |name:s |version:v |o:v @@ -203,7 +204,8 @@ bad 5.2.9-SNAPSHOT ; -groupByVersionCast +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +groupByVersionCast-Ignore FROM apps | EVAL g = TO_VER(CONCAT("1.", TO_STR(version))) | STATS id = MAX(id) BY g | SORT id | DROP g; id:i @@ -287,7 +289,8 @@ idx:i |version:v 14 | 5.2.9 ; -case +# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826 +case-Ignore FROM apps | EVAL version_text = TO_STR(version) | WHERE version IS NULL OR version_text LIKE "1*"