HSEARCH-4173 Assume no value in spatial predicates if the target fiel…

…d doesn't exist in one of the targeted indexes Signed-off-by: Yoann Rodière <yoann@hibernate.org>
hibernate · Mar 2, 2021 · 7549bd6 · 7549bd6
1 parent a6c63ca
commit 7549bd6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/...icsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinBoundingBoxPredicate.java b/...icsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinBoundingBoxPredicate.java
@@ -24,7 +24,10 @@
 
 public class ElasticsearchGeoPointSpatialWithinBoundingBoxPredicate extends AbstractElasticsearchSingleFieldPredicate {
 
-	private static final JsonObjectAccessor GEO_BOUNDING_BOX_ACCESSOR = JsonAccessor.root().property( "geo_bounding_box" ).asObject();
+	private static final JsonObjectAccessor GEO_BOUNDING_BOX_ACCESSOR =
+			JsonAccessor.root().property( "geo_bounding_box" ).asObject();
+	private static final JsonAccessor<Boolean> IGNORE_UNMAPPED_ACCESSOR =
+			JsonAccessor.root().property( "ignore_unmapped" ).asBoolean();
 
 	private static final String TOP_LEFT_PROPERTY_NAME = "top_left";
 	private static final String BOTTOM_RIGHT_PROPERTY_NAME = "bottom_right";
@@ -47,6 +50,12 @@ protected JsonObject doToJsonQuery(PredicateRequestContext context, JsonObject o
 
 		innerObject.add( absoluteFieldPath, boundingBoxObject );
 
+		if ( indexNames().size() > 1 ) {
+			// There are multiple target indexes; some of them may not declare the field.
+			// Instruct ES to behave as if the field had no value in that case.
+			IGNORE_UNMAPPED_ACCESSOR.set( innerObject, true );
+		}
+
 		GEO_BOUNDING_BOX_ACCESSOR.set( outerObject, innerObject );
 		return outerObject;
 	}

diff --git a/...elasticsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinCirclePredicate.java b/...elasticsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinCirclePredicate.java
@@ -24,9 +24,12 @@
 
 public class ElasticsearchGeoPointSpatialWithinCirclePredicate extends AbstractElasticsearchSingleFieldPredicate {
 
-	private static final JsonObjectAccessor GEO_DISTANCE_ACCESSOR = JsonAccessor.root().property( "geo_distance" ).asObject();
-
-	private static final JsonAccessor<Double> DISTANCE_ACCESSOR = JsonAccessor.root().property( "distance" ).asDouble();
+	private static final JsonObjectAccessor GEO_DISTANCE_ACCESSOR =
+			JsonAccessor.root().property( "geo_distance" ).asObject();
+	private static final JsonAccessor<Double> DISTANCE_ACCESSOR =
+			JsonAccessor.root().property( "distance" ).asDouble();
+	private static final JsonAccessor<Boolean> IGNORE_UNMAPPED_ACCESSOR =
+			JsonAccessor.root().property( "ignore_unmapped" ).asBoolean();
 
 	private final double distanceInMeters;
 	private final JsonElement center;
@@ -43,6 +46,12 @@ protected JsonObject doToJsonQuery(PredicateRequestContext context, JsonObject o
 		DISTANCE_ACCESSOR.set( innerObject, distanceInMeters );
 		innerObject.add( absoluteFieldPath, center );
 
+		if ( indexNames().size() > 1 ) {
+			// There are multiple target indexes; some of them may not declare the field.
+			// Instruct ES to behave as if the field had no value in that case.
+			IGNORE_UNMAPPED_ACCESSOR.set( innerObject, true );
+		}
+
 		GEO_DISTANCE_ACCESSOR.set( outerObject, innerObject );
 		return outerObject;
 	}

diff --git a/...lasticsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinPolygonPredicate.java b/...lasticsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinPolygonPredicate.java
@@ -25,7 +25,10 @@
 
 public class ElasticsearchGeoPointSpatialWithinPolygonPredicate extends AbstractElasticsearchSingleFieldPredicate {
 
-	private static final JsonObjectAccessor GEO_POLYGON_ACCESSOR = JsonAccessor.root().property( "geo_polygon" ).asObject();
+	private static final JsonObjectAccessor GEO_POLYGON_ACCESSOR =
+			JsonAccessor.root().property( "geo_polygon" ).asObject();
+	private static final JsonAccessor<Boolean> IGNORE_UNMAPPED_ACCESSOR =
+			JsonAccessor.root().property( "ignore_unmapped" ).asBoolean();
 
 	private static final String POINTS_PROPERTY_NAME = "points";
 
@@ -50,6 +53,13 @@ protected JsonObject doToJsonQuery(PredicateRequestContext context, JsonObject o
 		pointsObject.add( POINTS_PROPERTY_NAME, pointsArray );
 
 		innerObject.add( absoluteFieldPath, pointsObject );
+
+		if ( indexNames().size() > 1 ) {
+			// There are multiple target indexes; some of them may not declare the field.
+			// Instruct ES to behave as if the field had no value in that case.
+			IGNORE_UNMAPPED_ACCESSOR.set( innerObject, true );
+		}
+
 		GEO_POLYGON_ACCESSOR.set( outerObject, innerObject );
 		return outerObject;
 	}