Test change

Author: julian-elastic

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

@@ -10,11 +10,9 @@
 package org.elasticsearch.index.mapper;
 
 import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.FieldDataContext;
 import org.elasticsearch.index.fielddata.IndexFieldData;
@@ -29,7 +27,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 public class IndexFieldMapper extends MetadataFieldMapper {
 
@@ -104,7 +101,7 @@ public StoredFieldsSpec storedFieldsSpec() {
                 }
             };
         }
-
+        /*
         @Override
         public Query wildcardQuery(String value, boolean caseInsensitive, QueryRewriteContext context) {
             String indexName = context.getFullyQualifiedIndex().getName();
@@ -117,6 +114,7 @@ public Query wildcardQuery(String value, boolean caseInsensitive, QueryRewriteCo
             }
             return new MatchNoDocsQuery();
         }
+        */
 
     }
 

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

@@ -213,7 +213,7 @@ protected QueryBuilder doCoordinatorRewrite(CoordinatorRewriteContext coordinato
         return maybeRewriteBasedOnConstantFields(fieldType, coordinatorRewriteContext);
     }
 
-    private QueryBuilder maybeRewriteBasedOnConstantFields(@Nullable MappedFieldType fieldType, QueryRewriteContext context) {
+    protected QueryBuilder maybeRewriteBasedOnConstantFields(@Nullable MappedFieldType fieldType, QueryRewriteContext context) {
         if (fieldType instanceof ConstantFieldType constantFieldType) {
             // This logic is correct for all field types, but by only applying it to constant
             // fields we also have the guarantee that it doesn't perform I/O, which is important

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/WildcardQuery.java

@@ -6,10 +6,21 @@
  */
 package org.elasticsearch.xpack.esql.core.querydsl.query;
 
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.elasticsearch.common.regex.Regex;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.index.mapper.IndexFieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.query.CoordinatorRewriteContext;
+import org.elasticsearch.index.query.MatchAllQueryBuilder;
+import org.elasticsearch.index.query.MatchNoneQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 
+import java.util.Locale;
 import java.util.Objects;
 
 import static org.elasticsearch.index.query.QueryBuilders.wildcardQuery;
@@ -44,7 +55,24 @@ public Boolean caseInsensitive() {
 
     @Override
     protected QueryBuilder asBuilder() {
-        WildcardQueryBuilder wb = wildcardQuery(field, query);
+        WildcardQueryBuilder wb = new WildcardQueryBuilder(field, query) {
+            @Override
+            protected QueryBuilder maybeRewriteBasedOnConstantFields(@Nullable MappedFieldType fieldType, QueryRewriteContext context) {
+                if (fieldType instanceof IndexFieldMapper.IndexFieldType) {
+                    String value = value();
+                    String indexName = context.getFullyQualifiedIndex().getName();
+                    if (WildcardQuery.this.caseInsensitive) {
+                        value = value.toLowerCase(Locale.ROOT);
+                        indexName = indexName.toLowerCase(Locale.ROOT);
+                    }
+                    if (Regex.simpleMatch(value, indexName)) {
+                        return new MatchAllQueryBuilder();
+                    }
+                    return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+                }
+                return super.maybeRewriteBasedOnConstantFields(fieldType, context);
+            }
+        };
         // ES does not allow case_insensitive to be set to "false", it should be either "true" or not specified
         return caseInsensitive == false ? wb : wb.caseInsensitive(caseInsensitive);
     }