From 9056ad4d428668238fb00d4ef3e25e1e4c850d8a Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Fri, 7 Feb 2025 08:37:47 +0100 Subject: [PATCH 1/4] Fix testValidFromPattern --- .../org/elasticsearch/xpack/esql/IdentifierGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java index 88dbcaebaa4d0..aae1cb3893f88 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java @@ -84,8 +84,8 @@ public static String randomIndexPattern(Feature... features) { pattern = maybeQuote(cluster + ":" + pattern); } - if (pattern.contains("|") && pattern.contains("\"") == false) { - pattern = quote(pattern); + if (pattern.contains("|") && pattern.endsWith("\"") == false) { + pattern = quote(unquoteIndexPattern(pattern)); } return pattern; From db2234b2b07d683126941d1f8951dbbcee0bafd7 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Fri, 7 Feb 2025 08:43:41 +0100 Subject: [PATCH 2/4] simplify --- .../org/elasticsearch/xpack/esql/IdentifierGenerator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java index aae1cb3893f88..fbc73ef7b914d 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java @@ -79,15 +79,15 @@ public static String randomIndexPattern(Feature... features) { } var pattern = maybeQuote(index.toString()); + if (pattern.contains("|")) { + pattern = quote(unquoteIndexPattern(pattern)); + } + if (canAdd(Features.CROSS_CLUSTER, features)) { var cluster = maybeQuote(randomIdentifier()); pattern = maybeQuote(cluster + ":" + pattern); } - if (pattern.contains("|") && pattern.endsWith("\"") == false) { - pattern = quote(unquoteIndexPattern(pattern)); - } - return pattern; } From 6a461067c16317d96897ba2cbe0d2091f076a2c4 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Fri, 7 Feb 2025 08:48:46 +0100 Subject: [PATCH 3/4] simplify --- .../org/elasticsearch/xpack/esql/IdentifierGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java index fbc73ef7b914d..df8cacff67f44 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java @@ -78,10 +78,11 @@ public static String randomIndexPattern(Feature... features) { index.insert(0, "-"); } - var pattern = maybeQuote(index.toString()); + var pattern = index.toString(); if (pattern.contains("|")) { - pattern = quote(unquoteIndexPattern(pattern)); + pattern = quote(pattern); } + pattern = maybeQuote(pattern); if (canAdd(Features.CROSS_CLUSTER, features)) { var cluster = maybeQuote(randomIdentifier()); From c2c2c5f06296bc2e8255acc27a0b345289a6d252 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Fri, 7 Feb 2025 10:07:55 +0100 Subject: [PATCH 4/4] unmute --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index d6ca9920c7394..e6e142c55ad89 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -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