You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2022/04/05 06:55:49 UTC
[lucene] branch branch_9x updated (03dd543572c -> b0ecba4fb24)
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
from 03dd543572c LUCENE-10466: Ensure IndexSortSortedNumericDocValuesRangeQuery handles sort types besides LONG
new 395126a35b9 LUCENE-10002: Replaces usages of FacetsCollector with FacetsCollectorManager (#764)
new b0ecba4fb24 LUCENE-10484: Add support for concurrent facets random sampling (#765)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/CHANGES.txt | 3 ++
.../lucene/demo/facet/DistanceFacetsExample.java | 5 +-
.../lucene/demo/facet/SimpleFacetsExample.java | 5 +-
.../facet/RandomSamplingFacetsCollector.java | 38 ++++++++++++++
.../org/apache/lucene/facet/TestFacetUtils.java | 3 +-
.../org/apache/lucene/facet/TestFacetsConfig.java | 3 +-
.../lucene/facet/TestLongValueFacetCounts.java | 23 ++++-----
.../facet/TestRandomSamplingFacetsCollector.java | 20 +++-----
.../lucene/facet/TestStringValueFacetCounts.java | 6 +--
.../lucene/facet/range/TestRangeFacetCounts.java | 60 +++++++---------------
.../sortedset/TestSortedSetDocValuesFacets.java | 9 ++--
.../taxonomy/TestSearcherTaxonomyManager.java | 9 ++--
.../taxonomy/TestTaxonomyFacetAssociations.java | 21 +++-----
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 19 +++----
.../facet/taxonomy/TestTaxonomyFacetCounts2.java | 13 ++---
.../facet/taxonomy/TestTaxonomyFacetLabels.java | 4 +-
.../taxonomy/TestTaxonomyFacetSumValueSource.java | 20 +++-----
.../TestIndexAndTaxonomyReplicationClient.java | 4 +-
18 files changed, 124 insertions(+), 141 deletions(-)
[lucene] 02/02: LUCENE-10484: Add support for concurrent facets random sampling (#765)
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit b0ecba4fb243d24d083325c7482f9725bccc57db
Author: Luca Cavanna <ja...@users.noreply.github.com>
AuthorDate: Tue Apr 5 08:51:57 2022 +0200
LUCENE-10484: Add support for concurrent facets random sampling (#765)
This commit adds a new createManager static method to RandomSamplingFacetsCollector that allows users to perform random sampling concurrently. The returned collector manager is very similar to the existing FacetsCollectorManager but it exposes a specialized reduced RandomSamplingFacetsCollector.
This relates to [LUCENE-10002](https://issues.apache.org/jira/browse/LUCENE-10002). It allows users to use a collector manager instead of a collector when doing random sampling, in the effort of reducing usages of IndexSearcher#search(Query, Collector).
---
lucene/CHANGES.txt | 3 ++
.../facet/RandomSamplingFacetsCollector.java | 38 ++++++++++++++++++++++
.../facet/TestRandomSamplingFacetsCollector.java | 20 +++++-------
3 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index a36cab8d8ef..c03c7d8937a 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -26,6 +26,9 @@ Improvements
* LUCENE-10494: Implement method to bulk add all collection elements to a PriorityQueue.
(Bauyrzhan Sakhariyev)
+* LUCENE-10484: Add support for concurrent random sampling by calling
+ RandomSamplingFacetsCollector#createManager. (Luca Cavanna)
+
Optimizations
---------------------
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java
index 92a0c3133b1..de7c0e27323 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java
@@ -18,10 +18,12 @@ package org.apache.lucene.facet;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.apache.lucene.facet.FacetsConfig.DimConfig;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.CollectorManager;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.BitDocIdSet;
@@ -255,4 +257,40 @@ public class RandomSamplingFacetsCollector extends FacetsCollector {
public double getSamplingRate() {
return samplingRate;
}
+
+ /**
+ * Creates a {@link CollectorManager} for concurrent random sampling through {@link
+ * RandomSamplingFacetsCollector}
+ */
+ public static CollectorManager<RandomSamplingFacetsCollector, RandomSamplingFacetsCollector>
+ createManager(int sampleSize, long seed) {
+ return new CollectorManager<>() {
+ @Override
+ public RandomSamplingFacetsCollector newCollector() {
+ return new RandomSamplingFacetsCollector(sampleSize, seed);
+ }
+
+ @Override
+ public RandomSamplingFacetsCollector reduce(
+ Collection<RandomSamplingFacetsCollector> collectors) {
+ if (collectors == null || collectors.size() == 0) {
+ return new RandomSamplingFacetsCollector(sampleSize, seed);
+ }
+ if (collectors.size() == 1) {
+ return collectors.iterator().next();
+ }
+ return new ReducedRandomSamplingFacetsCollector(sampleSize, seed, collectors);
+ }
+ };
+ }
+
+ private static class ReducedRandomSamplingFacetsCollector extends RandomSamplingFacetsCollector {
+ ReducedRandomSamplingFacetsCollector(
+ int sampleSize, long seed, Collection<RandomSamplingFacetsCollector> facetsCollectors) {
+ super(sampleSize, seed);
+ facetsCollectors.forEach(
+ facetsCollector ->
+ getOriginalMatchingDocs().addAll(facetsCollector.getOriginalMatchingDocs()));
+ }
+ }
}
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java
index 26d80fc784f..df51e0afc38 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java
@@ -27,9 +27,9 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.CollectorManager;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MultiCollector;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.index.RandomIndexWriter;
@@ -74,11 +74,11 @@ public class TestRandomSamplingFacetsCollector extends FacetTestCase {
IOUtils.close(writer, taxoWriter);
// Test empty results
- RandomSamplingFacetsCollector collectRandomZeroResults =
- new RandomSamplingFacetsCollector(numDocs / 10, random.nextLong());
-
+ CollectorManager<RandomSamplingFacetsCollector, RandomSamplingFacetsCollector> fcm =
+ RandomSamplingFacetsCollector.createManager(numDocs / 10, random.nextLong());
// There should be no divisions by zero
- searcher.search(new TermQuery(new Term("EvenOdd", "NeverMatches")), collectRandomZeroResults);
+ RandomSamplingFacetsCollector collectRandomZeroResults =
+ searcher.search(new TermQuery(new Term("EvenOdd", "NeverMatches")), fcm);
// There should be no divisions by zero and no null result
assertNotNull(collectRandomZeroResults.getMatchingDocs());
@@ -93,13 +93,9 @@ public class TestRandomSamplingFacetsCollector extends FacetTestCase {
// Use a query to select half of the documents.
TermQuery query = new TermQuery(new Term("EvenOdd", "even"));
- RandomSamplingFacetsCollector random10Percent =
- new RandomSamplingFacetsCollector(
- numDocs / 10, random.nextLong()); // 10% of total docs, 20% of the hits
-
- FacetsCollector fc = new FacetsCollector();
-
- searcher.search(query, MultiCollector.wrap(fc, random10Percent));
+ // 10% of total docs, 20% of the hits
+ fcm = RandomSamplingFacetsCollector.createManager(numDocs / 10, random.nextLong());
+ RandomSamplingFacetsCollector random10Percent = searcher.search(query, fcm);
final List<MatchingDocs> matchingDocs = random10Percent.getMatchingDocs();
[lucene] 01/02: LUCENE-10002: Replaces usages of FacetsCollector with FacetsCollectorManager (#764)
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 395126a35b977fece701845db9cba716d18e59bb
Author: Luca Cavanna <ja...@users.noreply.github.com>
AuthorDate: Tue Apr 5 08:51:16 2022 +0200
LUCENE-10002: Replaces usages of FacetsCollector with FacetsCollectorManager (#764)
In the effort of decreasing usages of IndexSearcher#search(query, Collector) by using the corresponding method that accepts a collector manager, this commit replaces many usages of FacetsCollector with its corresponding existing collector manager.
---
.../lucene/demo/facet/DistanceFacetsExample.java | 5 +-
.../lucene/demo/facet/SimpleFacetsExample.java | 5 +-
.../org/apache/lucene/facet/TestFacetUtils.java | 3 +-
.../org/apache/lucene/facet/TestFacetsConfig.java | 3 +-
.../lucene/facet/TestLongValueFacetCounts.java | 23 ++++-----
.../lucene/facet/TestStringValueFacetCounts.java | 6 +--
.../lucene/facet/range/TestRangeFacetCounts.java | 60 +++++++---------------
.../sortedset/TestSortedSetDocValuesFacets.java | 9 ++--
.../taxonomy/TestSearcherTaxonomyManager.java | 9 ++--
.../taxonomy/TestTaxonomyFacetAssociations.java | 21 +++-----
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 19 +++----
.../facet/taxonomy/TestTaxonomyFacetCounts2.java | 13 ++---
.../facet/taxonomy/TestTaxonomyFacetLabels.java | 4 +-
.../taxonomy/TestTaxonomyFacetSumValueSource.java | 20 +++-----
.../TestIndexAndTaxonomyReplicationClient.java | 4 +-
15 files changed, 75 insertions(+), 129 deletions(-)
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
index a8db7c76da7..1d6754f0fe1 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
@@ -31,6 +31,7 @@ import org.apache.lucene.facet.DrillSideways;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.range.DoubleRange;
import org.apache.lucene.facet.range.DoubleRangeFacetCounts;
@@ -213,9 +214,7 @@ public class DistanceFacetsExample implements Closeable {
/** User runs a query and counts facets. */
public FacetResult search() throws IOException {
- FacetsCollector fc = new FacetsCollector();
-
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
index dc916fc2c10..b3668981731 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
@@ -28,6 +28,7 @@ import org.apache.lucene.facet.FacetField;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.taxonomy.FastTaxonomyFacetCounts;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
@@ -125,12 +126,10 @@ public class SimpleFacetsExample {
IndexSearcher searcher = new IndexSearcher(indexReader);
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
- FacetsCollector fc = new FacetsCollector();
-
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
// Retrieve results
List<FacetResult> results = new ArrayList<>();
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
index adbd6ffaad9..8c78d9b01fd 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
@@ -73,8 +73,7 @@ public class TestFacetUtils extends LuceneTestCase {
}
IndexSearcher searcher = newSearcher(writer.getReader());
- FacetsCollector fc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
int visitedDocs = 0;
DocIdSetIterator disi;
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
index c9aafbb67a5..590ed65ead1 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
@@ -73,8 +73,7 @@ public class TestFacetsConfig extends FacetTestCase {
DirectoryReader indexReader = DirectoryReader.open(indexDir);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector fc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, facetsConfig, fc);
FacetResult res = facets.getTopChildren(10, "a");
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
index 1e4d2be5eaa..ad0cd847891 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
@@ -59,9 +59,8 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
@@ -111,9 +110,8 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
@@ -143,9 +141,8 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new LongValueFacetCounts("field", fc);
@@ -219,7 +216,6 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
int iters = atLeast(100);
for (int iter = 0; iter < iters; iter++) {
- FacetsCollector fc = new FacetsCollector();
if (VERBOSE) {
System.out.println("\nTEST: iter=" + iter);
System.out.println(" test all docs");
@@ -246,7 +242,7 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
LongValueFacetCounts facetCounts;
if (random().nextBoolean()) {
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
if (random().nextBoolean()) {
if (VERBOSE) {
System.out.println(" use value source");
@@ -346,8 +342,8 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
System.out.println(" test id range " + minId + "-" + maxId);
}
- fc = new FacetsCollector();
- s.search(IntPoint.newRangeQuery("id", minId, maxId), fc);
+ FacetsCollector fc =
+ s.search(IntPoint.newRangeQuery("id", minId, maxId), new FacetsCollectorManager());
if (random().nextBoolean()) {
if (VERBOSE) {
System.out.println(" use doc values");
@@ -496,7 +492,6 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
int iters = atLeast(100);
for (int iter = 0; iter < iters; iter++) {
- FacetsCollector fc = new FacetsCollector();
if (VERBOSE) {
System.out.println("\nTEST: iter=" + iter);
System.out.println(" test all docs");
@@ -520,7 +515,7 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
LongValueFacetCounts facetCounts;
if (random().nextBoolean()) {
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
if (VERBOSE) {
System.out.println(" use doc values");
}
@@ -592,8 +587,8 @@ public class TestLongValueFacetCounts extends LuceneTestCase {
System.out.println(" test id range " + minId + "-" + maxId);
}
- fc = new FacetsCollector();
- s.search(IntPoint.newRangeQuery("id", minId, maxId), fc);
+ FacetsCollector fc =
+ s.search(IntPoint.newRangeQuery("id", minId, maxId), new FacetsCollectorManager());
if (random().nextBoolean()) {
facetCounts = new LongValueFacetCounts("field", fc);
} else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
index 474d39dc11b..b8d2abf9b85 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
@@ -260,8 +260,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
IndexSearcher searcher = newSearcher(writer.getReader());
writer.close();
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
// using a stale state
expectThrows(IllegalStateException.class, () -> new StringValueFacetCounts(state, c));
@@ -339,8 +338,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
StringDocValuesReaderState state =
new StringDocValuesReaderState(searcher.getIndexReader(), "field");
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
for (int topN : topNs) {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
index d78160b2c22..d807c23ec76 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
@@ -36,6 +36,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.facet.MultiDoubleValuesSource;
@@ -85,9 +86,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -131,9 +131,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -182,9 +181,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -223,9 +221,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -302,9 +299,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -342,9 +338,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -378,9 +373,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new LongRangeFacetCounts("field", fc);
@@ -408,9 +402,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new LongRangeFacetCounts("field", fc);
@@ -554,10 +547,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
"field",
@@ -592,10 +583,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
"field",
@@ -641,9 +630,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
w.close();
- FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
@@ -771,8 +759,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = new FacetsCollector();
- s.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -968,8 +955,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = new FacetsCollector();
- s.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1121,8 +1107,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = new FacetsCollector();
- s.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Query fastMatchFilter;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1291,8 +1276,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = new FacetsCollector();
- s.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Query fastMatchFilter;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1367,10 +1351,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
"field",
@@ -1411,10 +1393,8 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher s = newSearcher(r);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
"field",
@@ -1559,12 +1539,10 @@ public class TestRangeFacetCounts extends FacetTestCase {
FacetsConfig config = new FacetsConfig();
- FacetsCollector fc = new FacetsCollector();
-
IndexReader r = writer.getReader();
IndexSearcher s = newSearcher(r, false, false);
- s.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
final DoubleRange[] ranges =
new DoubleRange[] {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
index ee9a9c8ae24..587fe24328b 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
@@ -39,6 +39,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.index.IndexReader;
@@ -838,9 +839,8 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
try (IndexReader r2 = writer.getReader()) {
IndexSearcher searcher = newSearcher(r2);
- FacetsCollector c = new FacetsCollector();
-
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c =
+ searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
expectThrows(
IllegalStateException.class,
@@ -1629,8 +1629,7 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
IndexSearcher searcher, SortedSetDocValuesReaderState state, ExecutorService exec)
throws IOException, InterruptedException {
if (random().nextBoolean()) {
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
if (exec != null) {
return new ConcurrentSortedSetDocValuesFacetCounts(state, c, exec);
} else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
index 3f4c7adeec3..eab05feb668 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
@@ -28,6 +28,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.taxonomy.SearcherTaxonomyManager.SearcherAndTaxonomy;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -184,8 +185,8 @@ public class TestSearcherTaxonomyManager extends FacetTestCase {
SearcherAndTaxonomy pair = mgr.acquire();
try {
// System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
- FacetsCollector sfc = new FacetsCollector();
- pair.searcher.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc =
+ pair.searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(pair.taxonomyReader, config, sfc);
FacetResult result = facets.getTopChildren(10, "field");
if (pair.searcher.getIndexReader().numDocs() > 0) {
@@ -239,8 +240,8 @@ public class TestSearcherTaxonomyManager extends FacetTestCase {
SearcherAndTaxonomy pair = mgr.acquire();
try {
// System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
- FacetsCollector sfc = new FacetsCollector();
- pair.searcher.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc =
+ pair.searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(pair.taxonomyReader, config, sfc);
FacetResult result = facets.getTopChildren(10, "field");
if (pair.searcher.getIndexReader().numDocs() > 0) {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
index 41445dbb696..43de8880ade 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
@@ -21,6 +21,7 @@ import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -96,10 +97,8 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
public void testIntSumAssociation() throws Exception {
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher searcher = newSearcher(reader);
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new TaxonomyFacetSumIntAssociations("$facets.int", taxoReader, config, fc);
assertEquals(
@@ -112,10 +111,8 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
}
public void testFloatSumAssociation() throws Exception {
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher searcher = newSearcher(reader);
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new TaxonomyFacetSumFloatAssociations("$facets.float", taxoReader, config, fc);
assertEquals(
@@ -138,10 +135,8 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
* different field.
*/
public void testIntAndFloatAssocation() throws Exception {
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher searcher = newSearcher(reader);
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new TaxonomyFacetSumFloatAssociations("$facets.float", taxoReader, config, fc);
assertEquals(
@@ -163,10 +158,8 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
}
public void testWrongIndexFieldName() throws Exception {
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher searcher = newSearcher(reader);
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new TaxonomyFacetSumFloatAssociations(taxoReader, config, fc);
expectThrows(
IllegalArgumentException.class,
@@ -244,12 +237,10 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
}
public void testIntSumAssociationDrillDown() throws Exception {
- FacetsCollector fc = new FacetsCollector();
-
IndexSearcher searcher = newSearcher(reader);
DrillDownQuery q = new DrillDownQuery(config);
q.add("int", "b");
- searcher.search(q, fc);
+ FacetsCollector fc = searcher.search(q, new FacetsCollectorManager());
Facets facets = new TaxonomyFacetSumIntAssociations("$facets.int", taxoReader, config, fc);
assertEquals(
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
index 742f572b901..f0de3871046 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
@@ -35,6 +35,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -122,8 +123,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
// Now user drills down on Publish Date/2010:
DrillDownQuery q2 = new DrillDownQuery(config);
q2.add("Publish Date", "2010");
- FacetsCollector c = new FacetsCollector();
- searcher.search(q2, c);
+ FacetsCollector c = searcher.search(q2, new FacetsCollectorManager());
facets = new FastTaxonomyFacetCounts(taxoReader, config, c);
assertEquals(
"dim=Author path=[] value=2 childCount=2\n Bob (1)\n Lisa (1)\n",
@@ -264,8 +264,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
// Uses default $facets field:
Facets facets;
@@ -601,8 +600,8 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
DirectoryReader r = DirectoryReader.open(iw);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector sfc = new FacetsCollector();
- newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc =
+ newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets1 = getTaxonomyFacetCounts(taxoReader, config, sfc);
Facets facets2 = getTaxonomyFacetCounts(taxoReader, config, sfc, "$b");
assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
@@ -767,8 +766,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
// search for "f:a", only segments 1 and 3 should match results
Query q = new TermQuery(new Term("f", "a"));
- FacetsCollector sfc = new FacetsCollector();
- indexSearcher.search(q, sfc);
+ FacetsCollector sfc = indexSearcher.search(q, new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, config, sfc);
FacetResult result = facets.getTopChildren(10, "A");
assertEquals("wrong number of children", 2, result.labelValues.length);
@@ -932,14 +930,11 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
String indexFieldName, IndexSearcher searcher, TaxonomyReader taxoReader, FacetsConfig config)
throws IOException {
if (random().nextBoolean()) {
- // Aggregate the facet counts:
- FacetsCollector c = new FacetsCollector();
-
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query, and use MultiCollector to
// wrap collecting the "normal" hits and also facets:
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
return new FastTaxonomyFacetCounts(taxoReader, config, c);
} else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
index 0b94272c46a..90b08d9120c 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
@@ -32,6 +32,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -274,9 +275,8 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = new FacetsCollector();
TermQuery q = new TermQuery(A);
- searcher.search(q, sfc);
+ FacetsCollector sfc = searcher.search(q, new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
FacetResult result = facets.getTopChildren(NUM_CHILDREN_CP_A, CP_A);
assertEquals(-1, result.value.intValue());
@@ -298,8 +298,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
@@ -340,8 +339,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
@@ -365,8 +363,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
index 3b510b9157e..cdc583eaa4e 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
@@ -27,6 +27,7 @@ import org.apache.lucene.facet.FacetField;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.facet.FacetsCollector.MatchingDocs;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -148,8 +149,7 @@ public class TestTaxonomyFacetLabels extends FacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector fc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
TaxonomyFacetLabels taxoLabels =
new TaxonomyFacetLabels(taxoReader, FacetsConfig.DEFAULT_INDEX_FIELD_NAME);
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
index 7dbc3d3d4c3..03c27301c11 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
@@ -30,6 +30,7 @@ import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -104,14 +105,11 @@ public class TestTaxonomyFacetSumValueSource extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
taxoWriter.close();
- // Aggregate the facet counts:
- FacetsCollector c = new FacetsCollector();
-
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query and one of the
// Facets.search utility methods:
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
TaxonomyFacetSumValueSource facets =
new TaxonomyFacetSumValueSource(
@@ -175,8 +173,7 @@ public class TestTaxonomyFacetSumValueSource extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
taxoWriter.close();
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
TaxonomyFacetSumValueSource facets =
new TaxonomyFacetSumValueSource(
@@ -249,8 +246,7 @@ public class TestTaxonomyFacetSumValueSource extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
taxoWriter.close();
- FacetsCollector c = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), c);
+ FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
TaxonomyFacetSumValueSource facets =
new TaxonomyFacetSumValueSource(
@@ -332,8 +328,8 @@ public class TestTaxonomyFacetSumValueSource extends FacetTestCase {
DirectoryReader r = DirectoryReader.open(iw);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector sfc = new FacetsCollector();
- newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc =
+ newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new TaxonomyFacetSumValueSource(
taxoReader, config, sfc, DoubleValuesSource.fromLongField("price"));
@@ -404,8 +400,8 @@ public class TestTaxonomyFacetSumValueSource extends FacetTestCase {
DirectoryReader r = DirectoryReader.open(iw);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector sfc = new FacetsCollector();
- newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+ FacetsCollector sfc =
+ newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets =
new TaxonomyFacetSumValueSource(
taxoReader, config, sfc, DoubleValuesSource.fromLongField("price"));
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
index ce8dae50741..ffd56dc4667 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
@@ -30,6 +30,7 @@ import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetField;
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.taxonomy.FastTaxonomyFacetCounts;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
@@ -109,8 +110,7 @@ public class TestIndexAndTaxonomyReplicationClient extends ReplicatorTestCase {
// verify faceted search
int id = Integer.parseInt(indexReader.getIndexCommit().getUserData().get(VERSION_ID), 16);
IndexSearcher searcher = new IndexSearcher(indexReader);
- FacetsCollector fc = new FacetsCollector();
- searcher.search(new MatchAllDocsQuery(), fc);
+ FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
Facets facets = new FastTaxonomyFacetCounts(taxoReader, config, fc);
assertEquals(1, facets.getSpecificValue("A", Integer.toString(id, 16)).intValue());