HSEARCH-5010 Use a custom priority queue in text facet counts

Author: marko-bekhta

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/facet/impl/TextMultiValueFacetCounts.java

@@ -29,6 +29,7 @@
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LongValues;
+import org.apache.lucene.util.PriorityQueue;
 
 /**
  * Copied with some changes from {@code org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetCounts}
@@ -84,33 +85,33 @@ private FacetResult getTopChildrenSortByCount(int topN) throws IOException {
 			topN = ordCount;
 		}
 
-		TopOrdAndIntQueue q = null;
+		HibernateSearchTopOrdAndIntQueue q = null;
 
 		int bottomCount = 0;
 
 		int totCount = 0;
 		int childCount = 0;
 
-		TopOrdAndIntQueue.OrdAndValue reuse = null;
+		TopOrdAndIntQueue.OrdAndInt reuse = null;
 
 		for ( int ord = 0; ord < ordCount; ord++ ) {
 			if ( counts[ord] > 0 ) {
 				totCount += counts[ord];
 				childCount++;
 				if ( counts[ord] > bottomCount ) {
 					if ( reuse == null ) {
-						reuse = new TopOrdAndIntQueue.OrdAndValue();
+						reuse = new TopOrdAndIntQueue.OrdAndInt();
 					}
 					reuse.ord = ord;
 					reuse.value = counts[ord];
 					if ( q == null ) {
 						// Lazy init, so we don't create this for the
 						// sparse case unnecessarily
-						q = new TopOrdAndIntQueue( topN );
+						q = new HibernateSearchTopOrdAndIntQueue( topN );
 					}
 					reuse = q.insertWithOverflow( reuse );
 					if ( q.size() == topN ) {
-						bottomCount = q.top().value;
+						bottomCount = ( q.top() ).value;
 					}
 				}
 			}
@@ -122,7 +123,7 @@ private FacetResult getTopChildrenSortByCount(int topN) throws IOException {
 
 		LabelAndValue[] labelValues = new LabelAndValue[q.size()];
 		for ( int i = labelValues.length - 1; i >= 0; i-- ) {
-			TopOrdAndIntQueue.OrdAndValue ordAndValue = q.pop();
+			TopOrdAndIntQueue.OrdAndInt ordAndValue = q.pop();
 			final BytesRef term = dv.lookupOrd( ordAndValue.ord );
 			labelValues[i] = new LabelAndValue( term.utf8ToString(), ordAndValue.value );
 		}
@@ -255,4 +256,20 @@ public List<FacetResult> getAllDims(int topN) throws IOException {
 		return Collections.singletonList( getTopChildren( topN, field ) );
 	}
 
+	/**
+	 * While there is a `TopOrdAndIntQueue` in Lucene, unfortunately it works with OrdAndValue objects (in API). 
+	 * And there's no access to the value, leading to casting any type value has to be accessed. Hence, this impl: 
+	 */
+	private static class HibernateSearchTopOrdAndIntQueue extends PriorityQueue<TopOrdAndIntQueue.OrdAndInt> {
+
+		public HibernateSearchTopOrdAndIntQueue(int maxSize) {
+			super( maxSize );
+		}
+
+		@Override
+		protected boolean lessThan(TopOrdAndIntQueue.OrdAndInt a, TopOrdAndIntQueue.OrdAndInt b) {
+			return a.lessThan( b );
+		}
+	}
+
 }

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneCommonMinimumShouldMatchConstraints.java

@@ -73,7 +73,7 @@ public Query apply(Query query) {
 		}
 		if ( query instanceof BooleanQuery ) {
 			BooleanQuery booleanQuery = (BooleanQuery) query;
-			int shouldClauses = (int) booleanQuery.clauses().stream().map( BooleanClause::getOccur )
+			int shouldClauses = (int) booleanQuery.clauses().stream().map( BooleanClause::occur )
 					.filter( BooleanClause.Occur.SHOULD::equals )
 					.count();
 			int minimumShouldMatch = minimumShouldMatch( shouldClauses );

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneCommonQueryStringPredicate.java

@@ -158,7 +158,7 @@ public void minimumShouldMatchPercent(int ignoreConstraintCeiling, int matchingC
 		protected Query addMatchAllForBoolMustNotOnly(Query query) {
 			if ( query instanceof BooleanQuery ) {
 				BooleanQuery booleanQuery = (BooleanQuery) query;
-				long notMustNot = booleanQuery.clauses().stream().map( BooleanClause::getOccur )
+				long notMustNot = booleanQuery.clauses().stream().map( BooleanClause::occur )
 						.filter( Predicate.not( BooleanClause.Occur.MUST_NOT::equals ) )
 						.count();
 

v5migrationhelper/engine/src/main/java/org/hibernate/search/query/dsl/impl/BooleanQueryBuilder.java

@@ -59,11 +59,11 @@ private void replaceLastMustWith(Occur replacementOccur) {
 		if ( lastClause == null ) {
 			return;
 		}
-		if ( !lastClause.getOccur().equals( Occur.MUST ) ) {
-			throw new AssertionFailure( "Cannot negate or disable scoring on class: " + lastClause.getOccur() );
+		if ( !lastClause.occur().equals( Occur.MUST ) ) {
+			throw new AssertionFailure( "Cannot negate or disable scoring on class: " + lastClause.occur() );
 		}
 		final int lastIndex = clauses.size() - 1;
-		clauses.set( lastIndex, new BooleanClause( lastClause.getQuery(), replacementOccur ) );
+		clauses.set( lastIndex, new BooleanClause( lastClause.query(), replacementOccur ) );
 	}
 
 	@Override
@@ -123,8 +123,8 @@ private SearchPredicate createPredicate() {
 		BooleanPredicateClausesStep<?> step = factory.bool();
 		for ( BooleanClause clause : clauses ) {
 			SearchPredicate predicate = factory.extension( LuceneExtension.get() )
-					.fromLuceneQuery( clause.getQuery() ).toPredicate();
-			switch ( clause.getOccur() ) {
+					.fromLuceneQuery( clause.query() ).toPredicate();
+			switch ( clause.occur() ) {
 				case MUST:
 					step = step.must( predicate );
 					break;