Skip to content

[ES|QL] Fix MapExpression and named parameter related tests in StatementParserTests #121075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 30, 2025
Merged

[ES|QL] Fix MapExpression and named parameter related tests in StatementParserTests #121075

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04d010f
fix StatementParserTests.testNamedFunctionArgumentInMap, testNamedFun…
fang-xing-esql Jan 28, 2025
452cae1
Merge branch 'main' into StatementParserTests
fang-xing-esql Jan 28, 2025
2ad3b2a
Merge branch 'main' into StatementParserTests
fang-xing-esql Jan 28, 2025
be35ffa
Merge branch 'main' into StatementParserTests
fang-xing-esql Jan 29, 2025
effea36
Merge branch 'main' into StatementParserTests
fang-xing-esql Jan 30, 2025
784ca1f
Merge branch 'main' into StatementParserTests
fang-xing-esql Jan 30, 2025
bf88bb7
separate snapshot test from release test
fang-xing-esql Jan 30, 2025
787d516
Merge branch 'main' into StatementParserTests
elasticmachine Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,6 @@ tests:
- class: org.elasticsearch.datastreams.DataStreamsClientYamlTestSuiteIT
method: test {p0=data_stream/140_data_stream_aliases/Create data stream alias with filter}
issue: https://github.com/elastic/elasticsearch/issues/121014
- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
method: testNamedFunctionArgumentInMap
issue: https://github.com/elastic/elasticsearch/issues/121020
- class: org.elasticsearch.xpack.security.profile.ProfileIntegTests
method: testSuggestProfilesWithName
issue: https://github.com/elastic/elasticsearch/issues/121022
Expand Down
8 changes: 8 additions & 0 deletions ...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,6 +2468,10 @@ by fn2(f3, {"option1":["string1","string2"],"option2":[1,2,3],"option3":2.0,"opt
assertEquals(ur, relation("test"));

// map entry values provided in named parameter, arrays are not supported by named parameters yet
assumeTrue(
"named parameters for identifiers and patterns require snapshot build",
EsqlCapabilities.Cap.NAMED_PARAMETER_FOR_FIELD_AND_FUNCTION_NAMES_SIMPLIFIED_SYNTAX.isEnabled()
);
Copy link
Member

@nik9000 nik9000 Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing it this way will cause the whole test to stop. Maybe we're better off wrapping the assertion in an if

Copy link
Member Author

@fang-xing-esql fang-xing-esql Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that run only under snapshot are extracted to a separate test.

Copy link
Member

@nik9000 nik9000 Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

assertEquals(
new Filter(
EMPTY,
Expand Down Expand Up @@ -2860,6 +2864,10 @@ public void testNamedFunctionArgumentInInvalidPositions() {
}

public void testNamedFunctionArgumentWithUnsupportedNamedParameterTypes() {
assumeTrue(
"named parameters for identifiers and patterns require snapshot build",
EsqlCapabilities.Cap.NAMED_PARAMETER_FOR_FIELD_AND_FUNCTION_NAMES_SIMPLIFIED_SYNTAX.isEnabled()
);
Map<String, String> commands = Map.ofEntries(
Map.entry("eval x = {}", "29"),
Map.entry("where {}", "26"),
Expand Down