HSEARCH-3666 "Enable" "non-default" sorts in Lucene's terms aggregation tests

Author: marko-bekhta

documentation/src/main/asciidoc/public/reference/_search-dsl-aggregation.adoc

@@ -174,14 +174,6 @@ i.e. the terms with the most matching documents appear first.
 
 Several other orders are available.
 
-[WARNING]
-====
-With the Lucene backend, due to limitations of the current implementation,
-using any order other than the default one (by descending count)
-may lead to incorrect results.
-See https://hibernate.atlassian.net/browse/HSEARCH-3666[HSEARCH-3666] for more information.
-====
-
 You can order entries by ascending term value:
 
 // Search 5 anchors backward compatibility

integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/testsupport/util/LuceneTckBackendFeatures.java

@@ -46,12 +46,6 @@
 
 class LuceneTckBackendFeatures extends TckBackendFeatures {
 
-	@Override
-	public boolean nonDefaultOrderInTermsAggregations() {
-		// TODO HSEARCH-3666 Lucene terms aggregations (discrete facets) may return wrong results for any sort other than the default one
-		return false;
-	}
-
 	@Override
 	public boolean projectionPreservesNulls() {
 		return false;

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/TermsAggregationSpecificsIT.java

@@ -33,7 +33,6 @@
 import org.hibernate.search.integrationtest.backend.tck.testsupport.types.FieldTypeDescriptor;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.types.StandardFieldTypeDescriptor;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.SimpleFieldModelsByType;
-import org.hibernate.search.integrationtest.backend.tck.testsupport.util.TckConfiguration;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.ValueWrapper;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.extension.SearchSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.BulkIndexer;
@@ -230,8 +229,6 @@ void orderByCountDescending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> data
 	@MethodSource("params")
 	@PortedFromSearch5(original = "org.hibernate.search.test.query.facet.SimpleFacetingTest.testCountSortOrderAsc")
 	void orderByCountAscending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -258,8 +255,6 @@ void orderByCountAscending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataS
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("params")
 	void orderByTermDescending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -287,8 +282,6 @@ void orderByTermDescending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataS
 	@MethodSource("params")
 	@PortedFromSearch5(original = "org.hibernate.search.test.query.facet.SimpleFacetingTest.testAlphabeticalSortOrder")
 	void orderByTermAscending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -412,8 +405,6 @@ void minDocumentCount_zero_noMatch(FieldTypeDescriptor<F, ?> fieldType, DataSet<
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("params")
 	void minDocumentCount_zero_noMatch_orderByTermDescending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -491,8 +482,6 @@ void maxTermCount_positive(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataS
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("params")
 	void maxTermCount_positive_orderByTermAscending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -521,8 +510,6 @@ void maxTermCount_positive_orderByTermAscending(FieldTypeDescriptor<F, ?> fieldT
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("params")
 	void maxTermCount_positive_orderByCountAscending(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
-		assumeNonDefaultOrdersSupported();
-
 		String fieldPath = index.binding().fieldModels.get( fieldType ).relativeFieldName;
 
 		AggregationKey<Map<F, Long>> aggregationKey = AggregationKey.of( AGGREGATION_NAME );
@@ -710,13 +697,6 @@ void terms_max(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
 		return index.createScope().query().where( f -> f.matchAll() );
 	}
 
-	private void assumeNonDefaultOrdersSupported() {
-		assumeTrue(
-				TckConfiguration.get().getBackendFeatures().nonDefaultOrderInTermsAggregations(),
-				"Non-default orders are not supported for terms aggregations with this backend"
-		);
-	}
-
 	@SuppressWarnings("unchecked")
 	private <K, V> Consumer<Map<F, V>> containsExactly(Consumer<BiConsumer<F, V>> expectationBuilder,
 			FieldTypeDescriptor<F, ?> fieldType) {

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/util/TckBackendFeatures.java

@@ -32,10 +32,6 @@ public boolean nonCanonicalRangeInAggregations() {
 		return true;
 	}
 
-	public boolean nonDefaultOrderInTermsAggregations() {
-		return true;
-	}
-
 	public boolean projectionPreservesNulls() {
 		return true;
 	}