Skip to content

Commit

Permalink
Another round at fixing the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@costin
costin committed Feb 8, 2024
1 parent ea1097b commit fe81918
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 58 deletions.
10 changes: 6 additions & 4 deletions ...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,18 @@ static CsvSpecReader.CsvTestCase convertToRemoteIndices(CsvSpecReader.CsvTestCas
String query = testCase.query;
String[] commands = query.split("\\|");
String first = commands[0].trim();

if (commands[0].toLowerCase(Locale.ROOT).startsWith("from")) {
String[] parts = commands[0].split("\\[");
String[] parts = commands[0].split("(?i)metadata");
assert parts.length >= 1 : parts;
String fromStatement = parts[0];

String[] localIndices = fromStatement.substring("FROM ".length()).split(",");
String remoteIndices = Arrays.stream(localIndices)
.map(index -> "*:" + index.trim() + "," + index.trim())
.collect(Collectors.joining(","));
var newFrom = "FROM " + remoteIndices + commands[0].substring(fromStatement.length());
testCase.query = newFrom + " " + query.substring(first.length());
var newFrom = "FROM " + remoteIndices + " " + commands[0].substring(fromStatement.length());
testCase.query = newFrom + query.substring(first.length());
}
int offset = testCase.query.length() - query.length();
if (offset != 0) {
Expand All @@ -195,7 +197,7 @@ static CsvSpecReader.CsvTestCase convertToRemoteIndices(CsvSpecReader.CsvTestCas
static boolean hasIndexMetadata(String query) {
String[] commands = query.split("\\|");
if (commands[0].trim().toLowerCase(Locale.ROOT).startsWith("from")) {
String[] parts = commands[0].split("\\[");
String[] parts = commands[0].split("(?i)metadata");
return parts.length > 1 && parts[1].contains("_index");
}
return false;
Expand Down
28 changes: 9 additions & 19 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
//
// Tests for _id fields
//

selectAll#[skip:-8.12.99]
FROM apps [metadata _id];
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id;
ignoreOrder:true

id:integer |name:keyword |version:version | _id:keyword
Expand All @@ -25,25 +23,22 @@ id:integer |name:keyword |version:version | _id:keyword
;

filterById#[skip:-8.12.99]
FROM apps [metadata _id]| WHERE _id == "4";
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | WHERE _id == "4";

id:i |name:k |version:v | _id:k
4 |ddddd |2.12.0 | 4
;

keepId#[skip:-8.12.99]
FROM apps [metadata _id] | WHERE id == 3 | KEEP _id;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | WHERE id == 3 | KEEP _id;


_id:k
3
;

idRangeAndSort#[skip:-8.12.99]
FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id;

id:i |name:k | _id:k
2 |bbbbb | 2
Expand All @@ -55,8 +50,7 @@ id:i |name:k | _id:k
;

orderById#[skip:-8.12.99]
FROM apps [metadata _id] | KEEP _id, name | SORT _id;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | KEEP _id, name | SORT _id;

_id:k | name:s
1 | aaaaa
Expand All @@ -76,8 +70,7 @@ _id:k | name:s
;

orderByIdDesc#[skip:-8.12.99]
FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | KEEP _id, name | SORT _id DESC;

_id:k | name:s

Expand All @@ -98,8 +91,7 @@ _id:k | name:s
;

concatId#[skip:-8.12.99]
FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | eval c = concat(_id, name) | SORT _id | KEEP c;

c:k
1aaaaa
Expand All @@ -119,17 +111,15 @@ c:k
;

statsOnId#[skip:-8.12.99]
FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id);
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | stats c = count(_id), d = count_distinct(_id);

c:l | d:l
14 | 14
;


statsOnIdByGroup#[skip:-8.12.99]
FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5;
warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
FROM apps metadata _id | stats c = count(_id) by name | sort c desc, name | limit 5;

c:l | name:k
2 | aaaaa
Expand Down
48 changes: 13 additions & 35 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@

simpleKeep#[skip:-8.12.99]
from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
from employees metadata _index, _version | sort emp_no | limit 2 | keep emp_no, _index, _version;

emp_no:integer |_index:keyword |_version:long
10001 |employees |1
10002 |employees |1
;

aliasWithSameName#[skip:-8.12.99]
from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
from employees metadata _index, _version | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version;

emp_no:integer |_index:keyword |_version:long
10001 |employees |1
10002 |employees |1
;

inComparison#[skip:-8.12.99]
from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
from employees metadata _index, _version | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2;


emp_no:integer
Expand All @@ -41,92 +38,73 @@ max:integer |_index:keyword
;

metaIndexAliasedInAggs#[skip:-8.12.99]
from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i;


max:integer |_i:keyword
10100 |employees
;

metaVersionInAggs#[skip:-8.12.99]
from employees [metadata _version] | stats min = min(emp_no) by _version;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _version | stats min = min(emp_no) by _version;

min:integer |_version:long
10001 |1
;

metaVersionAliasedInAggs#[skip:-8.12.99]
from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _version | eval _v = _version | stats min = min(emp_no) by _v;

min:integer |_v:long
10001 |1
;

inAggsAndAsGroups#[skip:-8.12.99]
from employees [metadata _index, _version] | stats max = max(_version) by _index;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | stats max = max(_version) by _index;

max:long |_index:keyword
1 |employees
;

inAggsAndAsGroupsAliased#[skip:-8.12.99]
from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | eval _i = _index, _v = _version | stats max = max(_v) by _i;

max:long |_i:keyword
1 |employees
;

inFunction#[skip:-8.12.99]
from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2;

emp_no:integer
10001
10002
;

inArithmetics#[skip:-8.12.99]
from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | eval i = _version + 2 | stats min = min(emp_no) by i;

min:integer |i:long
10001 |3
;

inSort#[skip:-8.12.99]
from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2;

emp_no:integer |_version:long |_index:keyword
10001 |1 |employees
10002 |1 |employees
;

withMvFunction#[skip:-8.12.99]
from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _version | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i;

min:integer |i:double
10001 |3.0
;

overwritten#[skip:-8.12.99]
from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3;
warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration

from employees metadata _index, _version | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3;

emp_no:integer |_index:integer |_version:keyword
10001 |3 |version
Expand Down

0 comments on commit fe81918

Please sign in to comment.