Add Supplier for Automaton and CharacterRunAutomaton

Author: julian-elastic

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/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.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -31,6 +32,7 @@
 import org.elasticsearch.xpack.esql.session.Configuration;
 
 import java.io.IOException;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
@@ -42,6 +44,30 @@ public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
     @Nullable
     private final Configuration configuration;
 
+    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.
      */
@@ -139,8 +165,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() {