HSEARCH-4619 Don't match anything in a boolean predicate without any …

…clause
hibernate · Jun 27, 2022 · 3e3c147 · 3e3c147
1 parent d6c8d23
commit 3e3c147
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...ate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchBooleanPredicate.java b/...ate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchBooleanPredicate.java
@@ -210,6 +210,11 @@ private void addMinimumShouldMatchConstraint(int ignoreConstraintCeiling,
 
 		@Override
 		public SearchPredicate build() {
+			if ( mustClauses == null && shouldClauses == null && mustNotClauses == null && filterClauses == null ) {
+				// HSEARCH-4619: a boolean predicate without any clause must not match anything.
+				return new ElasticsearchMatchNonePredicate( this );
+			}
+
 			// Forcing to Lucene's defaults. See HSEARCH-3534
 			if ( minimumShouldMatchConstraints == null && hasAtLeastOneMustOrFilterPredicate() ) {
 				minimumShouldMatchNumber( 0, 0 );

diff --git a/...e/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchNonePredicate.java b/...e/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchNonePredicate.java
@@ -20,7 +20,7 @@ class ElasticsearchMatchNonePredicate extends AbstractElasticsearchPredicate {
 	private static final JsonObjectAccessor MATCH_NONE_ACCESSOR = JsonAccessor.root().property( "match_none" )
 			.asObject();
 
-	private ElasticsearchMatchNonePredicate(Builder builder) {
+	ElasticsearchMatchNonePredicate(AbstractBuilder builder) {
 		super( builder );
 	}