Only match _tier on the coordinator if _tier specified in term query

andreidan · Oct 16, 2024 · 997b4ef · 997b4ef
1 parent efba43c
commit 997b4ef
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
@@ -223,7 +223,10 @@ protected final int doHashCode() {
 
     @Override
     protected QueryBuilder doCoordinatorRewrite(CoordinatorRewriteContext coordinatorRewriteContext) {
-        final MappedFieldType fieldType = coordinatorRewriteContext.getFieldType(CONTENT_TYPE);
+        if (fieldName.equals(DataTierFieldMapper.NAME) == false) {
+            return this;
+        }
+        final MappedFieldType fieldType = coordinatorRewriteContext.getFieldType(DataTierFieldMapper.NAME);
         if (fieldType instanceof final DataTierFieldMapper.DataTierFieldType tierFieldType) {
             Query tierFieldQuery = tierFieldType.innerTermsQuery(value, coordinatorRewriteContext);
             if (tierFieldQuery instanceof MatchNoDocsQuery) {