trim things

andreidan · Oct 17, 2024 · c3bc4db · c3bc4db
1 parent 3c70b1f
commit c3bc4db
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 39 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ConstantFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/ConstantFieldType.java
@@ -18,7 +18,6 @@
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.core.Nullable;
-import org.elasticsearch.index.query.CoordinatorRewriteContext;
 import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.SearchExecutionContext;
 
@@ -99,15 +98,6 @@ public final Query innerTermsQuery(Collection<?> values, QueryRewriteContext con
         return new MatchNoDocsQuery();
     }
 
-    public final Query innerTermsQuery(Object value, CoordinatorRewriteContext context) {
-        String pattern = valueToString(value);
-        if (matches(pattern, false, context)) {
-            // `terms` queries are a disjunction, so one matching term is enough
-            return Queries.newMatchAllQuery();
-        }
-        return new MatchNoDocsQuery();
-    }
-
     @Override
     public final Query prefixQuery(
         String prefix,

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DataTierFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DataTierFieldMapper.java
@@ -89,7 +89,7 @@ public ValueFetcher valueFetcher(SearchExecutionContext context, String format)
         static String getTierPreference(QueryRewriteContext context) {
             if (context instanceof CoordinatorRewriteContext) {
                 String tier = ((CoordinatorRewriteContext) context).tier();
-                // dominant branch first (tier preference is configured) first
+                // dominant branch first (tier preference is configured)
                 return tier.isEmpty() == false ? tier : null;
             }
             Settings settings = context.getIndexSettings().getSettings();

diff --git a/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
@@ -226,7 +226,7 @@ protected QueryBuilder doCoordinatorRewrite(CoordinatorRewriteContext coordinato
         }
         final MappedFieldType fieldType = coordinatorRewriteContext.getFieldType(DataTierFieldMapper.NAME);
         if (fieldType instanceof final DataTierFieldMapper.DataTierFieldType tierFieldType) {
-            Query tierFieldQuery = tierFieldType.innerTermsQuery(value, coordinatorRewriteContext);
+            Query tierFieldQuery = tierFieldType.internalTermQueryCaseInsensitive(value, coordinatorRewriteContext);
             if (tierFieldQuery instanceof MatchNoDocsQuery) {
                 return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
             } else if (tierFieldQuery instanceof MatchAllDocsQuery) {

diff --git a/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
@@ -356,9 +356,11 @@ protected QueryBuilder doCoordinatorRewrite(CoordinatorRewriteContext coordinato
         final MappedFieldType fieldType = coordinatorRewriteContext.getFieldType(DataTierFieldMapper.NAME);
         if (fieldType instanceof final DataTierFieldMapper.DataTierFieldType tierFieldType) {
             for (Object value : values) {
-                Query tierFieldQuery = tierFieldType.innerTermsQuery(value, coordinatorRewriteContext);
+                Query tierFieldQuery = tierFieldType.internalTermQueryCaseInsensitive(value, coordinatorRewriteContext);
                 if (tierFieldQuery instanceof MatchNoDocsQuery) {
                     return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+                } else if (tierFieldQuery instanceof MatchAllDocsQuery) {
+                    return new MatchAllQueryBuilder();
                 }
             }
         }

diff --git a/...csearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java b/...csearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java
@@ -971,32 +971,6 @@ public void testSearchableSnapshotShardsThatHaveMatchingDataAreNotSkippedOnTheCo
         }
     }
 
-    private void createIndexWithTimestampAndEventIngested(String indexName, int numShards, Settings extraSettings) throws IOException {
-        assertAcked(
-            indicesAdmin().prepareCreate(indexName)
-                .setMapping(
-                    XContentFactory.jsonBuilder()
-                        .startObject()
-                        .startObject("properties")
-
-                        .startObject(DataStream.TIMESTAMP_FIELD_NAME)
-                        .field("type", randomFrom("date", "date_nanos"))
-                        .field("format", "strict_date_optional_time_nanos")
-                        .endObject()
-
-                        .startObject(IndexMetadata.EVENT_INGESTED_FIELD_NAME)
-                        .field("type", randomFrom("date", "date_nanos"))
-                        .field("format", "strict_date_optional_time_nanos")
-                        .endObject()
-
-                        .endObject()
-                        .endObject()
-                )
-                .setSettings(indexSettingsNoReplicas(numShards).put(INDEX_SOFT_DELETES_SETTING.getKey(), true).put(extraSettings))
-        );
-        ensureGreen(indexName);
-    }
-
     public void testCanMatchSkipsPartiallyMountedIndicesWhenFrozenNodesUnavailable() throws Exception {
         internalCluster().startMasterOnlyNode();
         internalCluster().startCoordinatingOnlyNode(Settings.EMPTY);
@@ -1100,6 +1074,32 @@ public void testCanMatchSkipsPartiallyMountedIndicesWhenFrozenNodesUnavailable()
         }
     }
 
+    private void createIndexWithTimestampAndEventIngested(String indexName, int numShards, Settings extraSettings) throws IOException {
+        assertAcked(
+            indicesAdmin().prepareCreate(indexName)
+                .setMapping(
+                    XContentFactory.jsonBuilder()
+                        .startObject()
+                        .startObject("properties")
+
+                        .startObject(DataStream.TIMESTAMP_FIELD_NAME)
+                        .field("type", randomFrom("date", "date_nanos"))
+                        .field("format", "strict_date_optional_time_nanos")
+                        .endObject()
+
+                        .startObject(IndexMetadata.EVENT_INGESTED_FIELD_NAME)
+                        .field("type", randomFrom("date", "date_nanos"))
+                        .field("format", "strict_date_optional_time_nanos")
+                        .endObject()
+
+                        .endObject()
+                        .endObject()
+                )
+                .setSettings(indexSettingsNoReplicas(numShards).put(INDEX_SOFT_DELETES_SETTING.getKey(), true).put(extraSettings))
+        );
+        ensureGreen(indexName);
+    }
+
     private void createIndexWithOnlyOneTimestampField(String timestampField, String index, int numShards, Settings extraSettings)
         throws IOException {
         assertAcked(