prohibit * in join patterns

Author: idegtiarenko

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java

@@ -523,9 +523,14 @@ public PlanFactory visitJoinCommand(EsqlBaseParser.JoinCommandContext ctx) {
  }
 
  var target = ctx.joinTarget();
+ var rightPattern = visitIndexPattern(List.of(target.index));
+ if (rightPattern.contains(WILDCARD)) {
+ throw new ParsingException(source(target), "invalid index pattern [{}], * is not allowed in LOOKUP JOIN", rightPattern);
+ }
+
  UnresolvedRelation right = new UnresolvedRelation(
  source(target),
- new TableIdentifier(source(target.index), null, visitIndexPattern(List.of(target.index))),
+ new TableIdentifier(source(target.index), null, rightPattern),
  false,
  emptyList(),
  IndexMode.LOOKUP,

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -2943,8 +2943,8 @@ public void testNamedFunctionArgumentWithUnsupportedNamedParameterTypes() {
  }
 
  public void testValidJoinPattern() {
- var basePattern = randomIndexPatterns();
- var joinPattern = randomIndexPattern();
+ var basePattern = randomIndexPatterns(true, true);
+ var joinPattern = randomIndexPattern(true, false);
  var onField = randomIdentifier();
  var type = randomFrom("", "LOOKUP ");
 
@@ -2960,13 +2960,20 @@ public void testValidJoinPattern() {
  assertThat(joinType.coreJoin().joinName(), equalTo("LEFT OUTER"));
  }
 
- private static String randomIndexPatterns() {
- return maybeQuote(String.join(",", randomList(1, 5, StatementParserTests::randomIndexPattern)));
+ public void testInvalidJoinPatterns() {
+ expectError(
+ "FROM " + randomIndexPatterns(true, true) + " | JOIN my-index-pattern* ON " + randomIdentifier(),
+ "invalid index pattern [my-index-pattern*], * is not allowed in LOOKUP JOIN"
+ );
+ }
+
+ private static String randomIndexPatterns(boolean includeRemotes, boolean includePatterns) {
+ return maybeQuote(String.join(",", randomList(1, 5, () -> randomIndexPattern(includeRemotes, includePatterns))));
  }
 
- private static String randomIndexPattern() {
- String pattern = maybeQuote(randomIndexIdentifier());
- if (randomBoolean()) {
+ private static String randomIndexPattern(boolean includeRemotes, boolean includePatterns) {
+ String pattern = maybeQuote(randomIndexIdentifier(includePatterns));
+ if (includeRemotes && randomBoolean()) {
  var cluster = randomIdentifier();
  pattern = maybeQuote(cluster + ":" + pattern);
  }
@@ -2976,7 +2983,7 @@ private static String randomIndexPattern() {
  /**
  * This generates random valid index, alias or pattern
  */
- private static String randomIndexIdentifier() {
+ private static String randomIndexIdentifier(boolean includePatterns) {
  // https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html#indices-create-api-path-params
  var validFirstCharacters = "abcdefghijklmnopqrstuvwxyz0123456789!'$^&";
  var validCharacters = validFirstCharacters + "+-_.";
@@ -2989,7 +2996,7 @@ private static String randomIndexIdentifier() {
  for (int i = 0; i < randomIntBetween(1, 100); i++) {
  index.append(randomCharacterFrom(validCharacters));
  }
- if (randomBoolean()) {// pattern
+ if (includePatterns && randomBoolean()) {// pattern
  index.append('*');
  }
  return index.toString();

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/190_lookup_join.yml

@@ -176,19 +176,16 @@ pattern-multiple:
  query: 'FROM test-lookup-1 | LOOKUP JOIN test-lookup-* ON key'
  catch: "bad_request"
 
- - match: { error.type: "verification_exception" }
- - contains: { error.reason: "Found 1 problem\nline 1:34: invalid [test-lookup-*] resolution in lookup mode to [2] indices" }
+ - match: { error.type: "parsing_exception" }
+ - contains: { error.reason: "line 1:34: invalid index pattern [test-lookup-*], * is not allowed in LOOKUP JOIN" }
 
 ---
 pattern-single:
  - do:
  esql.query:
  body:
  query: 'FROM test | SORT key | LOOKUP JOIN test-lookup-1* ON key | LIMIT 3'
+ catch: "bad_request"
 
- - match: {columns.0.name: "key"}
- - match: {columns.0.type: "long"}
- - match: {columns.1.name: "color"}
- - match: {columns.1.type: "keyword"}
- - match: {values.0: [1, "cyan"]}
- - match: {values.1: [2, "yellow"]}
+ - match: { error.type: "parsing_exception" }
+ - contains: { error.reason: "line 1:36: invalid index pattern [test-lookup-1*], * is not allowed in LOOKUP JOIN" }