You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2024/09/09 14:02:12 UTC
(lucene) branch branch_9x updated: Propagate keepScores to reduced FacetsCollector (#13744)
This is an automated email from the ASF dual-hosted git repository.
javanna pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new ce23e15eb54 Propagate keepScores to reduced FacetsCollector (#13744)
ce23e15eb54 is described below
commit ce23e15eb546e99be067e329936acf51647222ab
Author: Luca Cavanna <ja...@apache.org>
AuthorDate: Mon Sep 9 16:00:02 2024 +0200
Propagate keepScores to reduced FacetsCollector (#13744)
We recently introduced support for keepScores to FacetsCollectorManager.
The returned reduced FacetsCollector instance though does not reflect that in
that its inner keepScores flag is always false. This commit fixes that.
---
.../src/java/org/apache/lucene/facet/FacetsCollectorManager.java | 6 ++++--
.../apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollectorManager.java b/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollectorManager.java
index 17cee50502c..c52b4e043de 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollectorManager.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollectorManager.java
@@ -67,12 +67,14 @@ public class FacetsCollectorManager implements CollectorManager<FacetsCollector,
if (collectors.size() == 1) {
return collectors.iterator().next();
}
- return new ReducedFacetsCollector(collectors);
+ assert collectors.stream().allMatch(fc -> fc.getKeepScores() == keepScores);
+ return new ReducedFacetsCollector(collectors, keepScores);
}
private static class ReducedFacetsCollector extends FacetsCollector {
- public ReducedFacetsCollector(final Collection<FacetsCollector> facetsCollectors) {
+ ReducedFacetsCollector(final Collection<FacetsCollector> facetsCollectors, boolean keepScores) {
+ super(keepScores);
final List<MatchingDocs> matchingDocs = this.getMatchingDocs();
facetsCollectors.forEach(
facetsCollector -> matchingDocs.addAll(facetsCollector.getMatchingDocs()));
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java
index 9b08e3dcf91..22b3d166d5a 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java
@@ -331,6 +331,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
FacetsCollectorManager.search(newSearcher(r), csq, 10, new FacetsCollectorManager(true));
TopDocs td = facetsResult.topDocs();
FacetsCollector fc = facetsResult.facetsCollector();
+ assertTrue(fc.getKeepScores());
// Test SUM:
Facets facets =
@@ -443,6 +444,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
FacetsCollector fc =
FacetsCollectorManager.search(newSearcher(r), q, 10, new FacetsCollectorManager(true))
.facetsCollector();
+ assertTrue(fc.getKeepScores());
// Test SUM:
Facets facets =
@@ -595,6 +597,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
FacetsCollectorManager.search(
newSearcher(r), new MatchAllDocsQuery(), 10, new FacetsCollectorManager(true))
.facetsCollector();
+ assertTrue(fc.getKeepScores());
Facets facets1 = getTaxonomyFacetCounts(taxoReader, config, fc);
Facets facets2;