Address code review feedback part 1

Author: julian-elastic

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

@@ -331,8 +331,8 @@ public final Query wildcardQuery(String value, @Nullable MultiTermQuery.RewriteM
     }
 
     /**
-     * Similar to wildcardQuery, except that we change the behavior for
-     * this method for IndexFieldMapper
+     * Similar to wildcardQuery, except that we change the behavior for ESQL
+     * to behave like a string LIKE query, where the value is matched as a string
      */
     public Query wildcardLikeQuery(
         String value,

server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

@@ -56,7 +56,8 @@ public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuil
     private static final ParseField CASE_INSENSITIVE_FIELD = new ParseField("case_insensitive");
     private boolean caseInsensitive = DEFAULT_CASE_INSENSITIVITY;
 
-    private boolean isForESQL = false;
+    // forces a string like match instead of a wildcard match
+    private boolean forceStringMatch = false;
 
     /**
      * Implements the wildcard search query. Supported wildcards are {@code *}, which
@@ -82,7 +83,7 @@ public WildcardQueryBuilder(String fieldName, String value) {
 
     public WildcardQueryBuilder(String fieldName, String value, boolean isForESQL) {
         this(fieldName, value);
-        this.isForESQL = isForESQL;
+        this.forceStringMatch = isForESQL;
     }
 
     /**
@@ -95,9 +96,9 @@ public WildcardQueryBuilder(StreamInput in) throws IOException {
         rewrite = in.readOptionalString();
         caseInsensitive = in.readBoolean();
         if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
-            isForESQL = in.readBoolean();
+            forceStringMatch = in.readBoolean();
         } else {
-            isForESQL = false;
+            forceStringMatch = false;
         }
     }
 
@@ -108,7 +109,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         out.writeOptionalString(rewrite);
         out.writeBoolean(caseInsensitive);
         if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
-            out.writeBoolean(isForESQL);
+            out.writeBoolean(forceStringMatch);
         }
     }
 
@@ -234,7 +235,7 @@ private QueryBuilder maybeRewriteBasedOnConstantFields(@Nullable MappedFieldType
             // fields we also have the guarantee that it doesn't perform I/O, which is important
             // since rewrites might happen on a network thread.
             Query query;
-            if (isForESQL) {
+            if (forceStringMatch) {
                 query = constantFieldType.wildcardLikeQuery(value, caseInsensitive, context); // the rewrite method doesn't matter
             } else {
                 query = constantFieldType.wildcardQuery(value, caseInsensitive, context); // the rewrite method doesn't matter

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

@@ -293,7 +293,7 @@ private void assertClusterDetailsMap(Map<String, Object> result, boolean remoteO
         assertThat(remoteClusterShards.keySet(), equalTo(Set.of("total", "successful", "skipped", "failed")));
         assertThat((Integer) remoteClusterShards.get("total"), greaterThanOrEqualTo(0));
         assertThat((Integer) remoteClusterShards.get("successful"), equalTo((Integer) remoteClusterShards.get("total")));
-        // assertThat((Integer) remoteClusterShards.get("skipped"), equalTo(0));
+        assertThat((Integer) remoteClusterShards.get("skipped"), greaterThanOrEqualTo(0));
         assertThat((Integer) remoteClusterShards.get("failed"), equalTo(0));
 
         if (remoteOnly == false) {
@@ -309,7 +309,7 @@ private void assertClusterDetailsMap(Map<String, Object> result, boolean remoteO
             assertThat(localClusterShards.keySet(), equalTo(Set.of("total", "successful", "skipped", "failed")));
             assertThat((Integer) localClusterShards.get("total"), greaterThanOrEqualTo(0));
             assertThat((Integer) localClusterShards.get("successful"), equalTo((Integer) localClusterShards.get("total")));
-            // assertThat((Integer) localClusterShards.get("skipped"), equalTo(0));
+            assertThat((Integer) localClusterShards.get("skipped"), greaterThanOrEqualTo(0));
             assertThat((Integer) localClusterShards.get("failed"), equalTo(0));
         }
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/capabilities/TranslationAware.java

@@ -7,9 +7,11 @@
 
 package org.elasticsearch.xpack.esql.capabilities;
 
-import org.apache.lucene.util.automaton.Automaton;
+import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.elasticsearch.compute.lucene.LuceneTopNSourceOperator;
 import org.elasticsearch.compute.operator.FilterOperator;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.querydsl.query.Query;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.LucenePushdownPredicates;
@@ -49,19 +51,21 @@ static TranslationAware.Translatable translatable(Expression exp, LucenePushdown
     Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler);
 
     /**
-     * Translates the implementing expression into a Lucene {@link Automaton}.
+     * Translates this expression into a Lucene {@link org.apache.lucene.search.Query}.
+     * <p>
+     * Implementations should use the provided field type, rewrite method, and search execution context
+     * to construct an appropriate Lucene query for this expression.
+     * By default, this method throws {@link UnsupportedOperationException}; override it in subclasses
+     * that support Lucene query translation.
+     * </p>
      */
-    default Automaton asLuceneQuery() {
+    default org.apache.lucene.search.Query asLuceneQuery(
+        MappedFieldType fieldType,
+        RewriteMethod constantScoreRewrite,
+        SearchExecutionContext context
+    ) {
         throw new UnsupportedOperationException("asLuceneQuery is not implemented for " + getClass().getName());
-    };
-
-    /**
-     * Returns a description of the Lucene query that this expression translates to.
-     * This is used for debugging and logging purposes.
-     */
-    default String getLuceneQueryDescription() {
-        throw new UnsupportedOperationException("getLuceneQueryDescription is not implemented for " + getClass().getName());
-    };
+    }
 
     /**
      * Subinterface for expressions that can only process single values (and null out on MVs).

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

@@ -7,12 +7,15 @@
 
 package org.elasticsearch.xpack.esql.expression.function.scalar.string.regex;
 
+import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.apache.lucene.util.automaton.Automaton;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
@@ -150,12 +153,16 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
     }
 
     @Override
-    public Automaton asLuceneQuery() {
-        return pattern().createAutomaton(caseInsensitive());
+    public org.apache.lucene.search.Query asLuceneQuery(
+        MappedFieldType fieldType,
+        RewriteMethod constantScoreRewrite,
+        SearchExecutionContext context
+    ) {
+        Automaton automaton = pattern().createAutomaton(caseInsensitive());
+        return fieldType.automatonQuery(automaton, constantScoreRewrite, context, getLuceneQueryDescription());
     }
 
-    @Override
-    public String getLuceneQueryDescription() {
+    private String getLuceneQueryDescription() {
         // we use the information used to create the automaton to describe the query here
         String patternDesc = pattern().patternList().stream().map(WildcardPattern::pattern).collect(Collectors.joining("\", \""));
         return "LIKE(\"" + patternDesc + "\"), caseInsensitive=" + caseInsensitive();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/ExpressionQueryBuilder.java

@@ -9,7 +9,6 @@
 
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.util.automaton.Automaton;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -99,13 +98,11 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     @Override
     protected Query doToQuery(SearchExecutionContext context) throws IOException {
         if (expression instanceof TranslationAware translationAware) {
-            Automaton automaton = translationAware.asLuceneQuery();
             MappedFieldType fieldType = context.getFieldType(fieldName);
             if (fieldType == null) {
                 return new MatchNoDocsQuery("Field [" + fieldName + "] does not exist");
             }
-            String description = translationAware.getLuceneQueryDescription();
-            return fieldType.automatonQuery(automaton, CONSTANT_SCORE_REWRITE, context, description);
+            return translationAware.asLuceneQuery(fieldType, CONSTANT_SCORE_REWRITE, context);
         } else {
             throw new UnsupportedOperationException("ExpressionQueryBuilder does not support non-automaton expressions");
         }