Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-06 08:19:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate keepScores to reduced FacetsCollector (#13744)

Browse Source 
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.
This commit is contained in:
Luca Cavanna 2024-09-09 16:00:02 +02:00 committed by GitHub
parent 22bbc603b4
commit a89bfa57ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lucene/facet/src/java/org/apache/lucene/facet/FacetsCollectorManager.java
View File

@ -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()));

3
lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetValueSource.java
View File

@ -315,6 +315,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 =
@ -411,6 +412,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 =
@ -547,6 +549,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 =