From fa0b1b641a589a723d87f6c3d298117d005aab3f Mon Sep 17 00:00:00 2001 From: Marios Trivyzas Date: Tue, 1 Oct 2019 09:11:34 +0300 Subject: [PATCH] SQL: Add examples fo muting sql/csv integ tests (#47291) Add examples of failures for both sql and csv integeration tests and instructions on how to mute them. (cherry picked from commit 591bba46516d770f5fc95a4c536dd7448b74dd49) --- .../src/main/resources/agg-ordering.sql-spec | 2 + .../sql/qa/src/main/resources/agg.csv-spec | 2 + .../sql/qa/src/main/resources/agg.sql-spec | 2 + .../sql/qa/src/main/resources/alias.csv-spec | 2 + .../qa/src/main/resources/arithmetic.csv-spec | 2 + .../qa/src/main/resources/arithmetic.sql-spec | 2 + .../main/resources/case-functions.sql-spec | 2 + .../qa/src/main/resources/columns.csv-spec | 4 +- .../qa/src/main/resources/command.csv-spec | 2 + .../src/main/resources/conditionals.csv-spec | 2 + .../sql/qa/src/main/resources/date.csv-spec | 2 + .../main/resources/datetime-interval.csv-spec | 4 +- .../qa/src/main/resources/datetime.csv-spec | 2 + .../qa/src/main/resources/datetime.sql-spec | 2 + .../qa/src/main/resources/docs/docs.csv-spec | 2 + .../qa/src/main/resources/docs/geo.csv-spec | 2 + .../main/resources/examples/example.csv-spec | 51 ++++++++++++++++++- .../main/resources/examples/example.sql-spec | 34 ++++++++++++- .../src/main/resources/field-alias.csv-spec | 2 + .../sql/qa/src/main/resources/filter.csv-spec | 2 + .../sql/qa/src/main/resources/filter.sql-spec | 2 + .../qa/src/main/resources/fulltext.csv-spec | 2 + .../qa/src/main/resources/functions.csv-spec | 2 + .../qa/src/main/resources/geo/geosql.csv-spec | 4 +- .../qa/src/main/resources/geo/geosql.sql-spec | 2 + .../sql/qa/src/main/resources/ip.csv-spec | 2 + .../sql/qa/src/main/resources/math.csv-spec | 2 + .../sql/qa/src/main/resources/math.sql-spec | 2 + .../sql/qa/src/main/resources/nested.csv-spec | 2 + .../sql/qa/src/main/resources/null.csv-spec | 2 + .../sql/qa/src/main/resources/null.sql-spec | 2 + .../qa/src/main/resources/ogc/ogc.csv-spec | 2 + .../qa/src/main/resources/ogc/ogc.sql-spec | 2 + .../sql/qa/src/main/resources/pivot.csv-spec | 4 +- .../sql/qa/src/main/resources/select.csv-spec | 2 + .../sql/qa/src/main/resources/select.sql-spec | 2 + .../single-node-only/command-sys-geo.csv-spec | 4 +- .../single-node-only/command-sys.csv-spec | 4 +- .../src/main/resources/slow/frozen.csv-spec | 4 +- .../main/resources/string-functions.sql-spec | 2 + .../sql/qa/src/main/resources/time.csv-spec | 2 + 41 files changed, 168 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec index 9a193d76b31..087dbdad1d1 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Custom sorting/ordering on aggregates // diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec index 947b712145b..6ec60f09ba3 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Aggs not supported by H2 / traditional SQL stores // diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec index 8ebdcf88e85..102f884c1b9 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Group-By // diff --git a/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec index e18a5ab7efc..6c51bbf3dc6 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + tableAlias SELECT emp_no, first_name FROM test_alias ORDER BY emp_no LIMIT 6; diff --git a/x-pack/plugin/sql/qa/src/main/resources/arithmetic.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/arithmetic.csv-spec index e117866b5e9..9cbf544fd8d 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/arithmetic.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/arithmetic.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Arithmetic tests outside H2 // diff --git a/x-pack/plugin/sql/qa/src/main/resources/arithmetic.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/arithmetic.sql-spec index c6ce576d38f..d94123ea064 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/arithmetic.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/arithmetic.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Arithmetic tests // diff --git a/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec index d3a92b5eeec..2a856c6d084 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // Next 4 SELECTs in this file are related to https://github.com/elastic/elasticsearch/issues/32589 // H2 is Locale sensitive, while ES-SQL is not (so far) selectInsertWithLcaseAndLengthWithOrderBy diff --git a/x-pack/plugin/sql/qa/src/main/resources/columns.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/columns.csv-spec index c00a8e0123f..2cdef4b339b 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/columns.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/columns.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Test of explicit column types // the columns can be specified as or as @@ -13,4 +15,4 @@ gender:s | p1:l M | 10096 F | 10099 null | 10019 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec index ead39e735d0..0987623d61e 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Commands // diff --git a/x-pack/plugin/sql/qa/src/main/resources/conditionals.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/conditionals.csv-spec index 3b7a8a8de37..c54c4a81726 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/conditionals.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/conditionals.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + caseField SELECT emp_no, CASE WHEN emp_no - 10000 < 10 THEN 'First 10' ELSE 'Second 10' END as "case" FROM test_emp WHERE emp_no >= 10005 ORDER BY emp_no LIMIT 10; diff --git a/x-pack/plugin/sql/qa/src/main/resources/date.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/date.csv-spec index cd4f7f02f07..46557c77884 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/date.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/date.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Date // diff --git a/x-pack/plugin/sql/qa/src/main/resources/datetime-interval.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/datetime-interval.csv-spec index b5ca63b6781..3a01c7e6565 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/datetime-interval.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/datetime-interval.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Unfortunately H2 doesn't support INTERVAL type, // hence why all INTERVAL tests need to be done manually @@ -402,4 +404,4 @@ SELECT DOM(birth_date + INTERVAL 5 YEAR) x, COUNT(*) c FROM test_emp GROUP BY x 7 |5 1 |5 null |10 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/datetime.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/datetime.csv-spec index ad80d663b47..a99d982e682 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/datetime.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/datetime.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // DateTime // diff --git a/x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec index 1c21e9a7e6f..a0982d24837 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // DateTime // diff --git a/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec index 9888d86a840..27ec5663702 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // CSV spec used by the docs // diff --git a/x-pack/plugin/sql/qa/src/main/resources/docs/geo.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/docs/geo.csv-spec index 60fbebfc139..1307079e216 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/docs/geo.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/docs/geo.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // CSV spec used by the geo docs // diff --git a/x-pack/plugin/sql/qa/src/main/resources/examples/example.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/examples/example.csv-spec index 8ccdf258c33..5aefc5aa2c5 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/examples/example.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/examples/example.csv-spec @@ -23,4 +23,53 @@ foo,2.5,3 bar,3.5,4 tar,4.5,5 ; -// repeat the above \ No newline at end of file +// repeat the above + + +// Test failure example: +// org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT > test {pivot.testAverageWithOneValueAndLimit} FAILED +// java.lang.AssertionError: Elasticsearch [JdbcResultSet:row 4:cursor size 2:[languages, 'F']] still has data after [3] entries: +// 3 | 53660.0 +// at __randomizedtesting.SeedInfo.seed([81AF0740AC9F7D95:9FB389A0263106D]:0) +// at org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT.pivot.testAverageWithOneValueAndLimit(pivot.csv-spec:95) +// REPRODUCE WITH: ./gradlew ':x-pack:plugin:sql:qa:single-node:integTestRunner' --tests "org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT" -Dtests.method="test {pivot.testAverageWithOneValueAndLimit}" -Dtests.seed=81AF0740AC9F7D95 -Dtests.security.manager=true -Dtests.locale=yo -Dtests.timezone=Etc/GMT-10 -Dcompiler.java=12 -Druntime.java=11 + +// Muting test example: +// The name of the file which contains the failing test can be found by 2 components: +// - JdbcCsvSpecIT shows that it's a .csv-spec suffixed file +// - The name of the file is the part before the . so in our case: {pivot.testAverageWithOneValueAndLimit} => pivot +// Which in our example gives: pivot.csv-spec +// +// You can also find the whole name in the stacktrace of the exception along with the line where the failed test resides: +// at org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT.pivot.testAverageWithOneValueAndLimit(pivot.csv-spec:95) +// +// +// BEFORE (file: pivot.csv-spec): +//---------------------------------------------- +// averageWithOneValueAndLimit +// schema::languages:bt|'F':d +// SELECT * FROM (SELECT languages, gender, salary FROM test_emp) PIVOT (AVG(salary) FOR gender IN ('F')) LIMIT 3; +// +// languages | 'F' +// ---------------+------------------ +// null |62140.666666666664 +// 1 |47073.25 +// 2 |50684.4 +// ; +//---------------------------------------------- +// +// +// AFTER (muted), Just add the suffix -Ignore to the test name and a comment pointing to the Github issue: +//---------------------------------------------- +// // AwaitsFix https://github.com/elastic/elasticsearch/issues/47080 +// averageWithOneValueAndLimit-Ignore +// schema::languages:bt|'F':d +// SELECT * FROM (SELECT languages, gender, salary FROM test_emp) PIVOT (AVG(salary) FOR gender IN ('F')) LIMIT 3; +// +// languages | 'F' +// ---------------+------------------ +// null |62140.666666666664 +// 1 |47073.25 +// 2 |50684.4 +// ; +// --------------------------------------------- diff --git a/x-pack/plugin/sql/qa/src/main/resources/examples/example.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/examples/example.sql-spec index 8408dc58b1a..888187e2c20 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/examples/example.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/examples/example.sql-spec @@ -5,4 +5,36 @@ name // SQL query to be executed against H2 and ES SELECT COUNT(*) FROM "emp"; -// repeat the above \ No newline at end of file +// repeat the above + + +// Test failure example: +// org.elasticsearch.xpack.sql.qa.security.JdbcSqlSpecIT > test {agg.testGroupByOnText} FAILED +// org.h2.jdbc.JdbcSQLException: Column "gender2" not found; SQL statement: +// SELECT gender g FROM "test_emp" GROUP BY gender2 ORDER BY gender ASC [42122-197] +// at __randomizedtesting.SeedInfo.seed([880F4E292A732941:5B71F3848F44B9]:0) +// at org.elasticsearch.xpack.sql.qa.security.JdbcSqlSpecIT.agg.testGroupByOnText(agg.sql-spec:11) +// REPRODUCE WITH: ./gradlew ':x-pack:plugin:sql:qa:security:without-ssl:integTestRunner' --tests "org.elasticsearch.xpack.sql.qa.security.JdbcSqlSpecIT" -Dtests.method="test {agg.testGroupByOnText}" -Dtests.seed=BB1082EEC0023E5C -Dtests.security.manager=true -Dtests.locale=pt-TL -Dtests.timezone=MST7MDT -Dcompiler.java=12 -Druntime.java=12 + +// Muting test example: +// The name of the file which contains the failing test can be found by 2 components: +// - JdbcSqlSpecIT shows that it's a .sql-spec suffixed file +// - The name of the file is the part before the . so in our case: agg.testGroupByOnText => agg +// Which in our example gives: agg.sql-spec +// +// You can also find the whole name in the stacktrace of the exception along with the line where the failed test resides: +// at org.elasticsearch.xpack.sql.qa.security.JdbcSqlSpecIT.agg.testGroupByOnText(agg.sql-spec:11) +// +// BEFORE (file: agg.sql-spec): +//---------------------------------------------- +// groupByOnText +// SELECT gender g FROM "test_emp" GROUP BY gender ORDER BY gender ASC; +//---------------------------------------------- +// +// +// AFTER (muted), Just add the suffix -Ignore to the test name and a comment pointing to the Github issue: +//---------------------------------------------- +// // AwaitsFix https://github.com/elastic/elasticsearch/issues/33519 +// groupByOnText-Ignore +// SELECT gender g FROM "test_emp" GROUP BY gender ORDER BY gender ASC; +// --------------------------------------------- diff --git a/x-pack/plugin/sql/qa/src/main/resources/field-alias.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/field-alias.csv-spec index 977c0e83095..6df5e02e63d 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/field-alias.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/field-alias.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Tests testing field alias (introduced in ES 6.4) // diff --git a/x-pack/plugin/sql/qa/src/main/resources/filter.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/filter.csv-spec index e60460a63e5..b10c9f7e198 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/filter.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/filter.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Filter // diff --git a/x-pack/plugin/sql/qa/src/main/resources/filter.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/filter.sql-spec index d1564726979..0fe38c48cb0 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/filter.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/filter.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Filter // diff --git a/x-pack/plugin/sql/qa/src/main/resources/fulltext.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/fulltext.csv-spec index 99aa07ec91f..62dd3491159 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/fulltext.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/fulltext.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Full-text // diff --git a/x-pack/plugin/sql/qa/src/main/resources/functions.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/functions.csv-spec index a89013cb32b..97edeb08ecb 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/functions.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/functions.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + bitLengthGroupByAndOrderBy SELECT BIT_LENGTH(first_name), COUNT(*) count FROM "test_emp" GROUP BY BIT_LENGTH(first_name) ORDER BY BIT_LENGTH(first_name) LIMIT 10; diff --git a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec index 44c747f4bdc..e63f4325cb0 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Commands on geo test data // @@ -301,4 +303,4 @@ SELECT ST_Y(ST_WKTToSQL('LINESTRING (200 100, 300 400)')) y; y:d 100.0 // end::y -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.sql-spec index e801d8477f6..2367107818f 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Commands on geo test data // diff --git a/x-pack/plugin/sql/qa/src/main/resources/ip.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/ip.csv-spec index e6eb81ff8bf..e9ac7d3b8df 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/ip.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/ip.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Tests for IP fields // diff --git a/x-pack/plugin/sql/qa/src/main/resources/math.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/math.csv-spec index 19eda7b92f9..fb95f6713c1 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/math.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/math.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // this one doesn't work in H2 at all truncateWithAsciiHavingAndOrderBy SELECT TRUNCATE(ASCII(LEFT(first_name, 1)), 1), COUNT(*) count FROM test_emp GROUP BY ASCII(LEFT(first_name, 1)) HAVING COUNT(*) > 5 ORDER BY TRUNCATE(ASCII(LEFT(first_name, 1)), 1) DESC; diff --git a/x-pack/plugin/sql/qa/src/main/resources/math.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/math.sql-spec index a8ab87b087b..96ffa773aab 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/math.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/math.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Math // diff --git a/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec index 8b837ee00d1..5f50a6cbe5b 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Nested documents // diff --git a/x-pack/plugin/sql/qa/src/main/resources/null.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/null.csv-spec index df76250694e..86fde033426 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/null.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/null.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Null expressions // diff --git a/x-pack/plugin/sql/qa/src/main/resources/null.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/null.sql-spec index fce74d7569e..4daa7d3f0ee 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/null.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/null.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Null conditionals // diff --git a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec index 3f51c34d6ea..1b180b5bc29 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Commands on OGC data // diff --git a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.sql-spec index 3976c5a8b18..7a3ead11322 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Basic GEO SELECT // diff --git a/x-pack/plugin/sql/qa/src/main/resources/pivot.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/pivot.csv-spec index 0baa18765ff..963bfec88fe 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/pivot.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/pivot.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + averageWithOneValue schema::languages:bt|'F':d SELECT * FROM (SELECT languages, gender, salary FROM test_emp) PIVOT (AVG(salary) FOR gender IN ('F')); @@ -188,4 +190,4 @@ null |31070.0 3 |26830.0 4 |24646.0 5 |23353.0 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/select.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/select.csv-spec index 684a451e331..e5c5e0bbb77 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/select.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/select.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // SELECT with = and != // diff --git a/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec index 54694a45136..fda33badceb 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + // // Basic SELECT // diff --git a/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys-geo.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys-geo.csv-spec index b3c32d7eabd..9b7de599d7e 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys-geo.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys-geo.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Geo-specific Sys Commands // @@ -13,4 +15,4 @@ integTest|null |geo |location_no_dv |114 |GEO_PO integTest|null |geo |region |12 |KEYWORD |32766 |2147483647 |null |null |1 |null |null |12 |0 |2147483647 |5 |YES |null |null |null |null |NO |NO integTest|null |geo |region_point |12 |KEYWORD |32766 |2147483647 |null |null |1 |null |null |12 |0 |2147483647 |6 |YES |null |null |null |null |NO |NO integTest|null |geo |shape |114 |SHAPE |2147483647 |2147483647 |null |null |1 |null |null |114 |0 |null |7 |YES |null |null |null |null |NO |NO -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys.csv-spec index 6656c695ffe..34e093d1526 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/single-node-only/command-sys.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Sys Commands // @@ -118,4 +120,4 @@ integTest |null |test_emp_copy |languages |-6 |B integTest |null |test_emp_copy |last_name |12 |TEXT |2147483647 |2147483647 |null |null |1 |null |null |12 |0 |2147483647 |14 |YES |null |null |null |null |NO |NO integTest |null |test_emp_copy |last_name.keyword |12 |KEYWORD |32766 |2147483647 |null |null |1 |null |null |12 |0 |2147483647 |15 |YES |null |null |null |null |NO |NO integTest |null |test_emp_copy |salary |4 |INTEGER |11 |4 |null |10 |1 |null |null |4 |0 |null |16 |YES |null |null |null |null |NO |NO -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec index 6175bea6034..ae9968fe24d 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // Frozen indices tests // @@ -56,4 +58,4 @@ SELECT KURTOSIS(emp_no) k, SKEWNESS(salary) s FROM FROZEN frozen_emp; k:d | s:d 1.7997599759975997 | 0.2707722118423227 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/string-functions.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/string-functions.sql-spec index a2e8e67bd6b..b82d6ef5807 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/string-functions.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/string-functions.sql-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.sql-spec + stringAscii SELECT ASCII(first_name) s FROM "test_emp" WHERE emp_no < 10010 ORDER BY emp_no; diff --git a/x-pack/plugin/sql/qa/src/main/resources/time.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/time.csv-spec index 4f876b05da9..a7e60963527 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/time.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/time.csv-spec @@ -1,3 +1,5 @@ +// To mute tests follow example in file: example.csv-spec + // // TIME //