Merge remote-tracking branch 'julian-elastic/indexLike_v3' into indexLike_v3

Author: nik9000

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -87,7 +87,8 @@ public void setup() {
             false,
             Map.of(),
             System.nanoTime(),
-            false
+            false,
+            true
         );
 
         var fields = 10_000;

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -349,7 +349,8 @@ private static Configuration configuration() {
             false,
             Map.of(),
             0,
-            false
+            false,
+            true
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/ConstantFieldType.java

@@ -25,6 +25,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.function.Supplier;
 
 /**
  * A {@link MappedFieldType} that has the same value for all documents.
@@ -164,12 +165,13 @@ public final boolean fieldHasValue(FieldInfos fieldInfos) {
      */
     @Override
     public Query automatonQuery(
-        Automaton automaton,
+        Supplier<Automaton> automatonSupplier,
+        Supplier<CharacterRunAutomaton> characterRunAutomatonSupplier,
         @Nullable MultiTermQuery.RewriteMethod method,
         SearchExecutionContext context,
         String description
     ) {
-        CharacterRunAutomaton compiled = new CharacterRunAutomaton(automaton);
+        CharacterRunAutomaton compiled = characterRunAutomatonSupplier.get();
         boolean matches = compiled.run(getConstantFieldValue(context));
         if (matches) {
             return new MatchAllDocsQuery();

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

@@ -32,6 +32,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.automaton.Automata;
 import org.apache.lucene.util.automaton.Automaton;
+import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.apache.lucene.util.automaton.CompiledAutomaton.AUTOMATON_TYPE;
 import org.apache.lucene.util.automaton.Operations;
@@ -84,6 +85,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import static org.apache.lucene.index.IndexWriter.MAX_TERM_LENGTH;
 import static org.elasticsearch.core.Strings.format;
@@ -1047,12 +1049,13 @@ public boolean hasDocValuesSkipper() {
 
         @Override
         public Query automatonQuery(
-            Automaton automaton,
+            Supplier<Automaton> automatonSupplier,
+            Supplier<CharacterRunAutomaton> characterRunAutomatonSupplier,
             @Nullable MultiTermQuery.RewriteMethod method,
             SearchExecutionContext context,
             String description
         ) {
-            return new AutomatonQueryWithDescription(new Term(name()), automaton, description);
+            return new AutomatonQueryWithDescription(new Term(name()), automatonSupplier.get(), description);
         }
     }
 

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -26,6 +26,7 @@
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.automaton.Automaton;
+import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -55,6 +56,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import static org.elasticsearch.search.SearchService.ALLOW_EXPENSIVE_QUERIES;
 
@@ -389,7 +391,8 @@ public Query regexpQuery(
      * For now can only be AutomatonQuery or MatchAllDocsQuery() or MatchNoDocsQuery()
      */
     public Query automatonQuery(
-        Automaton automaton,
+        Supplier<Automaton> automatonSupplier,
+        Supplier<CharacterRunAutomaton> characterRunAutomatonSupplier,
         @Nullable MultiTermQuery.RewriteMethod method,
         SearchExecutionContext context,
         String description

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java

@@ -431,6 +431,14 @@ public void testLikeIndex() throws Exception {
     }
 
     public void testLikeIndexLegacySettingNoResults() throws Exception {
+        boolean isSupported = clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false);
+        if (isSupported == false) {
+            // we require that the admin client supports the like_on_index_fields capability
+            // otherwise we will get an error when trying to toggle the setting
+            // the remote client does not have to support it
+            logger.info("-->  skipping testLikeIndexLegacySettingNoResults, due to missing capability");
+            return;
+        }
         try (ClusterSettingToggle ignored = new ClusterSettingToggle(adminClient(), "esql.query.string_like_on_index", false, true)) {
             // test code with the setting changed
             boolean includeCCSMetadata = includeCCSMetadata();
@@ -448,6 +456,14 @@ public void testLikeIndexLegacySettingNoResults() throws Exception {
     }
 
     public void testLikeIndexLegacySettingResults() throws Exception {
+        boolean isSupported = clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false);
+        if (isSupported == false) {
+            // we require that the admin client supports the like_on_index_fields capability
+            // otherwise we will get an error when trying to toggle the setting
+            // the remote client does not have to support it
+            logger.info("-->  skipping testLikeIndexLegacySettingNoResults, due to missing capability");
+            return;
+        }
         try (ClusterSettingToggle ignored = new ClusterSettingToggle(adminClient(), "esql.query.string_like_on_index", false, true)) {
             boolean includeCCSMetadata = includeCCSMetadata();
             Map<String, Object> result = run("""

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

@@ -9,6 +9,7 @@
 
 import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.apache.lucene.util.automaton.Automaton;
+import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -31,6 +32,7 @@
 import org.elasticsearch.xpack.esql.planner.TranslatorHandler;
 
 import java.io.IOException;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
@@ -40,6 +42,30 @@ public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
         WildcardLikeList::new
     );
 
+    Supplier<Automaton> automatonSupplier = new Supplier<>() {
+        Automaton cached;
+
+        @Override
+        public Automaton get() {
+            if (cached == null) {
+                cached = pattern().createAutomaton(caseInsensitive());
+            }
+            return cached;
+        }
+    };
+
+    Supplier<CharacterRunAutomaton> characterRunAutomatonSupplier = new Supplier<>() {
+        CharacterRunAutomaton cached;
+
+        @Override
+        public CharacterRunAutomaton get() {
+            if (cached == null) {
+                cached = new CharacterRunAutomaton(automatonSupplier.get());
+            }
+            return cached;
+        }
+    };
+
     /**
      * The documentation for this function is in WildcardLike, and shown to the users `LIKE` in the docs.
      */
@@ -112,9 +138,6 @@ public Translatable translatable(LucenePushdownPredicates pushdownPredicates) {
      */
     @Override
     public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler) {
-        if (pushdownPredicates.configuration().stringLikeOnIndex() == false) {
-            throw new IllegalArgumentException("LIKE with LIST cannot be used with string_like_on_index enabled. Use LIKE instead.");
-        }
         var field = field();
         LucenePushdownPredicates.checkIsPushableAttribute(field);
         String targetFieldName = handler.nameOf(field instanceof FieldAttribute fa ? fa.exactAttribute() : field);
@@ -131,8 +154,13 @@ public org.apache.lucene.search.Query asLuceneQuery(
         RewriteMethod constantScoreRewrite,
         SearchExecutionContext context
     ) {
-        Automaton automaton = pattern().createAutomaton(caseInsensitive());
-        return fieldType.automatonQuery(automaton, constantScoreRewrite, context, getLuceneQueryDescription());
+        return fieldType.automatonQuery(
+            automatonSupplier,
+            characterRunAutomatonSupplier,
+            constantScoreRewrite,
+            context,
+            getLuceneQueryDescription()
+        );
     }
 
     private String getLuceneQueryDescription() {