HSEARCH-3752 Support implicit nested exist (field) predicates in ES

hibernate · Mar 18, 2020 · 1bedbad · 1bedbad
1 parent 410a7c5
commit 1bedbad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/...arch/backend/elasticsearch/search/predicate/impl/ElasticsearchExistsPredicateBuilder.java b/...arch/backend/elasticsearch/search/predicate/impl/ElasticsearchExistsPredicateBuilder.java
@@ -6,21 +6,24 @@
  */
 package org.hibernate.search.backend.elasticsearch.search.predicate.impl;
 
+import java.util.List;
+
 import org.hibernate.search.backend.elasticsearch.gson.impl.JsonAccessor;
 import org.hibernate.search.backend.elasticsearch.gson.impl.JsonObjectAccessor;
 import org.hibernate.search.engine.search.predicate.spi.ExistsPredicateBuilder;
 
 import com.google.gson.JsonObject;
 
-public class ElasticsearchExistsPredicateBuilder extends AbstractElasticsearchSearchPredicateBuilder
+public class ElasticsearchExistsPredicateBuilder extends AbstractElasticsearchSearchNestedPredicateBuilder
 		implements ExistsPredicateBuilder<ElasticsearchSearchPredicateBuilder> {
 
 	private static final JsonObjectAccessor EXISTS_ACCESSOR = JsonAccessor.root().property( "exists" ).asObject();
 	private static final JsonAccessor<String> FIELD_ACCESSOR = JsonAccessor.root().property( "field" ).asString();
 
 	private final String absoluteFieldPath;
 
-	ElasticsearchExistsPredicateBuilder(String absoluteFieldPath) {
+	ElasticsearchExistsPredicateBuilder(String absoluteFieldPath, List<String> nestedPathHierarchy) {
+		super( nestedPathHierarchy );
 		this.absoluteFieldPath = absoluteFieldPath;
 	}
 

diff --git a/...d/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateBuilderFactoryImpl.java b/...d/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateBuilderFactoryImpl.java
@@ -143,7 +143,7 @@ public ExistsPredicateBuilder<ElasticsearchSearchPredicateBuilder> exists(String
 			// We may be able to relax this constraint, but that would require more extensive testing
 			scopeModel.getSchemaNodeComponent( absoluteFieldPath, PREDICATE_BUILDER_FACTORY_RETRIEVAL_STRATEGY );
 		}
-		return new ElasticsearchExistsPredicateBuilder( absoluteFieldPath );
+		return new ElasticsearchExistsPredicateBuilder( absoluteFieldPath, scopeModel.getNestedPathHierarchy( absoluteFieldPath ) );
 	}
 
 	@Override

diff --git a/...ate/search/integrationtest/backend/elasticsearch/tmp/ImplicitNestedSearchPredicateIT.java b/...ate/search/integrationtest/backend/elasticsearch/tmp/ImplicitNestedSearchPredicateIT.java
@@ -167,6 +167,11 @@ public void predicate_geoCircle() {
 		verify_implicit_nest( p -> p.spatial().within().field( "nested.geo" ).circle( G11, 1 ) );
 	}
 
+	@Test
+	public void predicate_exists_field() {
+		verify_implicit_nest( p -> p.exists().field( "nested.geo" ) );
+	}
+
 	@Test
 	public void predicate_simpleQueryString_multipleNestedPaths() {
 		SubTest.expectException( () -> indexManager.createScope()

diff --git a/...ibernate/search/integrationtest/backend/tck/search/predicate/ExistsSearchPredicateIT.java b/...ibernate/search/integrationtest/backend/tck/search/predicate/ExistsSearchPredicateIT.java
@@ -41,6 +41,7 @@
 import org.hibernate.search.util.impl.test.SubTest;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -224,6 +225,7 @@ public void inFlattenedObject_withDocValues() {
 	 * Querying fields of a nested object without a nested predicate should result in no result at all.
 	 */
 	@Test
+	@Ignore // TODO HSEARCH-3752 restore the test with the new assumptions
 	public void inNestedObject() {
 		StubMappingScope scope = indexManager.createScope();