Rewrite more queries to match_none when they target an unmapped field

javanna · javanna · commit 14042d050df0 · 2025-08-18T09:38:28.000+02:00
Closes #97129
diff --git a/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java
@@ -460,6 +460,15 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws
             });
             return newShapeQueryBuilder(this.fieldName, supplier::get, this.indexedShapeId).relation(relation);
         }
+        return super.doRewrite(queryRewriteContext);
+    }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
         return this;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentBuilder;
 
@@ -161,4 +162,17 @@ protected int doHashCode() {
     protected boolean doEquals(QB other) {
         return Objects.equals(fieldName, other.fieldName) && Objects.equals(value, other.value);
     }
+
+    @Override
+    protected final QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(this.fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query is against a field that does not exist");
+        }
+        return doIndexMetadataRewrite(context, fieldType);
+    }
+
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context, MappedFieldType fieldType) throws IOException {
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
@@ -253,15 +253,12 @@ public String getWriteableName() {
     }
 
     @Override
-    protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws IOException {
-        SearchExecutionContext context = queryRewriteContext.convertToSearchExecutionContext();
-        if (context != null) {
-            MappedFieldType fieldType = context.getFieldType(fieldName);
-            if (fieldType == null) {
-                return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
-            }
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
         }
-        return super.doRewrite(context);
+        return this;
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
@@ -384,4 +384,13 @@ public String getWriteableName() {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.ZERO;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
@@ -387,4 +387,13 @@ public String getWriteableName() {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.ZERO;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
@@ -321,4 +321,13 @@ public String getWriteableName() {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.ZERO;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.search.MatchQueryParser;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -288,4 +289,13 @@ public static MatchPhrasePrefixQueryBuilder fromXContent(XContentParser parser)
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.ZERO;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java
@@ -165,6 +165,10 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
     @Override
     protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query is against a field that does not exist");
+        }
         // If we're using the default keyword analyzer then we can rewrite this to a TermQueryBuilder
         // and possibly shortcut
         // If we're using a keyword analyzer then we can rewrite this to a TermQueryBuilder
diff --git a/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
@@ -366,6 +366,10 @@ public void doXContent(XContentBuilder builder, Params params) throws IOExceptio
 
     @Override
     protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query is against a field that does not exist");
+        }
         if (fuzziness != null || lenient) {
             // Term queries can be neither fuzzy nor lenient, so don't rewrite under these conditions
             return this;
diff --git a/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
@@ -481,6 +481,15 @@ protected MappedFieldType.Relation getRelation(final SearchExecutionContext sear
         );
     }
 
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
+
     @Override
     protected QueryBuilder doCoordinatorRewrite(final CoordinatorRewriteContext coordinatorRewriteContext) {
         return toQueryBuilder(getRelation(coordinatorRewriteContext));
diff --git a/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java
@@ -323,4 +323,13 @@ protected boolean doEquals(RegexpQueryBuilder other) {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.ZERO;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
@@ -167,11 +167,7 @@ protected void addExtraXContent(XContentBuilder builder, Params params) throws I
     }
 
     @Override
-    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) {
-        MappedFieldType fieldType = context.getFieldType(this.fieldName);
-        if (fieldType == null) {
-            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query is against a field that does not exist");
-        }
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context, MappedFieldType fieldType) throws IOException {
         return maybeRewriteBasedOnConstantFields(fieldType, context);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java
@@ -266,6 +266,15 @@ public static TermsSetQueryBuilder fromXContent(XContentParser parser) throws IO
         return queryBuilder;
     }
 
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
+
     @Override
     protected Query doToQuery(SearchExecutionContext context) {
         if (values.isEmpty()) {
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/query/GeoGridQueryBuilder.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/query/GeoGridQueryBuilder.java
@@ -27,6 +27,9 @@
 import org.elasticsearch.index.mapper.GeoShapeQueryable;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.AbstractQueryBuilder;
+import org.elasticsearch.index.query.MatchNoneQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.QueryShardException;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
@@ -402,4 +405,13 @@ public String getWriteableName() {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersions.V_8_3_0;
     }
+
+    @Override
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) {
+        MappedFieldType fieldType = context.getFieldType(fieldName);
+        if (fieldType == null) {
+            return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
+        }
+        return this;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -253,15 +253,12 @@ public String getWriteableName() {`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`@Override`
`256`		`- protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws IOException {`
`257`		`- SearchExecutionContext context = queryRewriteContext.convertToSearchExecutionContext();`
`258`		`- if (context != null) {`
`259`		`- MappedFieldType fieldType = context.getFieldType(fieldName);`
`260`		`- if (fieldType == null) {`
`261`		`- return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");`
`262`		`- }`
	`256`	`+ protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {`
	`257`	`+ MappedFieldType fieldType = context.getFieldType(fieldName);`
	`258`	`+ if (fieldType == null) {`
	`259`	`+ return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");`
`263`	`260`	`}`
`264`		`- return super.doRewrite(context);`
	`261`	`+ return this;`
`265`	`262`	`}`
`266`	`263`
`267`	`264`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -384,4 +384,13 @@ public String getWriteableName() {`
`384`	`384`	`public TransportVersion getMinimalSupportedVersion() {`
`385`	`385`	`return TransportVersions.ZERO;`
`386`	`386`	`}`
	`387`	`+`
	`388`	`+ @Override`
	`389`	`+ protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {`
	`390`	`+ MappedFieldType fieldType = context.getFieldType(fieldName);`
	`391`	`+ if (fieldType == null) {`
	`392`	`+ return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");`
	`393`	`+ }`
	`394`	`+ return this;`
	`395`	`+ }`
`387`	`396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,4 +387,13 @@ public String getWriteableName() {`
`387`	`387`	`public TransportVersion getMinimalSupportedVersion() {`
`388`	`388`	`return TransportVersions.ZERO;`
`389`	`389`	`}`
	`390`	`+`
	`391`	`+ @Override`
	`392`	`+ protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {`
	`393`	`+ MappedFieldType fieldType = context.getFieldType(fieldName);`
	`394`	`+ if (fieldType == null) {`
	`395`	`+ return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");`
	`396`	`+ }`
	`397`	`+ return this;`
	`398`	`+ }`
`390`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,4 +321,13 @@ public String getWriteableName() {`
`321`	`321`	`public TransportVersion getMinimalSupportedVersion() {`
`322`	`322`	`return TransportVersions.ZERO;`
`323`	`323`	`}`
	`324`	`+`
	`325`	`+ @Override`
	`326`	`+ protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {`
	`327`	`+ MappedFieldType fieldType = context.getFieldType(fieldName);`
	`328`	`+ if (fieldType == null) {`
	`329`	`+ return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");`
	`330`	`+ }`
	`331`	`+ return this;`
	`332`	`+ }`
`324`	`333`	`}`