Address code review feedback

Author: julian-elastic

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardPattern.java

@@ -13,6 +13,7 @@
 import org.apache.lucene.util.automaton.RegExp;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.xpack.esql.core.util.StringUtils;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@
  * Allows escaping based on a regular char
  *
  */
-public class WildcardPattern extends AbstractStringPattern {
+public class WildcardPattern extends AbstractStringPattern implements Writeable {
 
     private final String wildcard;
     private final String regex;
@@ -42,6 +43,11 @@ public WildcardPattern(StreamInput in) throws IOException {
         this(in.readString());
     }
 
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeString(wildcard);
+    }
+
     public String pattern() {
         return wildcard;
     }
@@ -95,11 +101,4 @@ public boolean equals(Object obj) {
         return Objects.equals(wildcard, other.wildcard);
     }
 
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(wildcard);
-    }
-
-    public static WildcardPattern readFrom(StreamInput out) throws IOException {
-        return new WildcardPattern(out);
-    }
 }

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardPatternList.java

@@ -8,9 +8,9 @@
 
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.Operations;
-import org.elasticsearch.common.io.stream.NamedWriteable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
 
 import java.io.IOException;
 import java.util.List;
@@ -27,8 +27,7 @@
  * Allows escaping based on a regular char
  *
  */
-public class WildcardPatternList extends AbstractStringPattern implements NamedWriteable {
-    public static final Entry ENTRY = new Entry(WildcardPatternList.class, "WildcardPatternList", WildcardPatternList::new);
+public class WildcardPatternList extends AbstractStringPattern implements Writeable {
     public static final String NAME = "WildcardPatternList";
     private final List<WildcardPattern> patternList;
 
@@ -45,13 +44,8 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeCollection(patternList, (o, pattern) -> pattern.writeTo(o));
     }
 
-    @Override
-    public String getWriteableName() {
-        return NAME;
-    }
-
     public static WildcardPatternList readFrom(StreamInput in) throws IOException {
-        return new WildcardPatternList(in.readCollectionAsList(WildcardPattern::readFrom));
+        return new WildcardPatternList(in);
     }
 
     public List<WildcardPattern> patternList() {

x-pack/plugin/esql/qa/testFixtures/src/main/resources/where-like.csv-spec

@@ -453,6 +453,24 @@ emp_no:integer | first_name:keyword
 10099          | Valter
 ;
 
+likeListWithUpperTurnedInsensitive
+required_capability: like_with_list_of_patterns
+FROM employees | WHERE TO_UPPER(first_name) LIKE ("GEOR*") | keep emp_no, first_name | sort emp_no;
+
+emp_no:integer | first_name:keyword
+10001          | Georgi
+10055          | Georgy     
+;
+
+likeListWithUpperTurnedInsensitiveMult
+required_capability: like_with_list_of_patterns
+FROM employees | WHERE TO_UPPER(first_name) LIKE ("GEOR*", "WE*")  | keep emp_no, first_name | sort emp_no;
+
+emp_no:integer | first_name:keyword
+10001          | Georgi
+10040          | Weiyi
+10055          | Georgy    
+;
 
 likeAll
 from employees | where first_name like "*" and emp_no > 10028 | sort emp_no | keep emp_no, first_name | limit 2;

x-pack/plugin/esql/src/main/antlr/parser/Expression.g4

@@ -19,8 +19,8 @@ booleanExpression
 
 regexBooleanExpression
     : valueExpression (NOT)? LIKE string                               #likeExpression
-    | valueExpression (NOT)? RLIKE string                                 #rlikeExpression
-    | valueExpression (NOT)? LIKE LP string  (COMMA string )* RP  #likeListExpression
+    | valueExpression (NOT)? RLIKE string                              #rlikeExpression
+    | valueExpression (NOT)? LIKE LP string  (COMMA string )* RP       #likeListExpression
     ;
 
 matchBooleanExpression

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java

@@ -418,9 +418,6 @@ private static FunctionDefinition[][] functions() {
             // IP
             new FunctionDefinition[] { def(CIDRMatch.class, CIDRMatch::new, "cidr_match") },
             new FunctionDefinition[] { def(IpPrefix.class, IpPrefix::new, "ip_prefix") },
-            // likelist
-            // new FunctionDefinition[] { def(WildcardLikeList.class, WildcardLikeList::new, "like_list") },
-
             // conversion functions
             new FunctionDefinition[] {
                 def(FromBase64.class, FromBase64::new, "from_base64"),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/regex/WildcardLikeList.java

@@ -30,7 +30,6 @@ public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
         "WildcardLikeList",
         WildcardLikeList::new
     );
-    public static final String NAME = "LIKELIST";
 
     /**
      * The documentation for this function is in WildcardLike, and shown to the users `LIKE` in the docs.
@@ -66,7 +65,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public String name() {
-        return NAME;
+        return ENTRY.name;
     }
 
     @Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceStringCasingWithInsensitiveRegexMatch.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RegexMatch;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.StringPattern;
+import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPatternList;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.ChangeCase;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.regex.RLike;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.regex.WildcardLike;
@@ -28,6 +29,10 @@ public ReplaceStringCasingWithInsensitiveRegexMatch() {
     @Override
     protected Expression rule(RegexMatch<? extends StringPattern> regexMatch, LogicalOptimizerContext unused) {
         Expression e = regexMatch;
+        if(regexMatch.pattern() instanceof WildcardPatternList) {
+            // This optimization is not supported for WildcardPatternList for now
+            return e;
+        }
         if (regexMatch.field() instanceof ChangeCase changeCase) {
             var pattern = regexMatch.pattern().pattern();
             e = changeCase.caseType().matchesCase(pattern) ? insensitiveRegexMatch(regexMatch) : Literal.of(regexMatch, Boolean.FALSE);