HSEARCH-3193 Support exists targeting objects with ES

hibernate · Nov 13, 2019 · 7ee2589 · 7ee2589
1 parent c2f7340
commit 7ee2589
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.../org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeModel.java b/.../org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeModel.java
@@ -129,6 +129,18 @@ public <T> ElasticsearchScopedIndexFieldComponent<T> getSchemaNodeComponent(Stri
 		return scopedIndexFieldComponent;
 	}
 
+	public boolean hasSchemaObjectNodeComponent(String absoluteFieldPath) {
+		for ( ElasticsearchIndexModel indexModel : indexModels ) {
+			ElasticsearchIndexSchemaObjectNode objectNode = indexModel.getObjectNode( absoluteFieldPath );
+			// TODO HSEARCH-2389 check multi-indexes model incompatibility
+			if ( objectNode != null ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	public void checkNestedField(String absoluteFieldPath) {
 		boolean found = false;
 

diff --git a/...d/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateBuilderFactoryImpl.java b/...d/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateBuilderFactoryImpl.java
@@ -127,9 +127,11 @@ public SimpleQueryStringPredicateBuilder<ElasticsearchSearchPredicateBuilder> si
 
 	@Override
 	public ExistsPredicateBuilder<ElasticsearchSearchPredicateBuilder> exists(String absoluteFieldPath) {
-		// Make sure to fail for fields with different type or for unknown fields
-		// We may be able to relax this constraint, but that would require more extensive testing
-		scopeModel.getSchemaNodeComponent( absoluteFieldPath, PREDICATE_BUILDER_FACTORY_RETRIEVAL_STRATEGY );
+		if ( !scopeModel.hasSchemaObjectNodeComponent( absoluteFieldPath ) ) {
+			// Make sure to fail for fields with different type or for unknown fields
+			// 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 );
 	}
 

diff --git a/...ava/org/hibernate/search/integrationtest/backend/elasticsearch/tmp/ExistsPredicateIT.java b/...ava/org/hibernate/search/integrationtest/backend/elasticsearch/tmp/ExistsPredicateIT.java
@@ -99,7 +99,7 @@ public void numeric() {
 		assertThat( docs ).hasDocRefHitsAnyOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
 	}
 
-	// TODO HSEARCH-2389 allows @Test
+	@Test
 	public void nested() {
 		StubMappingScope scope = indexManager.createScope();
 
@@ -111,7 +111,7 @@ public void nested() {
 		assertThat( docs ).hasDocRefHitsAnyOrder( INDEX_NAME, DOCUMENT_3 );
 	}
 
-	// TODO HSEARCH-2389 allows @Test
+	@Test
 	public void flattened() {
 		StubMappingScope scope = indexManager.createScope();