Skip to content

Fix testValidFromPattern #121996

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 4 commits into from
Feb 7, 2025
Merged

Fix testValidFromPattern #121996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9056ad4
Fix testValidFromPattern
idegtiarenko Feb 7, 2025
db2234b
simplify
idegtiarenko Feb 7, 2025
6a46106
simplify
idegtiarenko Feb 7, 2025
c2c2c5f
unmute
idegtiarenko Feb 7, 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 @@ -397,9 +397,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/121966
- class: org.elasticsearch.xpack.searchablesnapshots.hdfs.SecureHdfsSearchableSnapshotsIT
issue: https://github.com/elastic/elasticsearch/issues/121967
- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
method: testInvalidJoinPatterns
issue: https://github.com/elastic/elasticsearch/issues/121968
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
method: test {yaml=update/100_synthetic_source/stored text}
issue: https://github.com/elastic/elasticsearch/issues/121991
Expand Down
11 changes: 6 additions & 5 deletions x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,17 @@ public static String randomIndexPattern(Feature... features) {
index.insert(0, "-");
}

var pattern = maybeQuote(index.toString());
var pattern = index.toString();
if (pattern.contains("|")) {
pattern = quote(pattern);
}
pattern = maybeQuote(pattern);

if (canAdd(Features.CROSS_CLUSTER, features)) {
var cluster = maybeQuote(randomIdentifier());
pattern = maybeQuote(cluster + ":" + pattern);
}

if (pattern.contains("|") && pattern.contains("\"") == false) {
pattern = quote(pattern);
}

return pattern;
}

Expand Down