Refactoring, cleanup and more tests

luigidellaquila · Dec 11, 2024 · dd9df2e · dd9df2e
1 parent 7faa1d7
commit dd9df2e
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 36 deletions.
diff --git a/...ore/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/RLike.java b/...ore/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/RLike.java
@@ -8,12 +8,11 @@
 
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
-import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 
 import java.io.IOException;
 
-public class RLike extends RegexMatch<RLikePattern> {
+public abstract class RLike extends RegexMatch<RLikePattern> {
 
     public RLike(Source source, Expression value, RLikePattern pattern) {
         super(source, value, pattern, false);
@@ -33,13 +32,4 @@ public String getWriteableName() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    protected NodeInfo<RLike> info() {
-        return NodeInfo.create(this, RLike::new, field(), pattern(), caseInsensitive());
-    }
-
-    @Override
-    protected RLike replaceChild(Expression newChild) {
-        return new RLike(source(), newChild, pattern(), caseInsensitive());
-    }
 }
diff --git a/.../main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardLike.java b/.../main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardLike.java
@@ -8,12 +8,11 @@
 
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
-import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 
 import java.io.IOException;
 
-public class WildcardLike extends RegexMatch<WildcardPattern> {
+public abstract class WildcardLike extends RegexMatch<WildcardPattern> {
 
     public WildcardLike(Source source, Expression left, WildcardPattern pattern) {
         this(source, left, pattern, false);
@@ -33,14 +32,4 @@ public String getWriteableName() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    protected NodeInfo<WildcardLike> info() {
-        return NodeInfo.create(this, WildcardLike::new, field(), pattern(), caseInsensitive());
-    }
-
-    @Override
-    protected WildcardLike replaceChild(Expression newLeft) {
-        return new WildcardLike(source(), newLeft, pattern(), caseInsensitive());
-    }
-
 }
diff --git a/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/util/TestUtils.java b/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/util/TestUtils.java
@@ -11,8 +11,6 @@
 import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Range;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.type.EsField;
@@ -46,10 +44,6 @@ public static Range rangeOf(Expression value, Expression lower, boolean includeL
         return new Range(EMPTY, value, lower, includeLower, upper, includeUpper, randomZone());
     }
 
-    public static RLike rlike(Expression left, String exp) {
-        return new RLike(EMPTY, left, new RLikePattern(exp));
-    }
-
     public static FieldAttribute fieldAttribute() {
         return fieldAttribute(randomAlphaOfLength(10), randomFrom(DataType.types()));
     }

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/eval.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/eval.csv-spec
@@ -601,3 +601,39 @@ Mokhtar             |Bernatsky          |38992          |BM
 Parto               |Bamford            |61805          |BP
 Premal              |Baek               |52833          |BP
 ;
+
+
+caseInsensitiveRegex
+from employees | where first_name RLIKE "(?i)geor.*" | keep first_name
+;
+
+first_name:keyword
+;
+
+
+caseInsensitiveRegex2
+from employees | where first_name RLIKE "(?i)Geor.*" | keep first_name
+;
+
+first_name:keyword
+;
+
+
+caseInsensitiveRegexFold
+required_capability: fixed_regex_fold
+row foo = "Bar" | where foo rlike "(?i)ba.*"
+;
+
+foo:keyword
+;
+
+
+caseInsensitiveRegexFold2
+required_capability: fixed_regex_fold
+row foo = "Bar" | where foo rlike "(?i)Ba.*"
+;
+
+foo:keyword
+;
+
+
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
@@ -565,7 +565,12 @@ public enum Cap {
         /**
          * Additional types for match function and operator
          */
-        MATCH_ADDITIONAL_TYPES;
+        MATCH_ADDITIONAL_TYPES,
+
+        /**
+         * Fix for regex folding with case-insensitive pattern https://github.com/elastic/elasticsearch/issues/118371
+         */
+        FIXED_REGEX_FOLD;
 
         private final boolean enabled;
 

diff --git a/...l/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/RLike.java b/...l/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/RLike.java
@@ -79,7 +79,7 @@ public String getWriteableName() {
     }
 
     @Override
-    protected NodeInfo<org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike> info() {
+    protected NodeInfo<RLike> info() {
         return NodeInfo.create(this, RLike::new, field(), pattern(), caseInsensitive());
     }
 

diff --git a/.../test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ConstantFoldingTests.java b/.../test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ConstantFoldingTests.java
@@ -17,11 +17,11 @@
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.And;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.Not;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.Or;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
 import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Add;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Div;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Mod;

diff --git a/.../org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java b/.../org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java
@@ -199,7 +199,7 @@ public void testPushDownFilterOnAliasInEval() {
 
     public void testPushDownLikeRlikeFilter() {
         EsRelation relation = relation();
-        org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike conditionA = rlike(getFieldAttribute("a"), "foo");
+        RLike conditionA = rlike(getFieldAttribute("a"), "foo");
         WildcardLike conditionB = wildcardLike(getFieldAttribute("b"), "bar");
 
         Filter fa = new Filter(EMPTY, relation, conditionA);

diff --git a/...est/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceRegexMatchTests.java b/...est/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceRegexMatchTests.java
@@ -11,11 +11,11 @@
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.predicate.nulls.IsNotNull;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
 import org.elasticsearch.xpack.esql.core.util.StringUtils;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 
 import static java.util.Arrays.asList;