Skip to content

Apache Lucene open-source search software

MatchAllDocs and MatchNoDocs should be singletons (#15499)

Dawid Weissbc7deedc0924
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6d8d157f009..3f9934735d3 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -144,6 +144,8 @@ Other
API Changes
---------------------
+* GITHUB#15497: Singleton for MatchAllDocsQuery & MatchNoDocsQuery. (hossman)
+
* GITHUB#15149: Introduce NumericDocValues#longValues to help speed up the
retrieval of many doc values at once. (Adrien Grand)
diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md
index 8c8466505e7..b427d336fcc 100644
--- a/lucene/MIGRATE.md
+++ b/lucene/MIGRATE.md
@@ -102,6 +102,11 @@ Pure `DataInput` subclasses cannot be optimized anymore as they cannot offer ran
Missing values should be configured in SortField constructor methods, as they are now final.
+### MatchAllDocs and MatchNoDocs are singletons
+
+MatchAllDocs and MatchNoDocs queries should use the INSTANCE final field instead of creating
+new objects. The constructors will be removed in the future.
+
## Migration from Lucene 9.x to Lucene 10.0
### DataInput#readVLong() may now read negative vlongs
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java
index f9c0ffc44df..821cdc007a5 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java
@@ -87,7 +87,7 @@
* IndexSearcher searcher = new IndexSearcher(ir);
* Sort sort = new Sort();
* sort.setSort(new SortField("contents", SortField.STRING));
- * Query query = new MatchAllDocsQuery();
+ * Query query = MatchAllDocsQuery.INSTANCE;
* ScoreDoc[] result = searcher.search(query, null, 1000, sort).scoreDocs;
* for (int i = 0 ; i < result.length ; ++i) {
* Document doc = searcher.doc(result[i].doc);
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java
index 69ac781f53f..44aac2fa8cf 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java
@@ -64,7 +64,7 @@ public class TestCollationDocValuesField extends LuceneTestCase {
SortField sortField = new SortField("collated", SortField.Type.STRING);
- TopDocs td = is.search(new MatchAllDocsQuery(), 5, new Sort(sortField));
+ TopDocs td = is.search(MatchAllDocsQuery.INSTANCE, 5, new Sort(sortField));
StoredFields storedFields = ir.storedFields();
assertEquals("abc", storedFields.document(td.scoreDocs[0].doc).get("field"));
assertEquals("ABC", storedFields.document(td.scoreDocs[1].doc).get("field"));
diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java
index 2e3e3b4eddf..ff3de67860a 100644
--- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java
+++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java
@@ -65,7 +65,7 @@ public class TestICUCollationDocValuesField extends LuceneTestCase {
SortField sortField = new SortField("collated", SortField.Type.STRING);
- TopDocs td = is.search(new MatchAllDocsQuery(), 5, new Sort(sortField));
+ TopDocs td = is.search(MatchAllDocsQuery.INSTANCE, 5, new Sort(sortField));
StoredFields storedFields = ir.storedFields();
assertEquals("abc", storedFields.document(td.scoreDocs[0].doc).get("field"));
assertEquals("ABC", storedFields.document(td.scoreDocs[1].doc).get("field"));
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java
index 573018f8231..d643f669e79 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java
@@ -218,7 +218,7 @@ public class TestIndexSortBackwardsCompatibility extends BackwardsCompatibilityT
assertTrue(topDocs.totalHits.value() > 0);
topDocs =
searcher.search(
- new MatchAllDocsQuery(), 5, new Sort(new SortField("dateDV", SortField.Type.LONG)));
+ MatchAllDocsQuery.INSTANCE, 5, new Sort(new SortField("dateDV", SortField.Type.LONG)));
assertEquals(50, topDocs.totalHits.value());
assertEquals(5, topDocs.scoreDocs.length);
long firstDate = (Long) ((FieldDoc) topDocs.scoreDocs[0]).fields[0];
diff --git a/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/HistogramCollectorBenchmark.java b/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/HistogramCollectorBenchmark.java
index c2f960fe822..37d44a4b8a3 100644
--- a/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/HistogramCollectorBenchmark.java
+++ b/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/HistogramCollectorBenchmark.java
@@ -129,7 +129,7 @@ public class HistogramCollectorBenchmark {
public void matchAllQueryHistogram(BenchmarkParams params) throws IOException {
IndexSearcher searcher = new IndexSearcher(reader);
searcher.search(
- new MatchAllDocsQuery(), new HistogramCollectorManager("f", params.bucketWidth, 10000));
+ MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", params.bucketWidth, 10000));
}
@Benchmark
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java
index 2e6ca311140..67565a17fcc 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java
@@ -123,7 +123,7 @@ public class DatasetSplitter {
gs.setAllGroups(true);
gs.setGroupDocsLimit(originalIndex.maxDoc());
TopGroups<Object> topGroups =
- gs.search(indexSearcher, new MatchAllDocsQuery(), 0, noOfClasses);
+ gs.search(indexSearcher, MatchAllDocsQuery.INSTANCE, 0, noOfClasses);
// set the type to be indexed, stored, with term vectors
FieldType ft = new FieldType(TextField.TYPE_STORED);
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java
index f0f9840e394..cc1b41262aa 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java
@@ -84,7 +84,7 @@ public class TestDocToDoubleVectorUtils extends LuceneTestCase {
IndexSearcher indexSearcher = new IndexSearcher(index);
TermVectors termVectors = index.termVectors();
for (ScoreDoc scoreDoc :
- indexSearcher.search(new MatchAllDocsQuery(), Integer.MAX_VALUE).scoreDocs) {
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, Integer.MAX_VALUE).scoreDocs) {
Terms docTerms = termVectors.get(scoreDoc.doc, "text");
Double[] vector = DocToDoubleVectorUtils.toDenseLocalFreqDoubleArray(docTerms);
assertNotNull(vector);
@@ -99,7 +99,7 @@ public class TestDocToDoubleVectorUtils extends LuceneTestCase {
IndexSearcher indexSearcher = new IndexSearcher(index);
TermVectors termVectors = index.termVectors();
for (ScoreDoc scoreDoc :
- indexSearcher.search(new MatchAllDocsQuery(), Integer.MAX_VALUE).scoreDocs) {
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, Integer.MAX_VALUE).scoreDocs) {
Terms docTerms = termVectors.get(scoreDoc.doc, "text");
Double[] vector = DocToDoubleVectorUtils.toSparseLocalFreqDoubleArray(docTerms, fieldTerms);
assertNotNull(vector);
diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
index 34f0d7c0f89..67dc7d4b3e8 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
@@ -91,18 +91,18 @@ final class SortedNumericDocValuesRangeQuery extends NumericDocValuesRangeQuery
return new FieldExistsQuery(field);
}
if (lowerValue > upperValue) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
long globalMin = DocValuesSkipper.globalMinValue(indexSearcher, field);
long globalMax = DocValuesSkipper.globalMaxValue(indexSearcher, field);
if (lowerValue > globalMax || upperValue < globalMin) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
if (lowerValue <= globalMin
&& upperValue >= globalMax
&& DocValuesSkipper.globalDocCount(indexSearcher, field)
== indexSearcher.getIndexReader().maxDoc()) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
return super.rewrite(indexSearcher);
}
diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java
index 7b27cb0f4b6..569aaab2155 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java
@@ -86,7 +86,7 @@ final class SortedNumericDocValuesSetQuery extends Query implements Accountable
@Override
public Query rewrite(IndexSearcher indexSearcher) throws IOException {
if (numbers.size() == 0) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
return super.rewrite(indexSearcher);
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index ff98f2983be..2d5f08a223a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -2615,12 +2615,12 @@ public class IndexWriter
* This change will not be visible until a {@link #commit()} has been called. This method can be
* rolled back using {@link #rollback()}.
*
- * <p>NOTE: this method is much faster than using deleteDocuments( new MatchAllDocsQuery() ). Yet,
- * this method also has different semantics compared to {@link #deleteDocuments(Query...)} since
- * internal data-structures are cleared as well as all segment information is forcefully dropped
- * anti-viral semantics like omitting norms are reset or doc value types are cleared. Essentially
- * a call to {@link #deleteAll()} is equivalent to creating a new {@link IndexWriter} with {@link
- * OpenMode#CREATE} which a delete query only marks documents as deleted.
+ * <p>NOTE: this method is much faster than using deleteDocuments( MatchAllDocsQuery.INSTANCE ).
+ * Yet, this method also has different semantics compared to {@link #deleteDocuments(Query...)}
+ * since internal data-structures are cleared as well as all segment information is forcefully
+ * dropped anti-viral semantics like omitting norms are reset or doc value types are cleared.
+ * Essentially a call to {@link #deleteAll()} is equivalent to creating a new {@link IndexWriter}
+ * with {@link OpenMode#CREATE} which a delete query only marks documents as deleted.
*
* <p>NOTE: this method will forcefully abort all merges in progress. If other threads are running
* {@link #forceMerge}, {@link #addIndexes(CodecReader[])} or {@link #forceMergeDeletes} methods,
diff --git a/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java b/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
index 8f618c92ddf..4bdd821ccba 100644
--- a/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
@@ -149,7 +149,7 @@ abstract class AbstractKnnVectorQuery extends Query {
topK = runSearchTasks(tasks, taskExecutor, perLeafResults, leafReaderContexts);
}
if (topK.scoreDocs.length == 0) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
return DocAndScoreQuery.createDocAndScoreQuery(reader, topK, reentryCount);
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java b/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
index 319e67e1418..3ab0bf72038 100644
--- a/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
@@ -369,7 +369,7 @@ public class BooleanQuery extends Query implements Iterable<BooleanClause> {
if (mustNotClauses.stream().anyMatch(p.or(clauseSets.get(Occur.FILTER)::contains))) {
return new MatchNoDocsQuery("FILTER or MUST clause also in MUST_NOT");
}
- if (mustNotClauses.contains(new MatchAllDocsQuery())) {
+ if (mustNotClauses.contains(MatchAllDocsQuery.INSTANCE)) {
return new MatchNoDocsQuery("MUST_NOT clause is MatchAllDocsQuery");
}
}
@@ -379,7 +379,7 @@ public class BooleanQuery extends Query implements Iterable<BooleanClause> {
final Set<Query> filters = new HashSet<>(clauseSets.get(Occur.FILTER));
boolean modified = false;
if (filters.size() > 1 || clauseSets.get(Occur.MUST).isEmpty() == false) {
- modified = filters.remove(new MatchAllDocsQuery());
+ modified = filters.remove(MatchAllDocsQuery.INSTANCE);
}
modified |= filters.removeAll(clauseSets.get(Occur.MUST));
if (modified) {
diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldExistsQuery.java b/lucene/core/src/java/org/apache/lucene/search/FieldExistsQuery.java
index 43f4924cda6..f6bac7b52bc 100644
--- a/lucene/core/src/java/org/apache/lucene/search/FieldExistsQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/FieldExistsQuery.java
@@ -156,7 +156,7 @@ public class FieldExistsQuery extends Query {
}
}
if (allReadersRewritable) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
return super.rewrite(indexSearcher);
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexOrDocValuesQuery.java b/lucene/core/src/java/org/apache/lucene/search/IndexOrDocValuesQuery.java
index 0ae8f131843..a26b07967c5 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndexOrDocValuesQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndexOrDocValuesQuery.java
@@ -115,11 +115,11 @@ public final class IndexOrDocValuesQuery extends Query {
Query dvRewrite = dvQuery.rewrite(indexSearcher);
if (indexRewrite.getClass() == MatchAllDocsQuery.class
|| dvRewrite.getClass() == MatchAllDocsQuery.class) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
if (indexRewrite.getClass() == MatchNoDocsQuery.class
|| dvRewrite.getClass() == MatchNoDocsQuery.class) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
if (indexQuery != indexRewrite || dvQuery != dvRewrite) {
return new IndexOrDocValuesQuery(indexRewrite, dvRewrite);
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
index f41984d0293..ac85f306882 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
@@ -134,7 +134,7 @@ public class IndexSortSortedNumericDocValuesRangeQuery extends NumericDocValuesR
Query rewrittenFallback = fallbackQuery.rewrite(indexSearcher);
if (rewrittenFallback.getClass() == MatchAllDocsQuery.class) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
if (rewrittenFallback == fallbackQuery) {
return this;
diff --git a/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java b/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
index 6beeaf9589b..bf68b808340 100644
--- a/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
@@ -22,6 +22,19 @@ import org.apache.lucene.index.LeafReaderContext;
/** A query that matches all documents. */
public final class MatchAllDocsQuery extends Query {
+ /** A singleton instance */
+ public static final MatchAllDocsQuery INSTANCE = new MatchAllDocsQuery();
+
+ /**
+ * Default constructor
+ *
+ * @deprecated Use {@link MatchAllDocsQuery#INSTANCE}
+ */
+ @Deprecated
+ public MatchAllDocsQuery() {
+ super();
+ }
+
@Override
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) {
return new ConstantScoreWeight(this, boost) {
diff --git a/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java b/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java
index a65767e8ec3..25639e99efe 100644
--- a/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java
@@ -24,12 +24,29 @@ public class MatchNoDocsQuery extends Query {
private final String reason;
- /** Default constructor */
+ /**
+ * A singleton instance with a blank reason
+ *
+ * @see #MatchNoDocsQuery(String)
+ */
+ public static final MatchNoDocsQuery INSTANCE = new MatchNoDocsQuery();
+
+ /**
+ * Default constructor
+ *
+ * @deprecated Use either {@link MatchAllDocsQuery#INSTANCE} or {@link #MatchNoDocsQuery(String)}
+ */
+ @Deprecated
public MatchNoDocsQuery() {
this("");
}
- /** Provides a reason explaining why this query was used */
+ /**
+ * Provides a reason explaining why this query was used.
+ *
+ * <p>NOTE: All instances of this class are equal, even if they were constructed with distinct
+ * reasons.
+ */
public MatchNoDocsQuery(String reason) {
this.reason = reason;
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
index c198fecb4b3..84699ed81c8 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
@@ -548,20 +548,20 @@ public abstract class PointRangeQuery extends Query {
byte[] globalMaxPacked = PointValues.getMaxPackedValue(reader, getField());
if (globalMinPacked == null || globalMaxPacked == null) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
return switch (relate(globalMinPacked, globalMaxPacked)) {
case CELL_INSIDE_QUERY -> {
if (canRewriteToMatchAllQuery(reader)) {
- yield new MatchAllDocsQuery();
+ yield MatchAllDocsQuery.INSTANCE;
} else if (canRewriteToFieldExistsQuery(reader)) {
yield new FieldExistsQuery(field);
} else {
yield super.rewrite(searcher);
}
}
- case CELL_OUTSIDE_QUERY -> new MatchNoDocsQuery();
+ case CELL_OUTSIDE_QUERY -> MatchNoDocsQuery.INSTANCE;
case CELL_CROSSES_QUERY -> super.rewrite(searcher);
};
}
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java
index cd5bde9ba3a..18bd646ca6d 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java
@@ -72,7 +72,7 @@ public class TestFeatureSort extends LuceneTestCase {
StoredFields storedFields = searcher.storedFields();
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("30.1", storedFields.document(td.scoreDocs[0].doc).get("value"));
@@ -105,7 +105,7 @@ public class TestFeatureSort extends LuceneTestCase {
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
StoredFields storedFields = searcher.storedFields();
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
@@ -139,7 +139,7 @@ public class TestFeatureSort extends LuceneTestCase {
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
StoredFields storedFields = searcher.storedFields();
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
@@ -174,7 +174,7 @@ public class TestFeatureSort extends LuceneTestCase {
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
StoredFields storedFields = searcher.storedFields();
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
@@ -215,7 +215,7 @@ public class TestFeatureSort extends LuceneTestCase {
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
StoredFields storedFields = searcher.storedFields();
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(7, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
@@ -259,30 +259,30 @@ public class TestFeatureSort extends LuceneTestCase {
if (topDocs == null) {
topDocs =
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
10,
new Sort(new SortField("float", SortField.Type.FLOAT, true)));
featureTopDocs =
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
10,
new Sort(FeatureField.newFeatureSort("feature", "foo")));
} else {
topDocs =
searcher.searchAfter(
topDocs.scoreDocs[topDocs.scoreDocs.length - 1],
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
10,
new Sort(new SortField("float", SortField.Type.FLOAT, true)));
featureTopDocs =
searcher.searchAfter(
featureTopDocs.scoreDocs[featureTopDocs.scoreDocs.length - 1],
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
10,
new Sort(FeatureField.newFeatureSort("feature", "foo")));
}
- CheckHits.checkEqual(new MatchAllDocsQuery(), topDocs.scoreDocs, featureTopDocs.scoreDocs);
+ CheckHits.checkEqual(MatchAllDocsQuery.INSTANCE, topDocs.scoreDocs, featureTopDocs.scoreDocs);
} while (topDocs.scoreDocs.length > 0);
r.close();
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java
index 513333b7d0d..c50213426b1 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java
@@ -477,7 +477,7 @@ public class TestLatLonPointDistanceFeatureQuery extends LuceneTestCase {
Sort sort1 =
new Sort(SortField.FIELD_SCORE, LatLonDocValuesField.newDistanceSort("foo", lat, lon));
- Query query2 = new MatchAllDocsQuery();
+ Query query2 = MatchAllDocsQuery.INSTANCE;
Sort sort2 = new Sort(LatLonDocValuesField.newDistanceSort("foo", lat, lon));
TopDocs topDocs1 = searcher.search(query1, 10, sort1);
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java
index 0cd0d58208b..f1656f6dcbf 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java
@@ -66,7 +66,7 @@ public class TestLatLonPointDistanceSort extends LuceneTestCase {
iw.close();
Sort sort = new Sort(LatLonDocValuesField.newDistanceSort("location", 40.7143528, -74.0059731));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(462.1028401330431, (Double) d.fields[0], 0.0D);
@@ -103,7 +103,7 @@ public class TestLatLonPointDistanceSort extends LuceneTestCase {
iw.close();
Sort sort = new Sort(LatLonDocValuesField.newDistanceSort("location", 40.7143528, -74.0059731));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(462.1028401330431D, (Double) d.fields[0], 0.0D);
@@ -240,7 +240,7 @@ public class TestLatLonPointDistanceSort extends LuceneTestCase {
SortField distanceSort = LatLonDocValuesField.newDistanceSort("field", lat, lon);
Sort sort = new Sort(distanceSort, new SortField("id", SortField.Type.INT));
- TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), topN, sort);
+ TopDocs topDocs = searcher.search(MatchAllDocsQuery.INSTANCE, topN, sort);
for (int resultNumber = 0; resultNumber < topN; resultNumber++) {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[resultNumber];
Result actual = new Result((Integer) fieldDoc.fields[1], (Double) fieldDoc.fields[0]);
@@ -251,7 +251,8 @@ public class TestLatLonPointDistanceSort extends LuceneTestCase {
if (topN < reader.maxDoc()) {
int page2 = TestUtil.nextInt(random(), 1, reader.maxDoc() - topN);
TopDocs topDocs2 =
- searcher.searchAfter(topDocs.scoreDocs[topN - 1], new MatchAllDocsQuery(), page2, sort);
+ searcher.searchAfter(
+ topDocs.scoreDocs[topN - 1], MatchAllDocsQuery.INSTANCE, page2, sort);
for (int resultNumber = 0; resultNumber < page2; resultNumber++) {
FieldDoc fieldDoc = (FieldDoc) topDocs2.scoreDocs[resultNumber];
Result actual = new Result((Integer) fieldDoc.fields[1], (Double) fieldDoc.fields[0]);
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
index c08814ae750..469d0fed5ae 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
@@ -1563,7 +1563,9 @@ public class TestDemoParallelLeafReader extends LuceneTestCase {
// Confirm we can sort by the new DV field:
TopDocs hits =
s.search(
- new MatchAllDocsQuery(), 100, new Sort(new SortField("number", SortField.Type.LONG)));
+ MatchAllDocsQuery.INSTANCE,
+ 100,
+ new Sort(new SortField("number", SortField.Type.LONG)));
StoredFields storedFields = s.storedFields();
long last = Long.MIN_VALUE;
for (ScoreDoc scoreDoc : hits.scoreDocs) {
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
index 041f00c113a..3f50b9bbe54 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
@@ -213,7 +213,7 @@ public class TestDocumentsWriterDeleteQueue extends LuceneTestCase {
}
expectThrows(AlreadyClosedException.class, () -> queue.addDelete(new Term("foo", "bar")));
expectThrows(AlreadyClosedException.class, () -> queue.freezeGlobalBuffer(null));
- expectThrows(AlreadyClosedException.class, () -> queue.addDelete(new MatchNoDocsQuery()));
+ expectThrows(AlreadyClosedException.class, () -> queue.addDelete(MatchNoDocsQuery.INSTANCE));
expectThrows(
AlreadyClosedException.class,
() ->
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
index 2a06ebfcc73..09d097a56c2 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -2687,10 +2687,10 @@ public class TestIndexSorting extends LuceneTestCase {
TopDocs hits1 =
s1.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new TopFieldCollectorManager(sort, numHits, Integer.MAX_VALUE));
TopDocs hits2 =
- s2.search(new MatchAllDocsQuery(), new TopFieldCollectorManager(sort, numHits, 1));
+ s2.search(MatchAllDocsQuery.INSTANCE, new TopFieldCollectorManager(sort, numHits, 1));
if (VERBOSE) {
System.out.println(" topDocs query-time sort: totalHits=" + hits1.totalHits.value());
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index d86bab8f985..1eb83a6a7be 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -2461,7 +2461,7 @@ public class TestIndexWriter extends LuceneTestCase {
evilWriter.commit();
}
}
- evilWriter.deleteDocuments(new MatchAllDocsQuery());
+ evilWriter.deleteDocuments(MatchAllDocsQuery.INSTANCE);
evilWriter.forceMerge(1);
evilWriter.close();
dir.close();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
index d096f06bcce..c562d3ed624 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
@@ -418,7 +418,7 @@ public class TestIndexWriterMergePolicy extends LuceneTestCase {
try (IndexReader reader = DirectoryReader.open(writerWithMergePolicy)) {
IndexSearcher searcher = new IndexSearcher(reader);
assertEquals(5, reader.numDocs());
- assertEquals(5, searcher.count(new MatchAllDocsQuery()));
+ assertEquals(5, searcher.count(MatchAllDocsQuery.INSTANCE));
}
writerWithMergePolicy.close();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
index baad68452e0..1a0c9269256 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
@@ -58,7 +58,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
MergePolicy policy =
new SoftDeletesRetentionMergePolicy(
"soft_delete",
- () -> letItGo.get() ? new MatchNoDocsQuery() : new MatchAllDocsQuery(),
+ () -> letItGo.get() ? MatchNoDocsQuery.INSTANCE : MatchAllDocsQuery.INSTANCE,
new LogDocMergePolicy());
IndexWriterConfig indexWriterConfig =
newIndexWriterConfig().setMergePolicy(policy).setSoftDeletesField("soft_delete");
@@ -237,7 +237,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
IndexWriterConfig indexWriterConfig = newIndexWriterConfig();
indexWriterConfig.setMergePolicy(
new SoftDeletesRetentionMergePolicy(
- "soft_delete", () -> new MatchAllDocsQuery(), new LogDocMergePolicy()));
+ "soft_delete", () -> MatchAllDocsQuery.INSTANCE, new LogDocMergePolicy()));
indexWriterConfig.setSoftDeletesField("soft_delete");
IndexWriter writer = new IndexWriter(dir, indexWriterConfig);
@@ -406,7 +406,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
if (random().nextBoolean()) {
config.setMergePolicy(
new SoftDeletesRetentionMergePolicy(
- "soft_delete", () -> new MatchNoDocsQuery(), config.getMergePolicy()));
+ "soft_delete", () -> MatchNoDocsQuery.INSTANCE, config.getMergePolicy()));
}
IndexWriter writer = new IndexWriter(dir, config);
// The first segment includes d1 and d2
@@ -443,7 +443,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
if (softDelete != null && random().nextBoolean()) {
config.setMergePolicy(
new SoftDeletesRetentionMergePolicy(
- softDelete, () -> new MatchNoDocsQuery(), config.getMergePolicy()));
+ softDelete, () -> MatchNoDocsQuery.INSTANCE, config.getMergePolicy()));
}
IndexWriter writer = new IndexWriter(dir, config);
for (int i = 0; i < 2; i++) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
index 32215cad5e0..ab469721eda 100644
--- a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
@@ -261,7 +261,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
// make sure we don't drop to exact search, even though the filter matches fewer than k docs
Query kvq =
- getThrowingKnnVectorQuery("field", new float[] {0, 0}, 10, new MatchAllDocsQuery());
+ getThrowingKnnVectorQuery("field", new float[] {0, 0}, 10, MatchAllDocsQuery.INSTANCE);
TopDocs topDocs = searcher.search(kvq, 3);
assertEquals(3, topDocs.totalHits.value());
}
@@ -794,7 +794,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
}
w.commit();
- w.deleteDocuments(new MatchAllDocsQuery());
+ w.deleteDocuments(MatchAllDocsQuery.INSTANCE);
w.commit();
try (IndexReader reader = DirectoryReader.open(dir)) {
@@ -956,7 +956,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
AbstractKnnVectorQuery query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 2);
AbstractKnnVectorQuery exactQuery =
- getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10, new MatchAllDocsQuery());
+ getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10, MatchAllDocsQuery.INSTANCE);
assertEquals(2, searcher.count(query)); // Expect some results without timeout
assertEquals(3, searcher.count(exactQuery)); // Same for exact search
diff --git a/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java b/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java
index 11a287516dc..04907061b87 100644
--- a/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/search/BaseVectorSimilarityQueryTestCase.java
@@ -332,7 +332,7 @@ abstract class BaseVectorSimilarityQueryTestCase<
try (Directory dir = getIndexStore(getRandomVectors(numDocs, dim));
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig())) {
// Delete all documents
- w.deleteDocuments(new MatchAllDocsQuery());
+ w.deleteDocuments(MatchAllDocsQuery.INSTANCE);
w.commit();
try (IndexReader reader = DirectoryReader.open(dir)) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
index 9e014dfb875..f09e808b3a2 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
@@ -166,13 +166,13 @@ public class TestBooleanQuery extends LuceneTestCase {
BooleanQuery bq1 =
new BooleanQuery.Builder()
.setMinimumNumberShouldMatch(random().nextInt(2))
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.build();
BooleanQuery bq2 =
new BooleanQuery.Builder()
.setMinimumNumberShouldMatch(bq1.getMinimumNumberShouldMatch())
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.build();
@@ -830,7 +830,7 @@ public class TestBooleanQuery extends LuceneTestCase {
query =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(LongPoint.newRangeQuery("long", 1L, 5L), Occur.FILTER)
.build();
// One query matches all docs, the count of the conjunction is the count of the other query
@@ -898,7 +898,7 @@ public class TestBooleanQuery extends LuceneTestCase {
query =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD)
.add(LongPoint.newRangeQuery("long", 1L, 5L), Occur.SHOULD)
.build();
// One query matches all docs, the count of the disjunction is the number of docs
@@ -918,7 +918,7 @@ public class TestBooleanQuery extends LuceneTestCase {
new BooleanQuery.Builder()
.add(new TermQuery(new Term("string", "xyz")), Occur.MUST)
.add(unknownCountQuery, Occur.MUST_NOT)
- .add(new MatchAllDocsQuery(), Occur.MUST_NOT)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST_NOT)
.build();
weight = searcher.createWeight(query, ScoreMode.COMPLETE, 1f);
// count of the first MUST_NOT clause is unknown, but the second MUST_NOT clause matches all
@@ -941,7 +941,7 @@ public class TestBooleanQuery extends LuceneTestCase {
query =
new BooleanQuery.Builder()
.add(unknownCountQuery, Occur.SHOULD)
- .add(new MatchAllDocsQuery(), Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD)
.build();
weight = searcher.createWeight(query, ScoreMode.COMPLETE, 1f);
// count of the first SHOULD clause is unknown, but the second SHOULD clause matches all docs
@@ -1308,7 +1308,7 @@ public class TestBooleanQuery extends LuceneTestCase {
query = LongPoint.newExactQuery("long", 5L);
break;
case 4:
- query = new MatchAllDocsQuery();
+ query = MatchAllDocsQuery.INSTANCE;
break;
default:
query = LongPoint.newRangeQuery("long", 0L, 10L);
@@ -1409,10 +1409,10 @@ public class TestBooleanQuery extends LuceneTestCase {
for (var occur : Occur.values()) {
assertThrows(
UnsupportedOperationException.class,
- () -> bq.getClauses(occur).add(new MatchNoDocsQuery()));
+ () -> bq.getClauses(occur).add(MatchNoDocsQuery.INSTANCE));
}
assertThrows(
UnsupportedOperationException.class,
- () -> bq.clauses().add(new BooleanClause(new MatchNoDocsQuery(), Occur.SHOULD)));
+ () -> bq.clauses().add(new BooleanClause(MatchNoDocsQuery.INSTANCE, Occur.SHOULD)));
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
index 918769084b8..ea61ee3647d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
@@ -249,7 +249,7 @@ public class TestBooleanQueryVisitSubscorers extends LuceneTestCase {
query.add(new TermQuery(new Term(F2, "web")), Occur.SHOULD);
query.add(new TermQuery(new Term(F2, "crawler")), Occur.SHOULD);
query.setMinimumNumberShouldMatch(2);
- query.add(new MatchAllDocsQuery(), Occur.MUST);
+ query.add(MatchAllDocsQuery.INSTANCE, Occur.MUST);
ScoreSummary scoreSummary =
searcher.search(query.build(), new ScorerSummarizingCollectorManager());
assertEquals(1, scoreSummary.numHits.get());
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java
index ca2d39a8db5..01b646f58b0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java
@@ -111,7 +111,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.build();
assertEquals(
@@ -119,7 +119,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
bq =
new BooleanQuery.Builder()
- .add(new BoostQuery(new MatchAllDocsQuery(), 42), Occur.MUST)
+ .add(new BoostQuery(MatchAllDocsQuery.INSTANCE, 42), Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.build();
assertEquals(
@@ -128,35 +128,35 @@ public class TestBooleanRewrites extends LuceneTestCase {
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
- assertEquals(new MatchAllDocsQuery(), searcher.rewrite(bq));
+ assertEquals(MatchAllDocsQuery.INSTANCE, searcher.rewrite(bq));
bq =
new BooleanQuery.Builder()
- .add(new BoostQuery(new MatchAllDocsQuery(), 42), Occur.MUST)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(new BoostQuery(MatchAllDocsQuery.INSTANCE, 42), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
- assertEquals(new BoostQuery(new MatchAllDocsQuery(), 42), searcher.rewrite(bq));
+ assertEquals(new BoostQuery(MatchAllDocsQuery.INSTANCE, 42), searcher.rewrite(bq));
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST_NOT)
.build();
assertEquals(bq, searcher.rewrite(bq));
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
- assertEquals(new MatchAllDocsQuery(), searcher.rewrite(bq));
+ assertEquals(MatchAllDocsQuery.INSTANCE, searcher.rewrite(bq));
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.add(new TermQuery(new Term("foo", "baz")), Occur.FILTER)
.build();
@@ -169,7 +169,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.add(new TermQuery(new Term("foo", "baz")), Occur.MUST_NOT)
.build();
@@ -182,7 +182,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.SHOULD)
.build();
assertEquals(bq, searcher.rewrite(bq));
@@ -193,7 +193,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.MUST)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST)
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
.add(new TermQuery(new Term("foo", "baz")), Occur.SHOULD)
.add(new TermQuery(new Term("foo", "quux")), Occur.SHOULD)
@@ -278,7 +278,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST_NOT)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(bq));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(bq));
// Test Filter with MustNot
BooleanQuery bq2 =
@@ -291,7 +291,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST_NOT)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(bq2));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(bq2));
}
// MatchAllQuery as MUST_NOT clause cannot return anything
@@ -305,10 +305,10 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new TermQuery(new Term("foo", "baz")), Occur.FILTER)
.add(new TermQuery(new Term("foo", "bad")), Occur.SHOULD)
//
- .add(new MatchAllDocsQuery(), Occur.MUST_NOT)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST_NOT)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(bq));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(bq));
// Test Must with MatchAll MustNot and other MustNot
BooleanQuery bq2 =
@@ -318,10 +318,10 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new TermQuery(new Term("foo", "bad")), Occur.SHOULD)
//
.add(new TermQuery(new Term("foo", "bor")), Occur.MUST_NOT)
- .add(new MatchAllDocsQuery(), Occur.MUST_NOT)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.MUST_NOT)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(bq2));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(bq2));
}
public void testDeeplyNestedBooleanRewriteShouldClauses() throws IOException {
@@ -396,7 +396,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery bq =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
assertEquals(new TermQuery(new Term("foo", "bar")), searcher.rewrite(bq));
@@ -404,7 +404,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST)
.add(new TermQuery(new Term("foo", "baz")), Occur.MUST)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
Query expected =
new BooleanQuery.Builder()
@@ -416,17 +416,17 @@ public class TestBooleanRewrites extends LuceneTestCase {
bq =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.FILTER)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
expected = new BoostQuery(new ConstantScoreQuery(new TermQuery(new Term("foo", "bar"))), 0.0f);
assertEquals(expected, searcher.rewrite(bq));
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), Occur.FILTER)
- .add(new MatchAllDocsQuery(), Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.FILTER)
.build();
- expected = new BoostQuery(new ConstantScoreQuery(new MatchAllDocsQuery()), 0.0f);
+ expected = new BoostQuery(new ConstantScoreQuery(MatchAllDocsQuery.INSTANCE), 0.0f);
assertEquals(expected, searcher.rewrite(bq));
}
@@ -537,7 +537,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
}
switch (random().nextInt(6)) {
case 0:
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
case 1:
return new TermQuery(new Term("body", "a"));
case 2:
@@ -687,7 +687,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(inner, Occur.SHOULD)
.add(new TermQuery(new Term("foo", "baz")), Occur.MUST)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
inner =
new BooleanQuery.Builder()
@@ -913,7 +913,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery query =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.SHOULD)
- .add(new MatchNoDocsQuery(), Occur.SHOULD)
+ .add(MatchNoDocsQuery.INSTANCE, Occur.SHOULD)
.build();
assertEquals(new TermQuery(new Term("foo", "bar")), searcher.rewrite(query));
}
@@ -924,7 +924,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery query =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.SHOULD)
- .add(new MatchNoDocsQuery(), Occur.MUST_NOT)
+ .add(MatchNoDocsQuery.INSTANCE, Occur.MUST_NOT)
.build();
assertEquals(new TermQuery(new Term("foo", "bar")), searcher.rewrite(query));
}
@@ -935,9 +935,9 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery query =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST)
- .add(new MatchNoDocsQuery(), Occur.MUST)
+ .add(MatchNoDocsQuery.INSTANCE, Occur.MUST)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
public void testFilterMatchNoDocsQuery() throws IOException {
@@ -946,15 +946,15 @@ public class TestBooleanRewrites extends LuceneTestCase {
BooleanQuery query =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST)
- .add(new MatchNoDocsQuery(), Occur.FILTER)
+ .add(MatchNoDocsQuery.INSTANCE, Occur.FILTER)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
public void testEmptyBoolean() throws IOException {
IndexSearcher searcher = newSearcher(new MultiReader());
BooleanQuery query = new BooleanQuery.Builder().build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
public void testSimplifyFilterClauses() throws IOException {
@@ -1025,13 +1025,13 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new PhraseQuery.Builder().build(), Occur.SHOULD)
.setMinimumNumberShouldMatch(1)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
query =
new BooleanQuery.Builder()
.add(new PhraseQuery.Builder().build(), Occur.SHOULD)
.setMinimumNumberShouldMatch(0)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
// Meaningful SHOULD clause count is less than MinimumNumberShouldMatch
query =
@@ -1040,7 +1040,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new PhraseQuery.Builder().add(new Term("field", "a")).build(), Occur.SHOULD)
.setMinimumNumberShouldMatch(2)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
// Meaningful SHOULD clause count is equal to MinimumNumberShouldMatch
query =
@@ -1094,7 +1094,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
.add(new PhraseQuery.Builder().add(new Term("field", "b")).build(), Occur.SHOULD)
.setMinimumNumberShouldMatch(2)
.build();
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
// Test query to count number of rewrites for its lifetime.
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
index 72ce6afd518..69e0a8b3bda 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
@@ -240,7 +240,7 @@ public class TestBooleanScorer extends LuceneTestCase {
query =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("foo", "baz")), Occur.SHOULD)
- .add(new MatchAllDocsQuery(), Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD)
.add(new TermQuery(new Term("foo", "bar")), Occur.MUST_NOT)
.build();
weight = searcher.createWeight(searcher.rewrite(query), ScoreMode.COMPLETE, 1);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorerSupplier.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorerSupplier.java
index 9695b39081c..fc6404c153a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorerSupplier.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorerSupplier.java
@@ -33,7 +33,7 @@ public class TestBooleanScorerSupplier extends LuceneTestCase {
private static class FakeWeight extends Weight {
FakeWeight() {
- super(new MatchNoDocsQuery());
+ super(MatchNoDocsQuery.INSTANCE);
}
@Override
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java
index cfa339dfbfd..945212a493f 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java
@@ -27,25 +27,25 @@ public class TestBoostQuery extends LuceneTestCase {
public void testValidation() {
IllegalArgumentException e =
expectThrows(
- IllegalArgumentException.class, () -> new BoostQuery(new MatchAllDocsQuery(), -3));
+ IllegalArgumentException.class, () -> new BoostQuery(MatchAllDocsQuery.INSTANCE, -3));
assertEquals("boost must be a positive float, got -3.0", e.getMessage());
e =
expectThrows(
- IllegalArgumentException.class, () -> new BoostQuery(new MatchAllDocsQuery(), -0f));
+ IllegalArgumentException.class, () -> new BoostQuery(MatchAllDocsQuery.INSTANCE, -0f));
assertEquals("boost must be a positive float, got -0.0", e.getMessage());
e =
expectThrows(
IllegalArgumentException.class,
- () -> new BoostQuery(new MatchAllDocsQuery(), Float.NaN));
+ () -> new BoostQuery(MatchAllDocsQuery.INSTANCE, Float.NaN));
assertEquals("boost must be a positive float, got NaN", e.getMessage());
}
public void testEquals() {
final float boost = random().nextFloat() * 3;
- BoostQuery q1 = new BoostQuery(new MatchAllDocsQuery(), boost);
- BoostQuery q2 = new BoostQuery(new MatchAllDocsQuery(), boost);
+ BoostQuery q1 = new BoostQuery(MatchAllDocsQuery.INSTANCE, boost);
+ BoostQuery q2 = new BoostQuery(MatchAllDocsQuery.INSTANCE, boost);
assertEquals(q1, q2);
assertEquals(q1.getBoost(), q2.getBoost(), 0f);
@@ -53,7 +53,7 @@ public class TestBoostQuery extends LuceneTestCase {
while (boost == boost2) {
boost2 = random().nextFloat() * 3;
}
- BoostQuery q3 = new BoostQuery(new MatchAllDocsQuery(), boost2);
+ BoostQuery q3 = new BoostQuery(MatchAllDocsQuery.INSTANCE, boost2);
assertFalse(q1.equals(q3));
assertNotEquals(q3.hashCode(), q1.hashCode());
}
@@ -77,22 +77,22 @@ public class TestBoostQuery extends LuceneTestCase {
assertEquals(new BoostQuery(new TermQuery(new Term("foo", "bar")), 2), searcher.rewrite(q));
// boosts are merged
- q = new BoostQuery(new BoostQuery(new MatchAllDocsQuery(), 3), 2);
- assertEquals(new BoostQuery(new MatchAllDocsQuery(), 6), searcher.rewrite(q));
+ q = new BoostQuery(new BoostQuery(MatchAllDocsQuery.INSTANCE, 3), 2);
+ assertEquals(new BoostQuery(MatchAllDocsQuery.INSTANCE, 6), searcher.rewrite(q));
// scores are not computed when the boost is 0
- q = new BoostQuery(new MatchAllDocsQuery(), 0);
+ q = new BoostQuery(MatchAllDocsQuery.INSTANCE, 0);
assertEquals(
- new BoostQuery(new ConstantScoreQuery(new MatchAllDocsQuery()), 0), searcher.rewrite(q));
+ new BoostQuery(new ConstantScoreQuery(MatchAllDocsQuery.INSTANCE), 0), searcher.rewrite(q));
}
public void testRewriteBubblesUpMatchNoDocsQuery() throws IOException {
IndexSearcher searcher = newSearcher(new MultiReader());
- Query query = new BoostQuery(new MatchNoDocsQuery(), 2f);
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ Query query = new BoostQuery(MatchNoDocsQuery.INSTANCE, 2f);
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
- query = new BoostQuery(new MatchNoDocsQuery(), 0f);
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ query = new BoostQuery(MatchNoDocsQuery.INSTANCE, 0f);
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCombinedFieldQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestCombinedFieldQuery.java
index 32593c15086..325d1344d62 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestCombinedFieldQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestCombinedFieldQuery.java
@@ -59,7 +59,7 @@ public class TestCombinedFieldQuery extends LuceneTestCase {
IndexReader reader = new MultiReader();
IndexSearcher searcher = new IndexSearcher(reader);
Query actual = searcher.rewrite(builder.build());
- assertEquals(new MatchNoDocsQuery(), actual);
+ assertEquals(MatchNoDocsQuery.INSTANCE, actual);
builder.addField("field", 1f);
Query query = builder.build();
actual = searcher.rewrite(builder.build());
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
index 0f917aad01d..b0aa9f663ff 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
@@ -55,7 +55,7 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
}
public void testMA3() throws Exception {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
bqtest(new BoostQuery(q, 0), new int[] {0, 1, 2, 3});
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
index fde22e3688b..c37a8c760fd 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
@@ -146,7 +146,7 @@ public class TestConstantScoreQuery extends LuceneTestCase {
public void testRewriteBubblesUpMatchNoDocsQuery() throws IOException {
IndexSearcher searcher = newSearcher(new MultiReader());
- Query query = new ConstantScoreQuery(new MatchNoDocsQuery());
- assertEquals(new MatchNoDocsQuery(), searcher.rewrite(query));
+ Query query = new ConstantScoreQuery(MatchNoDocsQuery.INSTANCE);
+ assertEquals(MatchNoDocsQuery.INSTANCE, searcher.rewrite(query));
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
index 3556b95b0bc..19775e8d78d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
@@ -478,7 +478,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
public void testRewriteEmpty() throws Exception {
DisjunctionMaxQuery q = new DisjunctionMaxQuery(Collections.emptyList(), 0.0f);
Query rewritten = s.rewrite(q);
- Query expected = new MatchNoDocsQuery();
+ Query expected = MatchNoDocsQuery.INSTANCE;
assertEquals(expected, rewritten);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
index 8122c27173e..ecdd545779c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
@@ -447,7 +447,7 @@ public class TestDocValuesQueries extends LuceneTestCase {
QueryUtils.checkEqual(
NumericDocValuesField.newSlowRangeQuery("foo", 10, 1).rewrite(searcher),
- new MatchNoDocsQuery());
+ MatchNoDocsQuery.INSTANCE);
QueryUtils.checkEqual(
NumericDocValuesField.newSlowRangeQuery("foo", Long.MIN_VALUE, Long.MAX_VALUE)
.rewrite(searcher),
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java
index 59eacfd0589..b95162a2727 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java
@@ -89,12 +89,13 @@ public class TestDoubleValuesSource extends LuceneTestCase {
DoubleValuesSource onefield = DoubleValuesSource.fromDoubleField("onefield");
// sort decreasing
TopDocs results =
- searcher.search(new MatchAllDocsQuery(), 1, new Sort(onefield.getSortField(true)));
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(onefield.getSortField(true)));
FieldDoc first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_DOUBLE_VALUE, first.fields[0]);
// sort increasing
- results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(onefield.getSortField(false)));
+ results =
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(onefield.getSortField(false)));
first = (FieldDoc) results.scoreDocs[0];
assertEquals(0d, first.fields[0]);
}
@@ -107,30 +108,30 @@ public class TestDoubleValuesSource extends LuceneTestCase {
// sort decreasing, missing last
SortField oneFieldSort = onefield.getSortField(true, Double.MIN_VALUE);
- TopDocs results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(oneFieldSort));
+ TopDocs results = searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(oneFieldSort));
FieldDoc first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_DOUBLE_VALUE, first.fields[0]);
// sort increasing, missing last
oneFieldSort = onefield.getSortField(false, Double.MAX_VALUE);
- results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(oneFieldSort));
+ results = searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(oneFieldSort));
first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_DOUBLE_VALUE, first.fields[0]);
}
public void testSimpleFieldEquivalences() throws Exception {
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("int", SortField.Type.INT, random().nextBoolean())));
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("long", SortField.Type.LONG, random().nextBoolean())));
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("float", SortField.Type.FLOAT, random().nextBoolean())));
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("double", SortField.Type.DOUBLE, random().nextBoolean())));
}
@@ -156,7 +157,7 @@ public class TestDoubleValuesSource extends LuceneTestCase {
int n = atLeast(4);
for (int i = 0; i < n; i++) {
Sort sort = randomSort();
- checkSorts(new MatchAllDocsQuery(), sort);
+ checkSorts(MatchAllDocsQuery.INSTANCE, sort);
checkSorts(new TermQuery(new Term("english", "one")), sort);
}
}
@@ -233,7 +234,7 @@ public class TestDoubleValuesSource extends LuceneTestCase {
static final Query[] testQueries =
new Query[] {
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new TermQuery(new Term("oddeven", "odd")),
new BooleanQuery.Builder()
.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.MUST)
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java
index 68adecc044b..dd2b7f42f5a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java
@@ -58,7 +58,7 @@ public class TestEarlyTermination extends LuceneTestCase {
for (int i = 0; i < iters; ++i) {
final IndexSearcher searcher = newSearcher(reader);
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new CollectorManager<SimpleCollector, Void>() {
@Override
public SimpleCollector newCollector() {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java
index 7f6c673c401..b5fc88bcfd5 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java
@@ -108,7 +108,8 @@ public class TestFieldExistsQuery extends LuceneTestCase {
final IndexReader reader = iw.getReader();
iw.close();
- assertEquals(new MatchAllDocsQuery(), new FieldExistsQuery("dim").rewrite(newSearcher(reader)));
+ assertEquals(
+ MatchAllDocsQuery.INSTANCE, new FieldExistsQuery("dim").rewrite(newSearcher(reader)));
reader.close();
dir.close();
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
index 60981df0095..07e2ca869d0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
@@ -88,7 +88,8 @@ public class TestIndexSearcher extends LuceneTestCase {
IndexSearcher[] searchers =
new IndexSearcher[] {new IndexSearcher(reader), new IndexSearcher(reader, service)};
- Query[] queries = new Query[] {new MatchAllDocsQuery(), new TermQuery(new Term("field", "1"))};
+ Query[] queries =
+ new Query[] {MatchAllDocsQuery.INSTANCE, new TermQuery(new Term("field", "1"))};
Sort[] sorts = new Sort[] {null, new Sort(new SortField("field2", SortField.Type.STRING))};
ScoreDoc[] afters =
new ScoreDoc[] {null, new FieldDoc(0, 0f, new Object[] {newBytesRef("boo!")})};
@@ -127,7 +128,7 @@ public class TestIndexSearcher extends LuceneTestCase {
expectThrows(
IllegalArgumentException.class,
() -> {
- s.searchAfter(new ScoreDoc(r.maxDoc(), 0.54f), new MatchAllDocsQuery(), 10);
+ s.searchAfter(new ScoreDoc(r.maxDoc(), 0.54f), MatchAllDocsQuery.INSTANCE, 10);
});
IOUtils.close(r, dir);
@@ -159,8 +160,8 @@ public class TestIndexSearcher extends LuceneTestCase {
// Test multiple queries, some of them are optimized by IndexSearcher.count()
for (Query query :
Arrays.asList(
- new MatchAllDocsQuery(),
- new MatchNoDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
+ MatchNoDocsQuery.INSTANCE,
new TermQuery(new Term("foo", "bar")),
new ConstantScoreQuery(new TermQuery(new Term("foo", "baz"))),
new BooleanQuery.Builder()
@@ -289,7 +290,7 @@ public class TestIndexSearcher extends LuceneTestCase {
return slices.toArray(new LeafSlice[0]);
}
};
- searcher.search(new MatchAllDocsQuery(), 10);
+ searcher.search(MatchAllDocsQuery.INSTANCE, 10);
assertEquals(leaves.size() - 1, numExecutions.get());
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
index b69d5b03b1c..4adb4a3cb3c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
@@ -428,7 +428,7 @@ public class TestIndexSortSortedNumericDocValuesRangeQuery extends LuceneTestCas
IndexSortSortedNumericDocValuesRangeQuery rangeQuery =
(IndexSortSortedNumericDocValuesRangeQuery) rewrittenQuery;
- assertEquals(new MatchNoDocsQuery(), rangeQuery.getFallbackQuery());
+ assertEquals(MatchNoDocsQuery.INSTANCE, rangeQuery.getFallbackQuery());
writer.close();
reader.close();
@@ -536,7 +536,7 @@ public class TestIndexSortSortedNumericDocValuesRangeQuery extends LuceneTestCas
IndexSearcher searcher = newSearcher(reader);
// we use an unrealistic query that exposes its own Weight#count
- Query fallbackQuery = new MatchNoDocsQuery();
+ Query fallbackQuery = MatchNoDocsQuery.INSTANCE;
// the index is not sorted on this field, the fallback query is used
Query query = new IndexSortSortedNumericDocValuesRangeQuery("another", 1, 42, fallbackQuery);
Weight weight = query.createWeight(searcher, ScoreMode.COMPLETE, 1.0f);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java
index f89321ef5b5..a74579b4b6e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java
@@ -108,7 +108,7 @@ public class TestKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {
IndexReader reader = DirectoryReader.open(indexStore)) {
Query filter = null;
if (random().nextBoolean()) {
- filter = new MatchAllDocsQuery();
+ filter = MatchAllDocsQuery.INSTANCE;
}
AbstractKnnVectorQuery query =
new KnnFloatVectorQuery("field", new float[] {0, 1}, 10, filter);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java
index ad1e73067f6..45fbc32bd24 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java
@@ -101,7 +101,7 @@ public class TestKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
IndexReader reader = DirectoryReader.open(indexStore)) {
Query filter = null;
if (random().nextBoolean()) {
- filter = new MatchAllDocsQuery();
+ filter = MatchAllDocsQuery.INSTANCE;
}
AbstractKnnVectorQuery query = new KnnByteVectorQuery("field", new byte[] {0, 1}, 10, filter);
IndexSearcher searcher = newSearcher(reader);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
index fb577202d12..78219a11afd 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
@@ -1130,7 +1130,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
private static Query buildRandomQuery(int level) {
if (level == 10) {
// at most 10 levels
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
switch (random().nextInt(6)) {
case 0:
@@ -1154,7 +1154,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
PhraseQuery pq = new PhraseQuery(random().nextInt(2), t1.field(), t1.bytes(), t2.bytes());
return pq;
case 3:
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
case 4:
return new ConstantScoreQuery(buildRandomQuery(level + 1));
case 5:
@@ -1296,7 +1296,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
try {
// trigger an eviction
- searcher.search(new MatchAllDocsQuery(), DummyTotalHitCountCollector.createManager());
+ searcher.search(MatchAllDocsQuery.INSTANCE, DummyTotalHitCountCollector.createManager());
fail();
} catch (ConcurrentModificationException _) {
// expected
@@ -1325,7 +1325,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
searcher.setQueryCache(queryCache);
searcher.setQueryCachingPolicy(ALWAYS_CACHE);
- searcher.count(new MatchAllDocsQuery());
+ searcher.count(MatchAllDocsQuery.INSTANCE);
assertEquals(0, queryCache.getCacheCount());
assertEquals(0, queryCache.getEvictionCount());
@@ -1460,7 +1460,8 @@ public class TestLRUQueryCache extends LuceneTestCase {
LRUQueryCache cache = new LRUQueryCache(1, Long.MAX_VALUE, _ -> true, Float.POSITIVE_INFINITY);
// test that the bulk scorer is propagated when a scorer should not be cached
- Weight weight = searcher.createWeight(new MatchAllDocsQuery(), ScoreMode.COMPLETE_NO_SCORES, 1);
+ Weight weight =
+ searcher.createWeight(MatchAllDocsQuery.INSTANCE, ScoreMode.COMPLETE_NO_SCORES, 1);
weight = new WeightWrapper(weight, scorerCalled, bulkScorerCalled);
weight = cache.doCache(weight, NEVER_CACHE);
weight.bulkScorer(leaf);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java
index 53b2fd0b42d..8a5c33c46f3 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java
@@ -74,12 +74,13 @@ public class TestLongValuesSource extends LuceneTestCase {
LongValuesSource onefield = LongValuesSource.fromLongField("onefield");
// sort decreasing
TopDocs results =
- searcher.search(new MatchAllDocsQuery(), 1, new Sort(onefield.getSortField(true)));
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(onefield.getSortField(true)));
FieldDoc first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_LONG_VALUE, first.fields[0]);
// sort increasing
- results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(onefield.getSortField(false)));
+ results =
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(onefield.getSortField(false)));
first = (FieldDoc) results.scoreDocs[0];
assertEquals(0L, first.fields[0]);
}
@@ -92,24 +93,24 @@ public class TestLongValuesSource extends LuceneTestCase {
// sort decreasing, missing last
SortField oneFieldSort = onefield.getSortField(true, Long.MIN_VALUE);
- TopDocs results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(oneFieldSort));
+ TopDocs results = searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(oneFieldSort));
FieldDoc first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_LONG_VALUE, first.fields[0]);
// sort increasing, missing last
oneFieldSort = onefield.getSortField(false, Long.MAX_VALUE);
- results = searcher.search(new MatchAllDocsQuery(), 1, new Sort(oneFieldSort));
+ results = searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(oneFieldSort));
first = (FieldDoc) results.scoreDocs[0];
assertEquals(LEAST_LONG_VALUE, first.fields[0]);
}
public void testSimpleFieldEquivalences() throws Exception {
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("int", SortField.Type.INT, random().nextBoolean())));
checkSorts(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new Sort(new SortField("long", SortField.Type.LONG, random().nextBoolean())));
}
@@ -126,7 +127,7 @@ public class TestLongValuesSource extends LuceneTestCase {
int n = atLeast(4);
for (int i = 0; i < n; i++) {
Sort sort = randomSort();
- checkSorts(new MatchAllDocsQuery(), sort);
+ checkSorts(MatchAllDocsQuery.INSTANCE, sort);
checkSorts(new TermQuery(new Term("english", "one")), sort);
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
index 4d3add04865..b3029fae027 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
@@ -54,7 +54,7 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
IndexSearcher is = newSearcher(ir);
ScoreDoc[] hits;
- hits = is.search(new MatchAllDocsQuery(), 1000).scoreDocs;
+ hits = is.search(MatchAllDocsQuery.INSTANCE, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals("one", is.storedFields().document(hits[0].doc).get("key"));
assertEquals("two", is.storedFields().document(hits[1].doc).get("key"));
@@ -63,13 +63,13 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
// some artificial queries to trigger the use of skipTo():
BooleanQuery.Builder bq = new BooleanQuery.Builder();
- bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
- bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
+ bq.add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.MUST);
+ bq.add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.MUST);
hits = is.search(bq.build(), 1000).scoreDocs;
assertEquals(3, hits.length);
bq = new BooleanQuery.Builder();
- bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
+ bq.add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term("key", "three")), BooleanClause.Occur.MUST);
hits = is.search(bq.build(), 1000).scoreDocs;
assertEquals(1, hits.length);
@@ -79,7 +79,7 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
ir = DirectoryReader.open(iw);
is = newSearcher(ir);
- hits = is.search(new MatchAllDocsQuery(), 1000).scoreDocs;
+ hits = is.search(MatchAllDocsQuery.INSTANCE, 1000).scoreDocs;
assertEquals(2, hits.length);
iw.close();
@@ -88,8 +88,8 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
}
public void testEquals() {
- Query q1 = new MatchAllDocsQuery();
- Query q2 = new MatchAllDocsQuery();
+ Query q1 = MatchAllDocsQuery.INSTANCE;
+ Query q2 = MatchAllDocsQuery.INSTANCE;
assertTrue(q1.equals(q2));
}
@@ -120,14 +120,14 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
TopScoreDocCollectorManager collectorManager =
new TopScoreDocCollectorManager(10, totalHitsThreshold);
- TopDocs topDocs = singleThreadedSearcher.search(new MatchAllDocsQuery(), collectorManager);
+ TopDocs topDocs = singleThreadedSearcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
assertEquals(totalHitsThreshold + 1, topDocs.totalHits.value());
assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
IndexSearcher is = newSearcher(ir);
collectorManager = new TopScoreDocCollectorManager(10, numDocs);
- topDocs = is.search(new MatchAllDocsQuery(), collectorManager);
+ topDocs = is.search(MatchAllDocsQuery.INSTANCE, collectorManager);
assertEquals(numDocs, topDocs.totalHits.value());
assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java
index 02cc9a9f2c0..053985df5de 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java
@@ -40,7 +40,7 @@ public class TestMatchNoDocsQuery extends LuceneTestCase {
}
public void testSimple() throws Exception {
- MatchNoDocsQuery query = new MatchNoDocsQuery();
+ MatchNoDocsQuery query = MatchNoDocsQuery.INSTANCE;
assertEquals(query.toString(), "MatchNoDocsQuery(\"\")");
query = new MatchNoDocsQuery("field 'title' not found");
assertEquals(query.toString(), "MatchNoDocsQuery(\"field 'title' not found\")");
@@ -67,7 +67,7 @@ public class TestMatchNoDocsQuery extends LuceneTestCase {
assertEquals(searcher.count(query), 0);
ScoreDoc[] hits;
- hits = searcher.search(new MatchNoDocsQuery(), 1000).scoreDocs;
+ hits = searcher.search(MatchNoDocsQuery.INSTANCE, 1000).scoreDocs;
assertEquals(0, hits.length);
assertEquals(query.toString(), "MatchNoDocsQuery(\"field not found\")");
@@ -76,7 +76,7 @@ public class TestMatchNoDocsQuery extends LuceneTestCase {
bq.add(new BooleanClause(new MatchNoDocsQuery("field not found"), BooleanClause.Occur.MUST));
query = bq.build();
assertEquals(searcher.count(query), 0);
- hits = searcher.search(new MatchNoDocsQuery(), 1000).scoreDocs;
+ hits = searcher.search(MatchNoDocsQuery.INSTANCE, 1000).scoreDocs;
assertEquals(0, hits.length);
assertEquals(query.toString(), "key:five +MatchNoDocsQuery(\"field not found\")");
@@ -97,8 +97,8 @@ public class TestMatchNoDocsQuery extends LuceneTestCase {
}
public void testEquals() {
- Query q1 = new MatchNoDocsQuery();
- Query q2 = new MatchNoDocsQuery();
+ Query q1 = MatchNoDocsQuery.INSTANCE;
+ Query q2 = MatchNoDocsQuery.INSTANCE;
assertTrue(q1.equals(q2));
QueryUtils.check(q1);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java
index 1a5f54443f6..a65970de6b0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java
@@ -113,7 +113,7 @@ public class TestMultiCollector extends LuceneTestCase {
collectors.add(new TerminateAfterCollector(collector, terminateAfter));
}
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new CollectorManager<Collector, Void>() {
@Override
public Collector newCollector() {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java
index 9f6a0dffb21..fff3bc2db59 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java
@@ -94,7 +94,7 @@ public class TestMultiSliceMerge extends LuceneTestCase {
new IndexSearcher(reader1, executor1), new IndexSearcher(reader2, executor2)
};
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TopDocs topDocs1 = searchers[0].search(query, Integer.MAX_VALUE);
TopDocs topDocs2 = searchers[1].search(query, Integer.MAX_VALUE);
@@ -111,7 +111,7 @@ public class TestMultiSliceMerge extends LuceneTestCase {
new IndexSearcher(reader1, executor1), new IndexSearcher(reader2, executor2)
};
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TopDocs topDocs1 = searchers[0].search(query, Integer.MAX_VALUE);
TopDocs topDocs2 = searchers[1].search(query, Integer.MAX_VALUE);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNearest.java b/lucene/core/src/test/org/apache/lucene/search/TestNearest.java
index 10abdc8b79f..0043246a583 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestNearest.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestNearest.java
@@ -228,7 +228,7 @@ public class TestNearest extends LuceneTestCase {
// Also test with MatchAllDocsQuery, sorting by distance:
TopFieldDocs fieldDocs =
s.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
topN,
new Sort(LatLonDocValuesField.newDistanceSort("point", pointLat, pointLon)));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
index d58fa829ed6..2716ff521ef 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
@@ -102,13 +102,13 @@ public class TestNeedsScores extends LuceneTestCase {
/** when not sorting by score */
public void testSortByField() throws Exception {
- Query query = new AssertNeedsScores(new MatchAllDocsQuery(), ScoreMode.TOP_DOCS);
+ Query query = new AssertNeedsScores(MatchAllDocsQuery.INSTANCE, ScoreMode.TOP_DOCS);
assertEquals(5, searcher.search(query, 5, Sort.INDEXORDER).totalHits.value());
}
/** when sorting by score */
public void testSortByScore() throws Exception {
- Query query = new AssertNeedsScores(new MatchAllDocsQuery(), ScoreMode.TOP_SCORES);
+ Query query = new AssertNeedsScores(MatchAllDocsQuery.INSTANCE, ScoreMode.TOP_SCORES);
assertEquals(5, searcher.search(query, 5, Sort.RELEVANCE).totalHits.value());
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPatienceByteVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPatienceByteVectorQuery.java
index b361d8aaa27..810932e1212 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPatienceByteVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPatienceByteVectorQuery.java
@@ -49,7 +49,7 @@ public class TestPatienceByteVectorQuery extends BaseKnnVectorQueryTestCase {
new KnnByteVectorQuery(field, floatToBytes(query), k, queryFilter);
return wrapSeeded
? PatienceKnnVectorQuery.fromSeededQuery(
- SeededKnnVectorQuery.fromByteQuery(knnQuery, new MatchNoDocsQuery()))
+ SeededKnnVectorQuery.fromByteQuery(knnQuery, MatchNoDocsQuery.INSTANCE))
: PatienceKnnVectorQuery.fromByteQuery(knnQuery);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPatienceFloatVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPatienceFloatVectorQuery.java
index 75b60bfd36b..d0e71662f9d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPatienceFloatVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPatienceFloatVectorQuery.java
@@ -46,7 +46,7 @@ public class TestPatienceFloatVectorQuery extends BaseKnnVectorQueryTestCase {
KnnFloatVectorQuery knnQuery = new KnnFloatVectorQuery(field, query, k, queryFilter);
return wrapSeeded
? PatienceKnnVectorQuery.fromSeededQuery(
- SeededKnnVectorQuery.fromFloatQuery(knnQuery, new MatchNoDocsQuery()))
+ SeededKnnVectorQuery.fromFloatQuery(knnQuery, MatchNoDocsQuery.INSTANCE))
: PatienceKnnVectorQuery.fromFloatQuery(knnQuery);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
index 56cac4c30cd..07b98c384bf 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
@@ -184,7 +184,7 @@ public class TestSearchAfter extends LuceneTestCase {
// pages.
int n = atLeast(20);
for (int i = 0; i < n; i++) {
- assertQuery(new MatchAllDocsQuery(), null);
+ assertQuery(MatchAllDocsQuery.INSTANCE, null);
assertQuery(new TermQuery(new Term("english", "one")), null);
BooleanQuery.Builder bq = new BooleanQuery.Builder();
bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnByteVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnByteVectorQuery.java
index e6b5bd709c2..285d6e53745 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnByteVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnByteVectorQuery.java
@@ -42,7 +42,7 @@ import org.apache.lucene.util.TestVectorUtil;
public class TestSeededKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {
- private static final Query MATCH_NONE = new MatchNoDocsQuery();
+ private static final Query MATCH_NONE = MatchNoDocsQuery.INSTANCE;
@Override
AbstractKnnVectorQuery getKnnVectorQuery(String field, float[] query, int k, Query queryFilter) {
@@ -114,14 +114,14 @@ public class TestSeededKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {
Query seed =
random().nextBoolean()
? IntPoint.newRangeQuery("tag", 1, 6)
- : new MatchAllDocsQuery();
- Query filter = random().nextBoolean() ? null : new MatchAllDocsQuery();
+ : MatchAllDocsQuery.INSTANCE;
+ Query filter = random().nextBoolean() ? null : MatchAllDocsQuery.INSTANCE;
KnnByteVectorQuery byteVectorQuery =
new KnnByteVectorQuery("field", floatToBytes(randomVector(dimension)), k, filter);
Query knnQuery = SeededKnnVectorQuery.fromByteQuery(byteVectorQuery, seed);
assertEquals(0, searcher.count(knnQuery));
// No seed documents -- falls back on full approx search
- seed = new MatchNoDocsQuery();
+ seed = MatchNoDocsQuery.INSTANCE;
knnQuery = SeededKnnVectorQuery.fromByteQuery(byteVectorQuery, seed);
assertEquals(0, searcher.count(knnQuery));
}
@@ -177,8 +177,8 @@ public class TestSeededKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {
// All documents as seeds
AtomicInteger seedCalls = new AtomicInteger();
- Query seed1 = new MatchAllDocsQuery();
- Query filter = random().nextBoolean() ? null : new MatchAllDocsQuery();
+ Query seed1 = MatchAllDocsQuery.INSTANCE;
+ Query filter = random().nextBoolean() ? null : MatchAllDocsQuery.INSTANCE;
KnnByteVectorQuery byteVectorQuery =
new KnnByteVectorQuery("field", floatToBytes(randomVector(dimension)), k, filter);
AssertingSeededKnnVectorQuery query =
@@ -222,7 +222,7 @@ public class TestSeededKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {
}
// No seed documents -- falls back on full approx search
- Query seed3 = new MatchNoDocsQuery();
+ Query seed3 = MatchNoDocsQuery.INSTANCE;
query = new AssertingSeededKnnVectorQuery(byteVectorQuery, seed3, null, null);
results = searcher.search(query, n);
expected = Math.min(Math.min(n, k), reader.numDocs());
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnFloatVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnFloatVectorQuery.java
index 0f542adcc85..579a1804958 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnFloatVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSeededKnnFloatVectorQuery.java
@@ -37,7 +37,7 @@ import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.TestVectorUtil;
public class TestSeededKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
- private static final Query MATCH_NONE = new MatchNoDocsQuery();
+ private static final Query MATCH_NONE = MatchNoDocsQuery.INSTANCE;
@Override
AbstractKnnVectorQuery getKnnVectorQuery(String field, float[] query, int k, Query queryFilter) {
@@ -102,14 +102,14 @@ public class TestSeededKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
Query seed =
random().nextBoolean()
? IntPoint.newRangeQuery("tag", 1, 6)
- : new MatchAllDocsQuery();
- Query filter = random().nextBoolean() ? null : new MatchAllDocsQuery();
+ : MatchAllDocsQuery.INSTANCE;
+ Query filter = random().nextBoolean() ? null : MatchAllDocsQuery.INSTANCE;
KnnFloatVectorQuery knnFloatVectorQuery =
new KnnFloatVectorQuery("field", randomVector(dimension), k, filter);
Query knnQuery = SeededKnnVectorQuery.fromFloatQuery(knnFloatVectorQuery, seed);
assertEquals(0, searcher.count(knnQuery));
// No seed documents -- falls back on full approx search
- seed = new MatchNoDocsQuery();
+ seed = MatchNoDocsQuery.INSTANCE;
knnQuery = SeededKnnVectorQuery.fromFloatQuery(knnFloatVectorQuery, seed);
assertEquals(0, searcher.count(knnQuery));
}
@@ -165,8 +165,8 @@ public class TestSeededKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
// All documents as seeds
AtomicInteger seedCalls = new AtomicInteger();
- Query seed1 = new MatchAllDocsQuery();
- Query filter = random().nextBoolean() ? null : new MatchAllDocsQuery();
+ Query seed1 = MatchAllDocsQuery.INSTANCE;
+ Query filter = random().nextBoolean() ? null : MatchAllDocsQuery.INSTANCE;
KnnFloatVectorQuery knnFloatVectorQuery =
new KnnFloatVectorQuery("field", randomVector(dimension), k, filter);
TestSeededKnnByteVectorQuery.AssertingSeededKnnVectorQuery query =
@@ -209,7 +209,7 @@ public class TestSeededKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
}
// No seed documents -- falls back on full approx search
- Query seed3 = new MatchNoDocsQuery();
+ Query seed3 = MatchNoDocsQuery.INSTANCE;
query =
new TestSeededKnnByteVectorQuery.AssertingSeededKnnVectorQuery(
knnFloatVectorQuery, seed3, null, null);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
index 26f1a19fd77..64a4b630f97 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
@@ -42,11 +42,11 @@ public class TestSimpleExplanations extends BaseExplanationTestCase {
/* MatchAllDocs */
public void testMA1() throws Exception {
- qtest(new MatchAllDocsQuery(), new int[] {0, 1, 2, 3});
+ qtest(MatchAllDocsQuery.INSTANCE, new int[] {0, 1, 2, 3});
}
public void testMA2() throws Exception {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
qtest(new BoostQuery(q, 1000), new int[] {0, 1, 2, 3});
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSort.java b/lucene/core/src/test/org/apache/lucene/search/TestSort.java
index 4a60095560c..46b8bbe11a0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java
@@ -121,7 +121,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -149,7 +149,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'foo' comes after 'bar' in reverse order
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -177,7 +177,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -205,7 +205,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'foo' comes after 'bar' in reverse order
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -237,7 +237,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -270,7 +270,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("300000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -301,7 +301,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as a 0
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -335,7 +335,7 @@ public class TestSort extends LuceneTestCase {
SortField sortField = new SortField("value", SortField.Type.INT, false, Integer.MAX_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as a Integer.MAX_VALUE
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -368,7 +368,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -401,7 +401,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -432,7 +432,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -466,7 +466,7 @@ public class TestSort extends LuceneTestCase {
SortField sortField = new SortField("value", SortField.Type.LONG, false, Long.MAX_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as Long.MAX_VALUE
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -499,7 +499,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -532,7 +532,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -563,7 +563,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -597,7 +597,7 @@ public class TestSort extends LuceneTestCase {
SortField sortField = new SortField("value", SortField.Type.FLOAT, false, Float.MAX_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null is treated as Float.MAX_VALUE
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -634,7 +634,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(4, td.totalHits.value());
// numeric order
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -667,7 +667,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// numeric order
assertEquals("-0", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -703,7 +703,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(4, td.totalHits.value());
// numeric order
assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -741,7 +741,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(4, td.totalHits.value());
// null treated as a 0
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -783,7 +783,7 @@ public class TestSort extends LuceneTestCase {
SortField sortField = new SortField("value", SortField.Type.DOUBLE, false, Double.MAX_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(4, td.totalHits.value());
// null treated as Double.MAX_VALUE
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
@@ -834,7 +834,7 @@ public class TestSort extends LuceneTestCase {
new SortField("value1", SortField.Type.STRING),
new SortField("value2", SortField.Type.LONG));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(4, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value1"));
@@ -848,7 +848,7 @@ public class TestSort extends LuceneTestCase {
assertEquals("1", searcher.storedFields().document(td.scoreDocs[3].doc).get("value2"));
// Now with overflow
- td = searcher.search(new MatchAllDocsQuery(), 1, sort);
+ td = searcher.search(MatchAllDocsQuery.INSTANCE, 1, sort);
assertEquals(4, td.totalHits.value());
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value1"));
assertEquals("0", searcher.storedFields().document(td.scoreDocs[0].doc).get("value2"));
@@ -904,7 +904,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
assertNull(((FieldDoc) td.scoreDocs[0]).fields[0]);
assertNull(((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -940,7 +940,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
assertEquals(0, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -976,7 +976,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
assertEquals(0L, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0L, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -1012,7 +1012,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
assertEquals(0.0, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0.0, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -1048,7 +1048,7 @@ public class TestSort extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
assertEquals(0.0f, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0.0f, ((FieldDoc) td.scoreDocs[1]).fields[0]);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java
index becb84e0a5f..79b8ed6d666 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java
@@ -790,26 +790,26 @@ public class TestSortOptimization extends LuceneTestCase {
SortField longSortOnIntField = new SortField("intField", SortField.Type.LONG);
assertThrows(
IllegalArgumentException.class,
- () -> searcher.search(new MatchAllDocsQuery(), 1, new Sort(longSortOnIntField)));
+ () -> searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(longSortOnIntField)));
// assert that when sort optimization is disabled we can use LONG sort on int field
longSortOnIntField.setOptimizeSortWithIndexedData(false);
- searcher.search(new MatchAllDocsQuery(), 1, new Sort(longSortOnIntField));
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(longSortOnIntField));
SortField intSortOnLongField = new SortField("longField", SortField.Type.INT);
assertThrows(
IllegalArgumentException.class,
- () -> searcher.search(new MatchAllDocsQuery(), 1, new Sort(intSortOnLongField)));
+ () -> searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(intSortOnLongField)));
// assert that when sort optimization is disabled we can use INT sort on long field
intSortOnLongField.setOptimizeSortWithIndexedData(false);
- searcher.search(new MatchAllDocsQuery(), 1, new Sort(intSortOnLongField));
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(intSortOnLongField));
SortField intSortOnIntRangeField = new SortField("intRange", SortField.Type.INT);
assertThrows(
IllegalArgumentException.class,
- () -> searcher.search(new MatchAllDocsQuery(), 1, new Sort(intSortOnIntRangeField)));
+ () -> searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(intSortOnIntRangeField)));
// assert that when sort optimization is disabled we can use INT sort on intRange field
intSortOnIntRangeField.setOptimizeSortWithIndexedData(false);
- searcher.search(new MatchAllDocsQuery(), 1, new Sort(intSortOnIntRangeField));
+ searcher.search(MatchAllDocsQuery.INSTANCE, 1, new Sort(intSortOnIntRangeField));
reader.close();
dir.close();
@@ -897,7 +897,7 @@ public class TestSortOptimization extends LuceneTestCase {
int batch = 1 + random().nextInt(100);
Query query =
random().nextBoolean()
- ? new MatchAllDocsQuery()
+ ? MatchAllDocsQuery.INSTANCE
: LongPoint.newRangeQuery("seq_no", 0, Long.MAX_VALUE);
TopDocs topDocs = assertSearchHits(reader, query, new Sort(sortField), batch, after);
int expectedHits = Math.min(seqNos.size() - visitedHits, batch);
@@ -1181,7 +1181,7 @@ public class TestSortOptimization extends LuceneTestCase {
private TopFieldDocs assertSearchHits(DirectoryReader reader, Sort sort, int n, FieldDoc after)
throws IOException {
- return assertSearchHits(reader, new MatchAllDocsQuery(), sort, n, after);
+ return assertSearchHits(reader, MatchAllDocsQuery.INSTANCE, sort, n, after);
}
private TopFieldDocs assertSearchHits(
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
index b6a3c91a5e1..e8fa1b188e9 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
@@ -95,7 +95,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -124,7 +124,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT, true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -158,7 +158,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
"value", SortField.Type.INT, false, SortedNumericSelector.Type.MIN, Integer.MIN_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 3 comes before 5
// null comes first
@@ -194,7 +194,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
"value", SortField.Type.INT, false, SortedNumericSelector.Type.MIN, Integer.MAX_VALUE);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -223,7 +223,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -251,7 +251,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.FLOAT));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// -5 comes before -3
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -279,7 +279,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.DOUBLE));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// -5 comes before -3
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
index 48b625ea4a2..4d186144bbc 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
@@ -52,7 +52,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -82,7 +82,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", true, SortedSetSelector.Type.MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -117,7 +117,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
new SortedSetSortField("value", false, SortedSetSelector.Type.MAX, SortField.STRING_FIRST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -154,7 +154,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
new SortedSetSortField("value", false, SortedSetSelector.Type.MAX, SortField.STRING_LAST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -184,7 +184,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -215,7 +215,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MIN));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -246,7 +246,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", true, SortedSetSelector.Type.MIDDLE_MIN));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -283,7 +283,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
"value", false, SortedSetSelector.Type.MIDDLE_MIN, SortField.STRING_FIRST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -322,7 +322,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
"value", false, SortedSetSelector.Type.MIDDLE_MIN, SortField.STRING_LAST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -352,7 +352,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MIN));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -383,7 +383,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -414,7 +414,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", true, SortedSetSelector.Type.MIDDLE_MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -451,7 +451,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
"value", false, SortedSetSelector.Type.MIDDLE_MAX, SortField.STRING_FIRST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -490,7 +490,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
"value", false, SortedSetSelector.Type.MIDDLE_MAX, SortField.STRING_LAST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -520,7 +520,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir, false);
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MAX));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
index a90a7c6e1da..9b35002779a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
@@ -78,7 +78,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -107,7 +107,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", true));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -140,7 +140,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
new SortedSetSortField("value", false, SortedSetSelector.Type.MIN, SortField.STRING_FIRST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 'bar' comes before 'baz'
// null comes first
@@ -175,7 +175,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
new SortedSetSortField("value", false, SortedSetSelector.Type.MIN, SortField.STRING_LAST);
Sort sort = new Sort(sortField);
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(3, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -204,7 +204,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java
index ea378726450..b88a0a697db 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java
@@ -519,7 +519,7 @@ public class TestSynonymQuery extends LuceneTestCase {
// zero length SynonymQuery is rewritten
SynonymQuery q = new SynonymQuery.Builder("f").build();
assertTrue(q.getTerms().isEmpty());
- assertEquals(searcher.rewrite(q), new MatchNoDocsQuery());
+ assertEquals(searcher.rewrite(q), MatchNoDocsQuery.INSTANCE);
// non-boosted single term SynonymQuery is rewritten
q = new SynonymQuery.Builder("f").addTerm(new Term("f"), 1f).build();
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java b/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
index 9a72d0d7dd3..73b4a48bbaf 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
@@ -144,7 +144,7 @@ public class TestTaskExecutor extends LuceneTestCase {
};
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new CollectorManager<Collector, Void>() {
@Override
public Collector newCollector() {
@@ -218,7 +218,7 @@ public class TestTaskExecutor extends LuceneTestCase {
};
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new CollectorManager<Collector, Void>() {
@Override
public Collector newCollector() {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
index bef372ecc11..b36200e4896 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
@@ -151,7 +151,7 @@ public class TestTopDocsCollector extends LuceneTestCase {
private IndexReader reader;
private TopDocsCollector<ScoreDoc> doSearch(int numResults) throws IOException {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
IndexSearcher searcher = newSearcher(reader);
return searcher.search(q, new MyTopDocsCollectorMananger(numResults));
}
@@ -378,7 +378,7 @@ public class TestTopDocsCollector extends LuceneTestCase {
}
public void testSharedCountCollectorManager() throws Exception {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
Directory dir = newDirectory();
IndexWriter w =
new IndexWriter(dir, newIndexWriterConfig().setMergePolicy(NoMergePolicy.INSTANCE));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
index 34eaf879447..bcbc8cac50d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
@@ -105,7 +105,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
// fillFields to true.
Sort[] sort = new Sort[] {new Sort(SortField.FIELD_DOC), new Sort()};
for (int i = 0; i < sort.length; i++) {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
TopFieldCollectorManager collectorManager =
new TopFieldCollectorManager(sort[i], 10, Integer.MAX_VALUE);
@@ -121,7 +121,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
// Two Sort criteria to instantiate the multi/single comparators.
Sort[] sort = new Sort[] {new Sort(SortField.FIELD_DOC), new Sort()};
for (int i = 0; i < sort.length; i++) {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
TopFieldCollectorManager tdc =
new TopFieldCollectorManager(sort[i], 10, null, Integer.MAX_VALUE);
TopDocs td = is.search(q, tdc);
@@ -139,7 +139,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
// Two Sort criteria to instantiate the multi/single comparators.
Sort[] sort = new Sort[] {new Sort(SortField.FIELD_DOC), new Sort()};
for (int i = 0; i < sort.length; i++) {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
TopFieldCollectorManager tdc = new TopFieldCollectorManager(sort[i], 10, Integer.MAX_VALUE);
TopDocs td = singleThreadedSearcher.search(q, tdc);
@@ -158,7 +158,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
public void testSortWithoutTotalHitTracking() throws Exception {
Sort sort = new Sort(SortField.FIELD_DOC);
for (int i = 0; i < 2; i++) {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
// check that setting trackTotalHits to false does not throw an NPE because
// the index is not sorted
TopFieldCollectorManager manager;
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
index 52f313b3dfd..d56463468c3 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
@@ -141,7 +141,7 @@ public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
FieldDoc after;
if (paging) {
assert searcher.getIndexReader().numDocs() > 0;
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 10, sort);
after = (FieldDoc) td.scoreDocs[td.scoreDocs.length - 1];
} else {
after = null;
@@ -155,7 +155,7 @@ public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
if (random().nextBoolean()) {
query = new TermQuery(new Term("s", RandomPicks.randomFrom(random(), terms)));
} else {
- query = new MatchAllDocsQuery();
+ query = MatchAllDocsQuery.INSTANCE;
}
TopDocs td1 = searcher.search(query, manager1);
TopDocs td2 = searcher.search(query, manager2);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
index 7ad1d2bacc2..85e5cfdf0ba 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
@@ -45,7 +45,7 @@ public class TestTotalHitCountCollector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(reader, true, true, concurrency);
final TotalHitCountCollectorManager collectorManager =
new TotalHitCountCollectorManager(searcher.getSlices());
- int totalHits = searcher.search(new MatchAllDocsQuery(), collectorManager);
+ int totalHits = searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
assertEquals(5, totalHits);
Query query =
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java
index a9076ba519a..0ddb1271ada 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java
@@ -39,7 +39,7 @@ public class TestUsageTrackingFilterCachingPolicy extends LuceneTestCase {
}
public void testNeverCacheMatchAll() throws Exception {
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
UsageTrackingQueryCachingPolicy policy = new UsageTrackingQueryCachingPolicy();
for (int i = 0; i < 1000; ++i) {
policy.onUse(q);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java
index 27d1aba7528..626e4ad0c5e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java
@@ -67,7 +67,7 @@ public class TestXYPointDistanceSort extends LuceneTestCase {
iw.close();
Sort sort = new Sort(XYDocValuesField.newDistanceSort("location", 40.7143528f, -74.0059731f));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(d2, (Double) d.fields[0], 0.0D);
@@ -106,7 +106,7 @@ public class TestXYPointDistanceSort extends LuceneTestCase {
iw.close();
Sort sort = new Sort(XYDocValuesField.newDistanceSort("location", 40.7143528f, -74.0059731f));
- TopDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(d2, (Double) d.fields[0], 0.0D);
@@ -239,7 +239,7 @@ public class TestXYPointDistanceSort extends LuceneTestCase {
SortField distanceSort = XYDocValuesField.newDistanceSort("field", x, y);
Sort sort = new Sort(distanceSort, new SortField("id", SortField.Type.INT));
- TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), topN, sort);
+ TopDocs topDocs = searcher.search(MatchAllDocsQuery.INSTANCE, topN, sort);
for (int resultNumber = 0; resultNumber < topN; resultNumber++) {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[resultNumber];
Result actual = new Result((Integer) fieldDoc.fields[1], (Double) fieldDoc.fields[0]);
@@ -250,7 +250,8 @@ public class TestXYPointDistanceSort extends LuceneTestCase {
if (topN < reader.maxDoc()) {
int page2 = TestUtil.nextInt(random(), 1, reader.maxDoc() - topN);
TopDocs topDocs2 =
- searcher.searchAfter(topDocs.scoreDocs[topN - 1], new MatchAllDocsQuery(), page2, sort);
+ searcher.searchAfter(
+ topDocs.scoreDocs[topN - 1], MatchAllDocsQuery.INSTANCE, page2, sort);
for (int resultNumber = 0; resultNumber < page2; resultNumber++) {
FieldDoc fieldDoc = (FieldDoc) topDocs2.scoreDocs[resultNumber];
Result actual = new Result((Integer) fieldDoc.fields[1], (Double) fieldDoc.fields[0]);
diff --git a/lucene/core/src/test/org/apache/lucene/search/comparators/TestNumericComparator.java b/lucene/core/src/test/org/apache/lucene/search/comparators/TestNumericComparator.java
index 28c548be08a..2a536c3037b 100644
--- a/lucene/core/src/test/org/apache/lucene/search/comparators/TestNumericComparator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/comparators/TestNumericComparator.java
@@ -141,7 +141,7 @@ public class TestNumericComparator extends LuceneTestCase {
{
var sortField =
new SortField("long_field_1", SortField.Type.LONG, false, Long.MIN_VALUE);
- var topDocs = indexSearcher.search(new MatchAllDocsQuery(), 3, new Sort(sortField));
+ var topDocs = indexSearcher.search(MatchAllDocsQuery.INSTANCE, 3, new Sort(sortField));
assertEquals(numDocs, topDocs.scoreDocs[0].doc);
assertEquals(Long.MIN_VALUE, ((FieldDoc) topDocs.scoreDocs[0]).fields[0]);
assertEquals(0, topDocs.scoreDocs[1].doc);
@@ -152,7 +152,7 @@ public class TestNumericComparator extends LuceneTestCase {
{
var sortField =
new SortField("long_field_2", SortField.Type.LONG, false, Long.MIN_VALUE);
- var topDocs = indexSearcher.search(new MatchAllDocsQuery(), 3, new Sort(sortField));
+ var topDocs = indexSearcher.search(MatchAllDocsQuery.INSTANCE, 3, new Sort(sortField));
assertEquals(numDocs, topDocs.scoreDocs[0].doc);
assertEquals(Long.MIN_VALUE, ((FieldDoc) topDocs.scoreDocs[0]).fields[0]);
assertEquals(0, topDocs.scoreDocs[1].doc);
@@ -189,7 +189,7 @@ public class TestNumericComparator extends LuceneTestCase {
indexSearcher.setQueryCache(null);
for (String field : new String[] {"field_1", "field_2"}) {
var sortField = new SortField(field, SortField.Type.LONG, false);
- var topDocs = indexSearcher.search(new MatchAllDocsQuery(), 3, new Sort(sortField));
+ var topDocs = indexSearcher.search(MatchAllDocsQuery.INSTANCE, 3, new Sort(sortField));
assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
assertEquals(numDocs, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs[0].doc);
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
index cd1084acb31..f121b37ee6a 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
@@ -103,7 +103,7 @@ public class AssociationsFacetsExample {
// you'd use a "normal" query:
FacetsCollectorManager.FacetsResult facetsResult =
FacetsCollectorManager.search(
- searcher, new MatchAllDocsQuery(), 10, new FacetsCollectorManager());
+ searcher, MatchAllDocsQuery.INSTANCE, 10, new FacetsCollectorManager());
FacetsCollector fc = facetsResult.facetsCollector();
Facets tags =
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/CustomFacetSetExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/CustomFacetSetExample.java
index ba157c6c8f9..a1678d50e23 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/CustomFacetSetExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/CustomFacetSetExample.java
@@ -127,7 +127,8 @@ public class CustomFacetSetExample {
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc =
+ searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Count both "May 2022, 100 degrees" and "July 2022, 120 degrees" dimensions
Facets facets =
@@ -159,7 +160,8 @@ public class CustomFacetSetExample {
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc =
+ searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Match documents whose "day" field is either "May 2022" or "July 2022"
Query dateQuery =
@@ -209,7 +211,8 @@ public class CustomFacetSetExample {
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc =
+ searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Count 80-100 degrees
Facets facets =
@@ -239,7 +242,8 @@ public class CustomFacetSetExample {
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc =
+ searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Count 80-100 degrees
Facets facets =
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 cd49c08dc04..fed35175a55 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
@@ -215,7 +215,7 @@ public class DistanceFacetsExample implements Closeable {
/** User runs a query and counts facets. */
public FacetResult search() throws IOException {
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.java
index 5b188d42927..4a271d3b7dc 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.java
@@ -122,7 +122,8 @@ public class DynamicRangeFacetsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
try (ExecutorService executor =
Executors.newFixedThreadPool(2, new NamedThreadFactory("dynamic-ranges"))) {
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
index 059d5505ace..9e1da8709c2 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
@@ -104,7 +104,8 @@ public class ExpressionAggregationFacetsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
// Retrieve results
Facets facets =
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
index fd21cd809ae..8423a66e9bd 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
@@ -104,7 +104,8 @@ public class MultiCategoryListsFacetsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
// Retrieve results
List<FacetResult> results = new ArrayList<>();
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
index b61096215e6..19211d04fcc 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
@@ -121,7 +121,7 @@ public class RangeFacetsExample implements Closeable {
// you'd use a "normal" query:
FacetsCollector fc =
FacetsCollectorManager.search(
- searcher, new MatchAllDocsQuery(), 10, new FacetsCollectorManager())
+ searcher, MatchAllDocsQuery.INSTANCE, 10, new FacetsCollectorManager())
.facetsCollector();
Facets facets = new LongRangeFacetCounts("timestamp", fc, PAST_HOUR, PAST_SIX_HOURS, PAST_DAY);
@@ -138,7 +138,8 @@ public class RangeFacetsExample implements Closeable {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
Facets facets = new LongRangeFacetCounts("error timestamp", fc, logTimestampRanges);
return facets.getTopChildren(10, "error timestamp");
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SandboxFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SandboxFacetsExample.java
index 7d1aa8221f4..e4115422b2d 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SandboxFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SandboxFacetsExample.java
@@ -167,7 +167,7 @@ public class SandboxFacetsExample {
new FacetOrchestrator()
.addBuilder(authorFacetBuilder)
.addBuilder(priceFacetBuilder)
- .collect(new MatchAllDocsQuery(), searcher, hitsCollectorManager);
+ .collect(MatchAllDocsQuery.INSTANCE, searcher, hitsCollectorManager);
System.out.println(
"Search results: totalHits: "
+ topDocs.totalHits
@@ -245,11 +245,11 @@ public class SandboxFacetsExample {
// FacetFieldCollectorManager<>(publishDateCutter, publishDateRecorder);
// MultiCollectorManager drillDownCollectorManager = new
// MultiCollectorManager(authorCollectorManager, publishDateCollectorManager);
- // Object[] results = searcher.search(new MatchAllDocsQuery(), drillDownCollectorManager);
+ // Object[] results = searcher.search(MatchAllDocsQuery.INSTANCE, drillDownCollectorManager);
//// (3) search
// Search returns the same Recorder we created - so we can ignore results
- searcher.search(new MatchAllDocsQuery(), collectorManager);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
//// (4) Get top 10 results by count for Author and Publish Date
// This object is used to get topN results by count
@@ -318,7 +318,7 @@ public class SandboxFacetsExample {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- searcher.search(new MatchAllDocsQuery(), collectorManager);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
RangeOrdToLabel ordToLabels = new RangeOrdToLabel(inputRanges);
ComparableSupplier<ComparableUtils.ByCountComparable> countComparable =
@@ -362,7 +362,7 @@ public class SandboxFacetsExample {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- searcher.search(new MatchAllDocsQuery(), collectorManager);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
RangeOrdToLabel ordToLabels = new RangeOrdToLabel(inputRanges);
ComparableSupplier<ComparableUtils.ByCountComparable> countComparable =
@@ -424,7 +424,7 @@ public class SandboxFacetsExample {
FacetFieldCollectorManager<MultiFacetsRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, multiFacetsRecorder);
- searcher.search(new MatchAllDocsQuery(), collectorManager);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
RangeOrdToLabel ordToLabels = new RangeOrdToLabel(inputRanges);
// Get recorded ords - use either count/aggregations recorder
@@ -499,7 +499,7 @@ public class SandboxFacetsExample {
new MultiCollectorManager(hitsCollectorManager, taxoFacetsCollectorManager);
//// (3) search
- Object[] results = searcher.search(new MatchAllDocsQuery(), collectorManager);
+ Object[] results = searcher.search(MatchAllDocsQuery.INSTANCE, collectorManager);
TopDocs topDocs = (TopDocs) results[0];
System.out.println(
"Search results: totalHits: "
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 5585e431e06..6f498d8c529 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
@@ -105,7 +105,8 @@ public class SimpleFacetsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
// Retrieve results
List<FacetResult> results = new ArrayList<>();
@@ -129,7 +130,7 @@ public class SimpleFacetsExample {
// MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Retrieve results
List<FacetResult> results = new ArrayList<>();
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
index cdb64a822bb..3ff6d0a5bf2 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
@@ -99,7 +99,8 @@ public class SimpleSortedSetFacetsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
// Retrieve results
Facets facets = new SortedSetDocValuesFacetCounts(state, fc);
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/StringValueFacetCountsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/StringValueFacetCountsExample.java
index cd848d24afb..314503fc47b 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/StringValueFacetCountsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/StringValueFacetCountsExample.java
@@ -103,7 +103,8 @@ public class StringValueFacetCountsExample {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query:
FacetsCollector fc =
- FacetsCollectorManager.search(searcher, new MatchAllDocsQuery(), 10, fcm).facetsCollector();
+ FacetsCollectorManager.search(searcher, MatchAllDocsQuery.INSTANCE, 10, fcm)
+ .facetsCollector();
// Retrieve results
Facets authorFacets = new StringValueFacetCounts(authorState, fc);
diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
index 592d1a0471b..11b06446357 100644
--- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
+++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
@@ -218,7 +218,7 @@ public class TestDemoExpressions extends LuceneTestCase {
bindings.add("latitude", DoubleValuesSource.fromDoubleField("latitude"));
bindings.add("longitude", DoubleValuesSource.fromDoubleField("longitude"));
Sort sort = new Sort(distance.getSortField(bindings, false));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(0.4621D, (Double) d.fields[0], 1E-1);
@@ -237,7 +237,7 @@ public class TestDemoExpressions extends LuceneTestCase {
bindings.add("latitude", DoubleValuesSource.fromDoubleField("latitude"));
bindings.add("longitude", DoubleValuesSource.fromDoubleField("longitude"));
Sort sort = new Sort(distance.getSortField(bindings, false));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(462.1D, (Double) d.fields[0], 1E-1);
@@ -254,7 +254,7 @@ public class TestDemoExpressions extends LuceneTestCase {
SimpleBindings bindings = new SimpleBindings();
bindings.add("doc['popularity'].value", DoubleValuesSource.fromIntField("popularity"));
Sort sort = new Sort(popularity.getSortField(bindings, true));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(20D, (Double) d.fields[0], 1E-4);
@@ -307,7 +307,7 @@ public class TestDemoExpressions extends LuceneTestCase {
}
};
Sort sort = new Sort(popularity.getSortField(bindings, false));
- TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
+ TopFieldDocs td = searcher.search(MatchAllDocsQuery.INSTANCE, 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(2092D, (Double) d.fields[0], 1E-4);
diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
index ac3b6959d51..33e2a8b9437 100644
--- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
+++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
@@ -84,7 +84,7 @@ public class TestExpressionSorts extends LuceneTestCase {
public void testQueries() throws Exception {
int n = atLeast(1);
for (int i = 0; i < n; i++) {
- assertQuery(new MatchAllDocsQuery());
+ assertQuery(MatchAllDocsQuery.INSTANCE);
assertQuery(new TermQuery(new Term("english", "one")));
BooleanQuery.Builder bq = new BooleanQuery.Builder();
bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD);
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java
index 6f3b1d572d3..158a4b87513 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java
@@ -78,7 +78,7 @@ public final class DrillDownQuery extends Query {
DrillDownQuery(FacetsConfig config, Query filter, DrillDownQuery other) {
this.baseQuery =
new BooleanQuery.Builder()
- .add(other.baseQuery == null ? new MatchAllDocsQuery() : other.baseQuery, Occur.MUST)
+ .add(other.baseQuery == null ? MatchAllDocsQuery.INSTANCE : other.baseQuery, Occur.MUST)
.add(filter, Occur.FILTER)
.build();
this.dimQueries.addAll(other.dimQueries);
@@ -159,7 +159,7 @@ public final class DrillDownQuery extends Query {
public Query rewrite(IndexSearcher indexSearcher) throws IOException {
BooleanQuery rewritten = getBooleanQuery();
if (rewritten.clauses().isEmpty()) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
return rewritten;
}
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java
index 576aa84d51f..41ce1e218c4 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java
@@ -456,7 +456,7 @@ public class DrillSideways {
if (baseQuery == null) {
// TODO: we could optimize this pure-browse case by
// making a custom scorer instead:
- baseQuery = new MatchAllDocsQuery();
+ baseQuery = MatchAllDocsQuery.INSTANCE;
}
Query[] drillDownQueries = query.getDrillDownQueries();
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
index 5501744fbe7..6b66d7da42b 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
@@ -243,7 +243,7 @@ public class TestDrillDownQuery extends FacetTestCase {
}
public void testClone() throws Exception {
- DrillDownQuery q = new DrillDownQuery(config, new MatchAllDocsQuery());
+ DrillDownQuery q = new DrillDownQuery(config, MatchAllDocsQuery.INSTANCE);
q.add("a");
DrillDownQuery clone = q.clone();
@@ -255,7 +255,7 @@ public class TestDrillDownQuery extends FacetTestCase {
}
public void testNoDrillDown() throws Exception {
- Query base = new MatchAllDocsQuery();
+ Query base = MatchAllDocsQuery.INSTANCE;
DrillDownQuery q = new DrillDownQuery(config, base);
IndexSearcher searcher = newSearcher(reader);
Query rewrite = q.rewrite(searcher).rewrite(searcher);
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
index 74205522451..1d36b409a21 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
@@ -275,7 +275,7 @@ public class TestDrillSideways extends FacetTestCase {
IndexSearcher searcher = new IndexSearcher(r);
LeafReaderContext ctx = r.leaves().get(0);
- Query baseQuery = new MatchAllDocsQuery();
+ Query baseQuery = MatchAllDocsQuery.INSTANCE;
Weight baseWeight = searcher.createWeight(baseQuery, ScoreMode.COMPLETE_NO_SCORES, 1f);
Scorer baseScorer = baseWeight.scorer(ctx);
@@ -402,7 +402,7 @@ public class TestDrillSideways extends FacetTestCase {
TaxonomyReader taxoR = new DirectoryTaxonomyReader(taxoW)) {
IndexSearcher searcher = new DrillSidewaysAssertingIndexSearcher(r);
- Query baseQuery = new MatchAllDocsQuery();
+ Query baseQuery = MatchAllDocsQuery.INSTANCE;
DrillDownQuery ddq = new DrillDownQuery(facetsConfig, baseQuery);
ddq.add("foo", "bar");
DrillSideways drillSideways = new DrillSideways(searcher, facetsConfig, taxoR);
@@ -811,7 +811,7 @@ public class TestDrillSideways extends FacetTestCase {
assertNull(r.facets.getTopChildren(10, "Author"));
// Test no drill down dims:
- ddq = new DrillDownQuery(config, new MatchAllDocsQuery());
+ ddq = new DrillDownQuery(config, MatchAllDocsQuery.INSTANCE);
r = ds.search(ddq, manager);
assertEquals(5, r.collectorResult.size());
assertEquals(
@@ -822,7 +822,7 @@ public class TestDrillSideways extends FacetTestCase {
r.facets.getTopChildren(10, "Author").toString());
// Test no drill down dims with null FacetsCollectorManager for the main query:
- ddq = new DrillDownQuery(config, new MatchAllDocsQuery());
+ ddq = new DrillDownQuery(config, MatchAllDocsQuery.INSTANCE);
r =
new DrillSideways(searcher, config, taxoReader) {
@Override
@@ -1271,7 +1271,7 @@ public class TestDrillSideways extends FacetTestCase {
Query baseQuery;
if (contentToken == null) {
- baseQuery = new MatchAllDocsQuery();
+ baseQuery = MatchAllDocsQuery.INSTANCE;
} else {
baseQuery = new TermQuery(new Term("content", contentToken));
}
@@ -1461,7 +1461,7 @@ public class TestDrillSideways extends FacetTestCase {
// Creating a query that matches nothing to make sure #finish still gets called on all
// facet collectors:
- Query baseQuery = new MatchNoDocsQuery();
+ Query baseQuery = MatchNoDocsQuery.INSTANCE;
DrillDownQuery ddq = new DrillDownQuery(facetsConfig, baseQuery);
ddq.add("foo", "bar");
DrillSideways drillSideways =
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 0f018ea9a8f..ff71b5bdeab 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
@@ -73,7 +73,7 @@ public class TestFacetUtils extends LuceneTestCase {
}
IndexSearcher searcher = newSearcher(writer.getReader());
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = searcher.search(MatchAllDocsQuery.INSTANCE, 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 590ed65ead1..3133a52466f 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
@@ -73,7 +73,7 @@ public class TestFacetsConfig extends FacetTestCase {
DirectoryReader indexReader = DirectoryReader.open(indexDir);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = searcher.search(MatchAllDocsQuery.INSTANCE, 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 a049b96012c..936113f825b 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
@@ -59,7 +59,7 @@ public class TestLongValueFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
@@ -141,7 +141,7 @@ public class TestLongValueFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
@@ -191,7 +191,7 @@ public class TestLongValueFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = new LongValueFacetCounts("field", fc);
@@ -293,7 +293,7 @@ public class TestLongValueFacetCounts extends FacetTestCase {
LongValueFacetCounts facetCounts;
if (random().nextBoolean()) {
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
if (random().nextBoolean()) {
if (VERBOSE) {
System.out.println(" use value source");
@@ -583,7 +583,7 @@ public class TestLongValueFacetCounts extends FacetTestCase {
LongValueFacetCounts facetCounts;
if (random().nextBoolean()) {
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
if (VERBOSE) {
System.out.println(" use doc values");
}
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java
index 9ba77a87153..5cd0c11905e 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java
@@ -332,7 +332,7 @@ public class TestMultipleIndexFields extends FacetTestCase {
private FacetsCollector performSearch(IndexSearcher searcher) throws IOException {
return FacetsCollectorManager.search(
- searcher, new MatchAllDocsQuery(), 10, new FacetsCollectorManager())
+ searcher, MatchAllDocsQuery.INSTANCE, 10, new FacetsCollectorManager())
.facetsCollector();
}
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 60d3f1e63db..e24c6324781 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
@@ -100,7 +100,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
writer.close();
FacetsCollector facetsCollector =
- searcher.search(new MatchNoDocsQuery(), new FacetsCollectorManager());
+ searcher.search(MatchNoDocsQuery.INSTANCE, new FacetsCollectorManager());
StringDocValuesReaderState state =
new StringDocValuesReaderState(searcher.getIndexReader(), "field");
@@ -335,7 +335,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
IndexSearcher searcher = newSearcher(writer.getReader());
writer.close();
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// using a stale state
expectThrows(IllegalStateException.class, () -> new StringValueFacetCounts(state, c));
@@ -415,7 +415,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
int... topNs)
throws IOException {
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
for (int topN : topNs) {
@@ -518,7 +518,7 @@ public class TestStringValueFacetCounts extends FacetTestCase {
StringDocValuesReaderState state)
throws IOException {
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
StringValueFacetCounts facets;
// should get the same result whether-or-not we provide a FacetsCollector since it's doing
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestExactFacetSetMatcher.java b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestExactFacetSetMatcher.java
index 964a41a309d..da1e92174e1 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestExactFacetSetMatcher.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestExactFacetSetMatcher.java
@@ -72,7 +72,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -134,7 +134,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -196,7 +196,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -258,7 +258,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -320,7 +320,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -385,7 +385,7 @@ public class TestExactFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery =
new BooleanQuery.Builder()
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestMatchingFacetSetsCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestMatchingFacetSetsCounts.java
index 781efc5150f..34c66de7e0b 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestMatchingFacetSetsCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestMatchingFacetSetsCounts.java
@@ -53,7 +53,7 @@ public class TestMatchingFacetSetsCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -86,7 +86,7 @@ public class TestMatchingFacetSetsCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
expectThrows(
AssertionError.class,
@@ -142,7 +142,7 @@ public class TestMatchingFacetSetsCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts("field", fc, FacetSetDecoder::decodeLongs, facetSetMatchers);
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestRangeFacetSetMatcher.java b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestRangeFacetSetMatcher.java
index 2191f4b4a1d..8a4e004e561 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestRangeFacetSetMatcher.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/facetset/TestRangeFacetSetMatcher.java
@@ -100,7 +100,7 @@ public class TestRangeFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -184,7 +184,7 @@ public class TestRangeFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -268,7 +268,7 @@ public class TestRangeFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -360,7 +360,7 @@ public class TestRangeFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new MatchingFacetSetsCounts(
@@ -455,7 +455,7 @@ public class TestRangeFacetSetMatcher extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery =
new BooleanQuery.Builder()
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 d5f57bd827c..4849d5f24a3 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
@@ -89,7 +89,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -142,7 +142,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -200,7 +200,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -245,7 +245,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -312,7 +312,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -356,7 +356,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
@@ -395,7 +395,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = new LongRangeFacetCounts("field", fc);
@@ -426,7 +426,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = new LongRangeFacetCounts("field", fc);
@@ -576,7 +576,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
"field",
@@ -615,7 +615,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
"field",
@@ -667,7 +667,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeFacetCounts(
@@ -801,7 +801,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1018,7 +1018,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1181,7 +1181,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchFilter;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1361,7 +1361,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchFilter;
if (random().nextBoolean()) {
if (random().nextBoolean()) {
@@ -1445,7 +1445,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
"field",
@@ -1490,7 +1490,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeFacetCounts(
"field",
@@ -1656,7 +1656,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
// DrillSideways requires the entire range of docs to be scored at once, so it doesn't support
// timeouts whose implementation scores one window of doc IDs at a time.
s.setTimeout(null);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
final DoubleRange[] ranges =
new DoubleRange[] {
@@ -1672,7 +1672,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
final AtomicBoolean filterWasUsed = new AtomicBoolean();
if (random().nextBoolean()) {
// Sort of silly:
- final Query in = new MatchAllDocsQuery();
+ final Query in = MatchAllDocsQuery.INSTANCE;
fastMatchFilter = new UsedQuery(in, filterWasUsed);
} else {
fastMatchFilter = null;
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/rangeonrange/TestRangeOnRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/rangeonrange/TestRangeOnRangeFacetCounts.java
index 9cdadc8ae30..95aa89b3258 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/rangeonrange/TestRangeOnRangeFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/rangeonrange/TestRangeOnRangeFacetCounts.java
@@ -76,7 +76,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -129,7 +129,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -182,7 +182,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -247,7 +247,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -326,7 +326,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -379,7 +379,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -440,7 +440,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
@@ -707,7 +707,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeOnRangeFacetCounts(
@@ -754,7 +754,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
w.close();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new DoubleRangeOnRangeFacetCounts(
@@ -903,7 +903,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
fastMatchQuery =
@@ -1061,7 +1061,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
fastMatchQuery =
@@ -1219,7 +1219,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
fastMatchQuery =
@@ -1378,7 +1378,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
}
}
- FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Query fastMatchQuery;
if (random().nextBoolean()) {
fastMatchQuery =
@@ -1446,7 +1446,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
- FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = s.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new LongRangeOnRangeFacetCounts(
"field",
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 7c03c461613..4002c5fe0a0 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
@@ -971,7 +971,7 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
IndexSearcher searcher = newSearcher(r2);
FacetsCollector c =
- searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
expectThrows(
IllegalStateException.class, () -> new SortedSetDocValuesFacetCounts(state, c));
@@ -1851,7 +1851,7 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
IndexSearcher searcher, SortedSetDocValuesReaderState state, ExecutorService exec)
throws IOException, InterruptedException {
if (random().nextBoolean()) {
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
if (exec != null) {
return new ConcurrentSortedSetDocValuesFacetCounts(state, c, exec);
} else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java
index 3f04363015d..afcb9c8aab3 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java
@@ -92,7 +92,7 @@ public class TestOrdinalMappingLeafReader extends FacetTestCase {
FacetsCollector collector =
FacetsCollectorManager.search(
- searcher, new MatchAllDocsQuery(), 10, new FacetsCollectorManager())
+ searcher, MatchAllDocsQuery.INSTANCE, 10, new FacetsCollectorManager())
.facetsCollector();
// tag facets
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 551ef45e9b4..6a055d42819 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
@@ -197,7 +197,7 @@ public class TestSearcherTaxonomyManager extends FacetTestCase {
try {
// System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
FacetsCollector sfc =
- pair.searcher().search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ pair.searcher().search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(pair.taxonomyReader(), config, sfc);
FacetResult result = facets.getTopChildren(10, "field");
if (pair.searcher().getIndexReader().numDocs() > 0) {
@@ -252,7 +252,7 @@ public class TestSearcherTaxonomyManager extends FacetTestCase {
try {
// System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
FacetsCollector sfc =
- pair.searcher().search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ pair.searcher().search(MatchAllDocsQuery.INSTANCE, 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 f8a47dd7884..9a78c2f1d46 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
@@ -548,7 +548,7 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
IOUtils.close(taxoWriter, writer);
IndexSearcher searcher = newSearcher(reader);
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
FacetsCollector fc = searcher.search(q, new FacetsCollectorManager());
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
@@ -597,7 +597,7 @@ public class TestTaxonomyFacetAssociations extends FacetTestCase {
IOUtils.close(taxoWriter, writer);
IndexSearcher searcher = newSearcher(reader);
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
FacetsCollector fc = searcher.search(q, new FacetsCollectorManager());
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
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 ec164b98fe5..4480946f147 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
@@ -294,7 +294,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Uses default $facets field:
Facets facets = new FastTaxonomyFacetCounts(taxoReader, config, c);
@@ -635,7 +635,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
FacetsCollector sfc =
- newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ newSearcher(r).search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets1 = getTaxonomyFacetCounts(taxoReader, config, sfc);
Facets facets2 = getTaxonomyFacetCounts(taxoReader, config, sfc, "$b");
assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
@@ -1118,7 +1118,7 @@ public class TestTaxonomyFacetCounts extends FacetTestCase {
// 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:
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, 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 213b2d4bdd6..dcb5df665ce 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
@@ -294,7 +294,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
@@ -335,7 +335,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
@@ -359,7 +359,7 @@ public class TestTaxonomyFacetCounts2 extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = newSearcher(indexReader);
- FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector sfc = searcher.search(MatchAllDocsQuery.INSTANCE, 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 e452abc1748..ba5101d59d3 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
@@ -149,7 +149,7 @@ public class TestTaxonomyFacetLabels extends FacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector fc = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
TaxonomyFacetLabels taxoLabels =
new TaxonomyFacetLabels(taxoReader, FacetsConfig.DEFAULT_INDEX_FIELD_NAME);
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 3cea228fc84..f5d07695690 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
@@ -110,7 +110,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
// for all non-deleted docs in the index); normally
// you'd use a "normal" query and one of the
// Facets.search utility methods:
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
FacetsConfig facetsConfig = new FacetsConfig();
DoubleValuesSource valuesSource = DoubleValuesSource.fromIntField("num");
@@ -189,7 +189,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
taxoWriter.close();
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new TaxonomyFacetFloatAssociations(
@@ -264,7 +264,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
taxoWriter.close();
- FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ FacetsCollector c = searcher.search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
Facets facets =
new TaxonomyFacetFloatAssociations(
@@ -309,7 +309,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
DirectoryReader r = DirectoryReader.open(iw);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- BoostQuery csq = new BoostQuery(new ConstantScoreQuery(new MatchAllDocsQuery()), 2f);
+ BoostQuery csq = new BoostQuery(new ConstantScoreQuery(MatchAllDocsQuery.INSTANCE), 2f);
FacetsCollectorManager.FacetsResult facetsResult =
FacetsCollectorManager.search(newSearcher(r), csq, 10, new FacetsCollectorManager(true));
@@ -353,7 +353,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
FacetsCollector sfc =
- newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ newSearcher(r).search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Test SUM:
Facets facets =
@@ -455,7 +455,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
FacetsCollector sfc =
- newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ newSearcher(r).search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
// Test SUM:
Facets facets =
new TaxonomyFacetFloatAssociations(
@@ -507,7 +507,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
FacetsCollector sfc =
- newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
+ newSearcher(r).search(MatchAllDocsQuery.INSTANCE, new FacetsCollectorManager());
TaxonomyFacets facets =
new TaxonomyFacetFloatAssociations(
@@ -547,7 +547,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
FacetsCollector fc =
FacetsCollectorManager.search(
- newSearcher(r), new MatchAllDocsQuery(), 10, new FacetsCollectorManager(true))
+ newSearcher(r), MatchAllDocsQuery.INSTANCE, 10, new FacetsCollectorManager(true))
.facetsCollector();
assertTrue(fc.getKeepScores());
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java
index 3b5125fe70c..55be14f14d5 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java
@@ -50,7 +50,7 @@ public class TestDoubleRangeGroupSelector extends BaseGroupSelectorTestCase<Doub
protected Query filterQuery(DoubleRange groupValue) {
if (groupValue == null) {
return new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.FILTER)
.add(new FieldExistsQuery("double"), BooleanClause.Occur.MUST_NOT)
.build();
}
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java
index 96aa92c4a9b..5e8d1ca9cd8 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java
@@ -109,7 +109,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
groupedAirportFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "airport_dv" : "airport", null, false);
- indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedAirportFacetCollector);
int maxOffset = 5;
airportResult =
groupedAirportFacetCollector.mergeSegmentResults(
@@ -137,7 +137,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
GroupFacetCollector groupedDurationFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "duration_dv" : "duration", null, false);
- indexSearcher.search(new MatchAllDocsQuery(), groupedDurationFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedDurationFacetCollector);
TermGroupFacetCollector.GroupedFacetResult durationResult =
groupedDurationFacetCollector.mergeSegmentResults(10, 0, false);
assertEquals(4, durationResult.getTotalCount());
@@ -186,7 +186,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
groupedAirportFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "airport_dv" : "airport", null, !useDv);
- indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedAirportFacetCollector);
airportResult = groupedAirportFacetCollector.mergeSegmentResults(3, 0, true);
entries = airportResult.getFacetEntries(1, 2);
assertEquals(2, entries.size());
@@ -209,7 +209,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
groupedDurationFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "duration_dv" : "duration", null, false);
- indexSearcher.search(new MatchAllDocsQuery(), groupedDurationFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedDurationFacetCollector);
durationResult = groupedDurationFacetCollector.mergeSegmentResults(10, 2, true);
assertEquals(5, durationResult.getTotalCount());
assertEquals(0, durationResult.getTotalMissingCount());
@@ -238,7 +238,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
groupedAirportFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "airport_dv" : "airport", null, false);
- indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedAirportFacetCollector);
airportResult = groupedAirportFacetCollector.mergeSegmentResults(10, 0, false);
entries = airportResult.getFacetEntries(0, 10);
if (useDv) {
@@ -268,7 +268,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
groupedDurationFacetCollector =
createRandomCollector(
useDv ? "hotel_dv" : "hotel", useDv ? "duration_dv" : "duration", "1", false);
- indexSearcher.search(new MatchAllDocsQuery(), groupedDurationFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedDurationFacetCollector);
durationResult = groupedDurationFacetCollector.mergeSegmentResults(10, 0, true);
assertEquals(5, durationResult.getTotalCount());
assertEquals(0, durationResult.getTotalMissingCount());
@@ -357,7 +357,7 @@ public class TestGroupFacetCollector extends AbstractGroupingTestCase {
IndexSearcher indexSearcher = newSearcher(DirectoryReader.open(dir));
GroupFacetCollector groupedAirportFacetCollector =
createRandomCollector(groupField + "_dv", "airport", null, true);
- indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
+ indexSearcher.search(MatchAllDocsQuery.INSTANCE, groupedAirportFacetCollector);
TermGroupFacetCollector.GroupedFacetResult airportResult =
groupedAirportFacetCollector.mergeSegmentResults(10, 0, false);
assertEquals(3, airportResult.getTotalCount());
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
index 592e6ce92b4..289a7155aad 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
@@ -225,7 +225,7 @@ public class TestGrouping extends LuceneTestCase {
// Test default behavior (include null group)
FirstPassGroupingCollector<BytesRef> collector1 =
new FirstPassGroupingCollector<>(new TermGroupSelector(groupField), Sort.RELEVANCE, 10);
- searcher.search(new MatchAllDocsQuery(), collector1);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collector1);
Collection<SearchGroup<BytesRef>> groups1 = collector1.getTopGroups(0);
assertEquals(3, groups1.size()); // Should include null group
@@ -234,7 +234,7 @@ public class TestGrouping extends LuceneTestCase {
FirstPassGroupingCollector<BytesRef> collector2 =
new FirstPassGroupingCollector<>(
new TermGroupSelector(groupField), Sort.RELEVANCE, 10, true);
- searcher.search(new MatchAllDocsQuery(), collector2);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collector2);
Collection<SearchGroup<BytesRef>> groups2 = collector2.getTopGroups(0);
assertEquals(2, groups2.size()); // Should exclude null group
@@ -263,7 +263,7 @@ public class TestGrouping extends LuceneTestCase {
// Test ignoring docs without group field when all docs lack the field
FirstPassGroupingCollector<BytesRef> collector =
new FirstPassGroupingCollector<>(new TermGroupSelector("group"), Sort.RELEVANCE, 10, true);
- searcher.search(new MatchAllDocsQuery(), collector);
+ searcher.search(MatchAllDocsQuery.INSTANCE, collector);
Collection<SearchGroup<BytesRef>> groups = collector.getTopGroups(0);
assertNull(groups); // Should return null when no groups found
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java
index 5cc3e9445c5..dc7195de882 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java
@@ -50,7 +50,7 @@ public class TestLongRangeGroupSelector extends BaseGroupSelectorTestCase<LongRa
protected Query filterQuery(LongRange groupValue) {
if (groupValue == null) {
return new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.FILTER)
.add(new FieldExistsQuery("long"), BooleanClause.Occur.MUST_NOT)
.build();
}
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java
index e433e400295..611e69ba265 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java
@@ -51,7 +51,7 @@ public class TestTermGroupSelector extends BaseGroupSelectorTestCase<BytesRef> {
protected Query filterQuery(BytesRef groupValue) {
if (groupValue == null) {
return new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.FILTER)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.FILTER)
.add(new FieldExistsQuery("groupField"), BooleanClause.Occur.MUST_NOT)
.build();
}
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/NoOpOffsetStrategy.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/NoOpOffsetStrategy.java
index 126c7bd2adb..ece91059fc7 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/NoOpOffsetStrategy.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/NoOpOffsetStrategy.java
@@ -36,7 +36,7 @@ public class NoOpOffsetStrategy extends FieldOffsetStrategy {
new UHComponents(
"_ignored_",
(_) -> false,
- new MatchNoDocsQuery(),
+ MatchNoDocsQuery.INSTANCE,
new BytesRef[0],
PhraseHelper.NONE,
new LabelledCharArrayMatcher[0],
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
index ea1622b26b3..15aefa54d55 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
@@ -66,7 +66,7 @@ public class PhraseHelper {
public static final PhraseHelper NONE =
new PhraseHelper(
- new MatchAllDocsQuery(), "_ignored_", (_) -> false, _ -> null, _ -> null, true);
+ MatchAllDocsQuery.INSTANCE, "_ignored_", (_) -> false, _ -> null, _ -> null, true);
private final String fieldName;
private final Set<BytesRef> positionInsensitiveTerms; // (TermQuery terms)
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java
index 22ad43be771..1251c069376 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java
@@ -582,7 +582,7 @@ public class TestMatchHighlighter extends LuceneTestCase {
.appendFieldHighlighter(FieldValueHighlighters.skipRemaining());
assertHighlights(
- toDocList(highlighter.highlight(topDocs, new MatchAllDocsQuery())),
+ toDocList(highlighter.highlight(topDocs, MatchAllDocsQuery.INSTANCE)),
"0. text1: foo bar, bar foo baz, bar baz foo, baz baz baz");
// But this is not exactly what we'd like because we want to limit the display of
@@ -636,7 +636,7 @@ public class TestMatchHighlighter extends LuceneTestCase {
toDocList(highlighter.highlight(topDocs, query)),
"0. text1: >foo< bar, bar >foo< baz");
assertHighlights(
- toDocList(highlighter.highlight(topDocs, new MatchAllDocsQuery())),
+ toDocList(highlighter.highlight(topDocs, MatchAllDocsQuery.INSTANCE)),
"0. text1: foo bar, bar foo baz, [2 omitted]");
});
}
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java
index 68cd988a8da..71b00ecdc24 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java
@@ -295,7 +295,7 @@ public class TestMatchRegionRetriever extends LuceneTestCase {
fmt("2: (%s: 'bar >baz< foo xyz')", field)));
MatcherAssert.assertThat(
- highlights(reader, new MatchAllDocsQuery()), Matchers.hasSize(0));
+ highlights(reader, MatchAllDocsQuery.INSTANCE), Matchers.hasSize(0));
});
new IndexBuilder(this::toField)
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
index b5652fb0f2b..31835d898d3 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
@@ -111,7 +111,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrong field
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
@@ -165,7 +165,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrong field
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new PrefixQuery(new Term("bogus", "te")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
@@ -207,7 +207,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrong field
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new RegexpQuery(new Term("bogus", "te.*")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
@@ -267,7 +267,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrong field
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new FuzzyQuery(new Term("bogus", "tets"), 1), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
@@ -345,7 +345,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// exact start exclusive
BooleanQuery bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(
TermRangeQuery.newStringRange("body", "test", "tf", false, true),
BooleanClause.Occur.SHOULD)
@@ -360,7 +360,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// exact end exclusive
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(
TermRangeQuery.newStringRange("body", "ta", "test", true, false),
BooleanClause.Occur.SHOULD)
@@ -375,7 +375,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrong field
bq =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(
TermRangeQuery.newStringRange("bogus", "ta", "tf", true, true),
BooleanClause.Occur.SHOULD)
@@ -421,7 +421,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// must not
query =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.MUST_NOT)
.build();
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
index e2b559b4a20..854c4f6328a 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
@@ -541,7 +541,7 @@ public class TestUnifiedHighlighterStrictPhrases extends UnifiedHighlighterTestB
.withHighlightPhrasesStrictly(true)
.build();
String content = "whatever";
- Object o = highlighter.highlightWithoutSearcher("body", new MatchNoDocsQuery(), content, 1);
+ Object o = highlighter.highlightWithoutSearcher("body", MatchNoDocsQuery.INSTANCE, content, 1);
assertEquals(content, o);
}
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
index d197efc0343..65b1ad35785 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
@@ -65,7 +65,7 @@ public class TestUnifiedHighlighterExtensibility extends LuceneTestCase {
new UHComponents(
"field",
(_) -> false,
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new BytesRef[0],
PhraseHelper.NONE,
new LabelledCharArrayMatcher[0],
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java b/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
index 1971ed629f7..f69c64d8070 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
@@ -125,7 +125,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
// Test with match_all filter and large k to test exact search
query =
getParentJoinKnnQuery(
- "field", new float[] {2, 2}, new MatchAllDocsQuery(), 10, parentFilter);
+ "field", new float[] {2, 2}, MatchAllDocsQuery.INSTANCE, 10, parentFilter);
topDocs = searcher.search(query, 3);
assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
@@ -166,7 +166,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
// Test with match_all filter and large k to test exact search
query =
getParentJoinKnnQuery(
- "field", new float[] {2, 2}, new MatchAllDocsQuery(), 10, parentFilter);
+ "field", new float[] {2, 2}, MatchAllDocsQuery.INSTANCE, 10, parentFilter);
topDocs = searcher.search(query, 3);
assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
@@ -229,13 +229,13 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
searcher, query, new float[] {1f / 3f, 1f / 3f}, new String[] {"5", "7"}, 2);
query =
getParentJoinKnnQuery(
- "field", new float[] {6, 6}, new MatchAllDocsQuery(), 20, parentFilter);
+ "field", new float[] {6, 6}, MatchAllDocsQuery.INSTANCE, 20, parentFilter);
assertScorerResults(
searcher, query, new float[] {1f / 3f, 1f / 3f}, new String[] {"5", "7"}, 2);
query =
getParentJoinKnnQuery(
- "field", new float[] {6, 6}, new MatchAllDocsQuery(), 1, parentFilter);
+ "field", new float[] {6, 6}, MatchAllDocsQuery.INSTANCE, 1, parentFilter);
assertScorerResults(
searcher, query, new float[] {1f / 3f, 1f / 3f}, new String[] {"5", "7"}, 1);
}
@@ -305,7 +305,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
Query query = getParentJoinKnnQuery("field", new float[] {1, 2}, null, 2, parentFilter);
Query exactQuery =
getParentJoinKnnQuery(
- "field", new float[] {1, 2}, new MatchAllDocsQuery(), 10, parentFilter);
+ "field", new float[] {1, 2}, MatchAllDocsQuery.INSTANCE, 10, parentFilter);
assertEquals(2, searcher.count(query)); // Expect some results without timeout
assertEquals(3, searcher.count(exactQuery)); // Same for exact search
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
index de28a45d296..44067bdbed2 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
@@ -166,7 +166,7 @@ public class TestBlockJoin extends LuceneTestCase {
BooleanQuery.Builder fullQuery = new BooleanQuery.Builder();
fullQuery.add(new BooleanClause(childJoinQuery, Occur.MUST));
- fullQuery.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+ fullQuery.add(new BooleanClause(MatchAllDocsQuery.INSTANCE, Occur.MUST));
TopDocs topDocs = s.search(fullQuery.build(), 2);
assertEquals(2, topDocs.totalHits.value());
assertEquals(
@@ -562,8 +562,8 @@ public class TestBlockJoin extends LuceneTestCase {
ToParentBlockJoinQuery q =
new ToParentBlockJoinQuery(
- new MatchNoDocsQuery(),
- new QueryBitSetProducer(new MatchAllDocsQuery()),
+ MatchNoDocsQuery.INSTANCE,
+ new QueryBitSetProducer(MatchAllDocsQuery.INSTANCE),
ScoreMode.Avg);
QueryUtils.check(random(), q, s);
s.search(q, 10);
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java
index 4f7b13e8a6a..1a5c45600e2 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java
@@ -81,7 +81,7 @@ public class TestBlockJoinScorer extends LuceneTestCase {
new QueryBitSetProducer(new TermQuery(new Term("docType", "parent")));
CheckJoinIndex.check(reader, parentsFilter);
- Query childQuery = new MatchAllDocsQuery();
+ Query childQuery = MatchAllDocsQuery.INSTANCE;
ToParentBlockJoinQuery query =
new ToParentBlockJoinQuery(childQuery, parentsFilter, ScoreMode.None);
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
index ffe4c3840d5..4c245595451 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
@@ -123,7 +123,7 @@ public class TestBlockJoinValidation extends LuceneTestCase {
}
public void testAdvanceValidationForToChildBjq() throws Exception {
- Query parentQuery = new MatchAllDocsQuery();
+ Query parentQuery = MatchAllDocsQuery.INSTANCE;
ToChildBlockJoinQuery blockJoinQuery = new ToChildBlockJoinQuery(parentQuery, parentsFilter);
final LeafReaderContext context = indexSearcher.getIndexReader().leaves().get(0);
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java
index 2c4a94011c6..44f43c9f1cd 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java
@@ -46,7 +46,7 @@ public class TestCheckJoinIndex extends LuceneTestCase {
}
final IndexReader reader = w.getReader();
w.close();
- BitSetProducer parentsFilter = new QueryBitSetProducer(new MatchNoDocsQuery());
+ BitSetProducer parentsFilter = new QueryBitSetProducer(MatchNoDocsQuery.INSTANCE);
try {
expectThrows(IllegalStateException.class, () -> CheckJoinIndex.check(reader, parentsFilter));
} finally {
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
index 0afd6aced9b..2397bcc49a9 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
@@ -742,8 +742,8 @@ public class TestJoinUtil extends LuceneTestCase {
Query joinQuery =
JoinUtil.createJoinQuery(
"join_field",
- new MatchNoDocsQuery(),
- new MatchNoDocsQuery(),
+ MatchNoDocsQuery.INSTANCE,
+ MatchNoDocsQuery.INSTANCE,
searcher,
RandomPicks.randomFrom(random(), ScoreMode.values()),
ordMap,
@@ -755,8 +755,8 @@ public class TestJoinUtil extends LuceneTestCase {
Query joinQuery =
JoinUtil.createJoinQuery(
"join_field",
- new MatchNoDocsQuery(),
- new MatchNoDocsQuery(),
+ MatchNoDocsQuery.INSTANCE,
+ MatchNoDocsQuery.INSTANCE,
searcher,
ScoreMode.None,
ordMap,
@@ -1257,7 +1257,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField,
new TermQuery(new Term("name", "name5")),
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
indexSearcher,
scoreMode1,
ordinalMap);
@@ -1267,7 +1267,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField,
new TermQuery(new Term("name", "name5")),
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
indexSearcher,
scoreMode1,
ordinalMap));
@@ -1278,7 +1278,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField,
new TermQuery(new Term("name", "name5")),
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
indexSearcher,
scoreMode2,
ordinalMap)));
@@ -1288,7 +1288,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField,
new TermQuery(new Term("name", "name6")),
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
indexSearcher,
scoreMode1,
ordinalMap)));
@@ -1315,7 +1315,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField,
new TermQuery(new Term("name", "name5")),
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
indexSearcher,
scoreMode1,
ordinalMap)));
@@ -1910,7 +1910,7 @@ public class TestJoinUtil extends LuceneTestCase {
}
} else {
searcher.search(
- new MatchAllDocsQuery(),
+ MatchAllDocsQuery.INSTANCE,
new SimpleCollector() {
private SortedDocValues terms;
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java
index d320e3e9f51..5eb3a4d7072 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java
@@ -41,11 +41,11 @@ public class TestQueryBitSetProducer extends LuceneTestCase {
w.addDocument(new Document());
DirectoryReader reader = w.getReader();
- QueryBitSetProducer producer = new QueryBitSetProducer(new MatchNoDocsQuery());
+ QueryBitSetProducer producer = new QueryBitSetProducer(MatchNoDocsQuery.INSTANCE);
assertNull(producer.getBitSet(reader.leaves().get(0)));
assertEquals(1, producer.cache.size());
- producer = new QueryBitSetProducer(new MatchAllDocsQuery());
+ producer = new QueryBitSetProducer(MatchAllDocsQuery.INSTANCE);
BitSet bitSet = producer.getBitSet(reader.leaves().get(0));
assertEquals(1, bitSet.length());
assertEquals(true, bitSet.get(0));
@@ -61,11 +61,11 @@ public class TestQueryBitSetProducer extends LuceneTestCase {
w.addDocument(new Document());
DirectoryReader reader = new DummyDirectoryReader(w.getReader());
- QueryBitSetProducer producer = new QueryBitSetProducer(new MatchNoDocsQuery());
+ QueryBitSetProducer producer = new QueryBitSetProducer(MatchNoDocsQuery.INSTANCE);
assertNull(producer.getBitSet(reader.leaves().get(0)));
assertEquals(0, producer.cache.size());
- producer = new QueryBitSetProducer(new MatchAllDocsQuery());
+ producer = new QueryBitSetProducer(MatchAllDocsQuery.INSTANCE);
BitSet bitSet = producer.getBitSet(reader.leaves().get(0));
assertEquals(1, bitSet.length());
assertEquals(true, bitSet.get(0));
diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
index c8562f734e1..1a98699bb7b 100644
--- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
+++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
@@ -114,7 +114,7 @@ public class TestMemoryIndex extends LuceneTestCase {
MemoryIndex mi = new MemoryIndex();
mi.addField("f1", "some text", analyzer);
- assertNotEquals(0.0f, mi.search(new MatchAllDocsQuery()));
+ assertNotEquals(0.0f, mi.search(MatchAllDocsQuery.INSTANCE));
assertNotEquals(0.0f, mi.search(new TermQuery(new Term("f1", "some"))));
// check we can add a new field after searching
diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java
index 2e892900ce4..d0288183601 100644
--- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java
+++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java
@@ -64,7 +64,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
LongDocValuesStats stats = new LongDocValuesStats("foo");
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
assertEquals(0, stats.count());
assertEquals(numDocs, stats.missing());
@@ -84,7 +84,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
LongDocValuesStats stats = new LongDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
assertEquals(1, stats.count());
assertEquals(0, stats.missing());
@@ -129,7 +129,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
LongDocValuesStats stats = new LongDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
int expCount = (int) Arrays.stream(docValues).filter(v -> v > 0).count();
assertEquals(expCount, stats.count());
@@ -180,7 +180,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
DoubleDocValuesStats stats = new DoubleDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
int expCount = (int) Arrays.stream(docValues).filter(v -> v > 0).count();
assertEquals(expCount, stats.count());
@@ -235,7 +235,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
SortedLongDocValuesStats stats = new SortedLongDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
assertEquals(nonNull(docValues).count(), stats.count());
int numDocsWithoutField = (int) isNull(docValues).count();
@@ -293,7 +293,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
SortedDoubleDocValuesStats stats = new SortedDoubleDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
assertEquals(nonNull(docValues).count(), stats.count());
int numDocsWithoutField = (int) isNull(docValues).count();
@@ -346,7 +346,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(indexWriter)) {
IndexSearcher searcher = new IndexSearcher(reader);
SortedDocValuesStats stats = new SortedDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
int expCount = (int) nonNull(docValues).count();
assertEquals(expCount, stats.count());
@@ -395,7 +395,7 @@ public class TestDocValuesStatsCollector extends LuceneTestCase {
IndexSearcher searcher = new IndexSearcher(reader);
SortedSetDocValuesStats stats = new SortedSetDocValuesStats(field);
- searcher.search(new MatchAllDocsQuery(), new DocValuesStatsCollector(stats));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new DocValuesStatsCollector(stats));
int expCount = (int) nonNull(docValues).count();
assertEquals(expCount, stats.count());
diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java
index 2bdf312c7f6..a77fb564942 100644
--- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java
+++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java
@@ -67,7 +67,7 @@ public class TestMemoryAccountingBitsetCollector extends LuceneTestCase {
expectThrows(
IllegalStateException.class,
() -> {
- searcher.search(new MatchAllDocsQuery(), bitSetCollector);
+ searcher.search(MatchAllDocsQuery.INSTANCE, bitSetCollector);
});
}
}
diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/Presearcher.java b/lucene/monitor/src/java/org/apache/lucene/monitor/Presearcher.java
index 7d08d916e39..97aa8b9ccb5 100644
--- a/lucene/monitor/src/java/org/apache/lucene/monitor/Presearcher.java
+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/Presearcher.java
@@ -37,7 +37,7 @@ public abstract class Presearcher {
new Presearcher() {
@Override
public Query buildQuery(LeafReader reader, BiPredicate<String, BytesRef> termAcceptor) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
@Override
diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java b/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java
index 70a6408f91e..de01484b781 100644
--- a/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java
+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java
@@ -72,7 +72,7 @@ abstract class QueryIndex implements Closeable {
}
public void scan(QueryCollector matcher) throws IOException {
- search(new MatchAllDocsQuery(), matcher);
+ search(MatchAllDocsQuery.INSTANCE, matcher);
}
long search(final Query query, QueryCollector matcher) throws IOException {
diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/WritableQueryIndex.java b/lucene/monitor/src/java/org/apache/lucene/monitor/WritableQueryIndex.java
index 5102b27c1c6..8c5fe84b632 100644
--- a/lucene/monitor/src/java/org/apache/lucene/monitor/WritableQueryIndex.java
+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/WritableQueryIndex.java
@@ -138,7 +138,7 @@ class WritableQueryIndex extends QueryIndex {
// No query serialization happening here - check that the cache is empty
IndexSearcher searcher = manager.acquire();
try {
- if (searcher.count(new MatchAllDocsQuery()) != 0) {
+ if (searcher.count(MatchAllDocsQuery.INSTANCE) != 0) {
throw new IllegalStateException(
"Attempting to open a non-empty monitor query index with no MonitorQuerySerializer");
}
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/FieldFilterPresearcherComponentTestBase.java b/lucene/monitor/src/test/org/apache/lucene/monitor/FieldFilterPresearcherComponentTestBase.java
index a2110b3b5eb..09a2a252cd3 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/FieldFilterPresearcherComponentTestBase.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/FieldFilterPresearcherComponentTestBase.java
@@ -119,7 +119,7 @@ public abstract class FieldFilterPresearcherComponentTestBase extends Presearche
try (Monitor monitor = newMonitor()) {
monitor.register(
new MonitorQuery(
- "1", new MatchAllDocsQuery(), null, Collections.singletonMap("language", "de")));
+ "1", MatchAllDocsQuery.INSTANCE, null, Collections.singletonMap("language", "de")));
Document enDoc = new Document();
enDoc.add(newTextField(TEXTFIELD, "this is a test", Field.Store.NO));
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java b/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
index 7a39abac037..46ad77cdefc 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
@@ -74,7 +74,7 @@ public abstract class PresearcherTestBase extends MonitorTestBase {
public void testMatchAllQueryHandling() throws IOException {
try (Monitor monitor = newMonitor()) {
- monitor.register(new MonitorQuery("1", new MatchAllDocsQuery()));
+ monitor.register(new MonitorQuery("1", MatchAllDocsQuery.INSTANCE));
assertEquals(
1, monitor.match(buildDoc("f", "wibble"), QueryMatch.SIMPLE_MATCHER).getMatchCount());
}
@@ -83,7 +83,7 @@ public abstract class PresearcherTestBase extends MonitorTestBase {
public void testNegativeQueryHandling() throws IOException {
Query q =
new BooleanQuery.Builder()
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.add(new TermQuery(new Term("f", "foo")), BooleanClause.Occur.MUST_NOT)
.build();
try (Monitor monitor = newMonitor()) {
@@ -101,7 +101,7 @@ public abstract class PresearcherTestBase extends MonitorTestBase {
public void testAnyTokenHandling() throws IOException {
try (Monitor monitor = newMonitor()) {
- monitor.register(new MonitorQuery("1", new MatchAllDocsQuery()));
+ monitor.register(new MonitorQuery("1", MatchAllDocsQuery.INSTANCE));
MatchingQueries<QueryMatch> matches =
monitor.match(buildDoc("f", "wibble"), QueryMatch.SIMPLE_MATCHER);
assertEquals(1, matches.getMatchCount());
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitor.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitor.java
index ed34e6b8f68..cd75596dd4a 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitor.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitor.java
@@ -110,9 +110,9 @@ public class TestMonitor extends MonitorTestBase {
public void testCanClearTheMonitor() throws IOException {
try (Monitor monitor = newMonitor()) {
monitor.register(
- new MonitorQuery("query1", new MatchAllDocsQuery()),
- new MonitorQuery("query2", new MatchAllDocsQuery()),
- new MonitorQuery("query3", new MatchAllDocsQuery()));
+ new MonitorQuery("query1", MatchAllDocsQuery.INSTANCE),
+ new MonitorQuery("query2", MatchAllDocsQuery.INSTANCE),
+ new MonitorQuery("query3", MatchAllDocsQuery.INSTANCE));
assertEquals(3, monitor.getQueryCount());
monitor.clear();
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorErrorHandling.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorErrorHandling.java
index aabf1cfa3d5..b66488fe1ee 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorErrorHandling.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorErrorHandling.java
@@ -51,7 +51,7 @@ public class TestMonitorErrorHandling extends MonitorTestBase {
() -> {
Map<String, String> metadata2 = new HashMap<>();
metadata2.put("key", null);
- new MonitorQuery("id", new MatchAllDocsQuery(), null, metadata2);
+ new MonitorQuery("id", MatchAllDocsQuery.INSTANCE, null, metadata2);
});
assertEquals("Null value for key key in metadata map", e.getMessage());
}
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorPersistence.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorPersistence.java
index a9b321d669e..cf9c52f66ab 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorPersistence.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestMonitorPersistence.java
@@ -71,7 +71,7 @@ public class TestMonitorPersistence extends MonitorTestBase {
() ->
monitor.register(
new MonitorQuery(
- "5", new MatchAllDocsQuery(), null, Collections.emptyMap())));
+ "5", MatchAllDocsQuery.INSTANCE, null, Collections.emptyMap())));
assertEquals(
"Cannot add a MonitorQuery with a null string representation to a non-ephemeral Monitor",
e.getMessage());
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermPresearcher.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermPresearcher.java
index efe184931d3..36b80b3d1b9 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermPresearcher.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermPresearcher.java
@@ -104,7 +104,7 @@ public class TestTermPresearcher extends PresearcherTestBase {
QueryAnalyzer analyzer = new QueryAnalyzer();
QueryTree qt =
- analyzer.buildTree(new MatchAllDocsQuery(), TermFilteredPresearcher.DEFAULT_WEIGHTOR);
+ analyzer.buildTree(MatchAllDocsQuery.INSTANCE, TermFilteredPresearcher.DEFAULT_WEIGHTOR);
TermFilteredPresearcher presearcher = new TermFilteredPresearcher();
Map<String, BytesRefHash> extractedTerms = presearcher.collectTerms(qt);
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
index a8d30bb5e48..add6e0d028b 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
@@ -128,7 +128,7 @@ public class TestFunctionQuerySort extends LuceneTestCase {
Sort orderBy = new Sort(sf);
// Get hits sorted by our FunctionValues (ascending values)
- Query q = new MatchAllDocsQuery();
+ Query q = MatchAllDocsQuery.INSTANCE;
TopDocs hits = searcher.search(q, reader.maxDoc(), orderBy);
assertEquals(NUM_VALS, hits.scoreDocs.length);
// Verify that sorting works in general
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java
index 1efc9bf3a69..e73e2b789a7 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java
@@ -50,7 +50,7 @@ public class TestFunctionScoreExplanations extends BaseExplanationTestCase {
Query q = new TermQuery(new Term(FIELD, "w1"));
FunctionScoreQuery csq = new FunctionScoreQuery(q, DoubleValuesSource.constant(5));
BooleanQuery.Builder bqB = new BooleanQuery.Builder();
- bqB.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
+ bqB.add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.MUST);
bqB.add(csq, BooleanClause.Occur.MUST);
BooleanQuery bq = bqB.build();
qtest(new BoostQuery(bq, 6), new int[] {0, 1, 2, 3});
@@ -71,7 +71,8 @@ public class TestFunctionScoreExplanations extends BaseExplanationTestCase {
}
public void testSubExplanations() throws IOException {
- Query query = new FunctionScoreQuery(new MatchAllDocsQuery(), DoubleValuesSource.constant(5));
+ Query query =
+ new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, DoubleValuesSource.constant(5));
IndexSearcher searcher = newSearcher(BaseExplanationTestCase.searcher.getIndexReader());
searcher.setSimilarity(new BM25Similarity());
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java
index 0b6448cd2c1..7aed6cbe9c1 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java
@@ -240,7 +240,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
w.close();
IndexSearcher searcher = newSearcher(reader);
Query q =
- new FunctionScoreQuery(new MatchAllDocsQuery(), DoubleValuesSource.fromLongField("foo"));
+ new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, DoubleValuesSource.fromLongField("foo"));
QueryUtils.check(random(), q, searcher);
Explanation expl = searcher.explain(q, 0);
assertEquals(0, expl.getValue().doubleValue(), 0f);
@@ -259,7 +259,8 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
w.close();
IndexSearcher searcher = newSearcher(reader);
Query q =
- new FunctionScoreQuery(new MatchAllDocsQuery(), DoubleValuesSource.fromDoubleField("foo"));
+ new FunctionScoreQuery(
+ MatchAllDocsQuery.INSTANCE, DoubleValuesSource.fromDoubleField("foo"));
QueryUtils.check(random(), q, searcher);
Explanation expl = searcher.explain(q, 0);
assertEquals(0, expl.getValue().doubleValue(), 0f);
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java
index a4354c0fa0b..83d4a754022 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java
@@ -188,21 +188,21 @@ public class TestIndexReaderFunctions extends LuceneTestCase {
}
void assertCacheable(DoubleValuesSource vs, boolean expected) throws Exception {
- Query q = new FunctionScoreQuery(new MatchAllDocsQuery(), vs);
+ Query q = new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, vs);
Weight w = searcher.createWeight(q, ScoreMode.COMPLETE, 1);
LeafReaderContext ctx = reader.leaves().get(0);
assertEquals(expected, w.isCacheable(ctx));
}
void assertCacheable(LongValuesSource vs, boolean expected) throws Exception {
- Query q = new FunctionScoreQuery(new MatchAllDocsQuery(), vs.toDoubleValuesSource());
+ Query q = new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, vs.toDoubleValuesSource());
Weight w = searcher.createWeight(q, ScoreMode.COMPLETE, 1);
LeafReaderContext ctx = reader.leaves().get(0);
assertEquals(expected, w.isCacheable(ctx));
}
void assertHits(DoubleValuesSource vs, float[] scores) throws Exception {
- Query q = new FunctionScoreQuery(new MatchAllDocsQuery(), vs);
+ Query q = new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, vs);
ScoreDoc[] expected = new ScoreDoc[scores.length];
int[] expectedDocs = new int[scores.length];
for (int i = 0; i < expected.length; i++) {
@@ -228,7 +228,7 @@ public class TestIndexReaderFunctions extends LuceneTestCase {
}
TopDocs docs =
searcher.search(
- new MatchAllDocsQuery(), expected.length, new Sort(vs.getSortField(reversed)));
- CheckHits.checkHitsQuery(new MatchAllDocsQuery(), expected, docs.scoreDocs, expectedDocs);
+ MatchAllDocsQuery.INSTANCE, expected.length, new Sort(vs.getSortField(reversed)));
+ CheckHits.checkHitsQuery(MatchAllDocsQuery.INSTANCE, expected, docs.scoreDocs, expectedDocs);
}
}
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestKnnVectorSimilarityFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestKnnVectorSimilarityFunctions.java
index c0bd69b3ae8..b7bad6e6d1b 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestKnnVectorSimilarityFunctions.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestKnnVectorSimilarityFunctions.java
@@ -255,7 +255,7 @@ public class TestKnnVectorSimilarityFunctions extends LuceneTestCase {
private static void assertHits(final ValueSource func, final float[] scores) throws Exception {
assertHits(new FunctionQuery(func), scores);
assertHits(
- new FunctionScoreQuery(new MatchAllDocsQuery(), func.asDoubleValuesSource()), scores);
+ new FunctionScoreQuery(MatchAllDocsQuery.INSTANCE, func.asDoubleValuesSource()), scores);
}
private static void assertHits(Query q, float[] scores) throws Exception {
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
index 70b996cca75..96457277f97 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
@@ -547,7 +547,7 @@ public class TestValueSources extends LuceneTestCase {
assertNoneExist(vs);
// doc doesn't match the query, so default value should be returned
- vs = new QueryValueSource(new MatchNoDocsQuery(), 5.0f);
+ vs = new QueryValueSource(MatchNoDocsQuery.INSTANCE, 5.0f);
final LeafReaderContext leaf = searcher.getIndexReader().leaves().get(0);
FunctionValues fv = vs.getValues(ValueSource.newContext(searcher), leaf);
assertEquals(5.0f, fv.objectVal(1));
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
index e818ffecab2..aa29c32ed56 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
@@ -631,7 +631,7 @@ public abstract class QueryParserBase extends QueryBuilder
* @return new MatchAllDocsQuery instance
*/
protected Query newMatchAllDocsQuery() {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
/**
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java
index cda433ebe8c..755d62c0ab3 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java
@@ -43,6 +43,6 @@ public class MatchAllDocsQueryNodeBuilder implements StandardQueryBuilder {
queryNode.getClass().getName()));
}
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
}
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java
index 57ff2fda108..8c819b14950 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java
@@ -43,6 +43,6 @@ public class MatchNoDocsQueryNodeBuilder implements StandardQueryBuilder {
queryNode.getClass().getName()));
}
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
}
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
index 66f191abbbb..e16b2ede269 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
@@ -159,7 +159,7 @@ public class SimpleQueryParser extends QueryBuilder {
/** Parses the query text and returns parsed query */
public Query parse(String queryText) {
if ("*".equals(queryText.trim())) {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
char[] data = queryText.toCharArray();
@@ -453,7 +453,7 @@ public class SimpleQueryParser extends QueryBuilder {
if (state.not % 2 == 1) {
BooleanQuery.Builder nq = new BooleanQuery.Builder();
nq.add(branch, BooleanClause.Occur.MUST_NOT);
- nq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
+ nq.add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD);
branch = nq.build();
}
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java
index 4015778261d..f967a6c6ca2 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java
@@ -86,7 +86,7 @@ public class DistanceQuery extends ComposedQuery implements DistanceSubQuery {
((DistanceSubQuery) sqi.next()).addSpanQueries(sncf);
sncf.clear();
}
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
spanClauses[qi] = sncf.makeSpanClause();
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java
index 4371e5f224f..46a4c4cf5b2 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java
@@ -45,7 +45,7 @@ class SimpleTermRewriteQuery extends RewriteQuery<SimpleTerm> {
}
});
return (luceneSubQueries.size() == 0)
- ? new MatchNoDocsQuery()
+ ? MatchNoDocsQuery.INSTANCE
: (luceneSubQueries.size() == 1)
? luceneSubQueries.get(0)
: SrndBooleanQuery.makeBooleanQuery(
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
index 005b32873d4..26a5eb32aa7 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
@@ -27,6 +27,6 @@ public class MatchAllDocsQueryBuilder implements QueryBuilder {
@Override
public Query getQuery(Element e) throws ParserException {
- return new MatchAllDocsQuery();
+ return MatchAllDocsQuery.INSTANCE;
}
}
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
index 3a891e2d0e4..9e370863c4d 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
@@ -865,7 +865,7 @@ public class TestQueryParser extends QueryParserTestBase {
QueryParser parser2 = new QueryParser("*", new ASCIIAnalyzer());
parser2.setAllowLeadingWildcard(false);
- assertEquals(new MatchAllDocsQuery(), parser2.parse("*"));
+ assertEquals(MatchAllDocsQuery.INSTANCE, parser2.parse("*"));
}
public void testWildCardEscapes() throws ParseException, IOException {
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
index 1f1d078d7f8..a8f45fa0262 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
@@ -1257,8 +1257,8 @@ public class TestQPHelper extends LuceneTestCase {
StandardQueryParser qp = new StandardQueryParser();
qp.setAnalyzer(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
- assertEquals(new MatchAllDocsQuery(), qp.parse("*:*", "field"));
- assertEquals(new MatchAllDocsQuery(), qp.parse("(*:*)", "field"));
+ assertEquals(MatchAllDocsQuery.INSTANCE, qp.parse("*:*", "field"));
+ assertEquals(MatchAllDocsQuery.INSTANCE, qp.parse("(*:*)", "field"));
BooleanQuery bq = (BooleanQuery) qp.parse("+*:* -*:*", "field");
for (BooleanClause c : bq) {
assertTrue(c.query().getClass() == MatchAllDocsQuery.class);
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
index 829387a2bd0..65a762ff20e 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
@@ -206,7 +206,7 @@ public class TestSimpleQueryParser extends LuceneTestCase {
public void testNOT() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "foo")), Occur.MUST_NOT);
- expected.add(new MatchAllDocsQuery(), Occur.SHOULD);
+ expected.add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD);
assertEquals(expected.build(), parse("-foo"));
assertEquals(expected.build(), parse("-(foo)"));
@@ -254,7 +254,7 @@ public class TestSimpleQueryParser extends LuceneTestCase {
}
public void testGarbageEmpty() throws Exception {
- MatchNoDocsQuery expected = new MatchNoDocsQuery();
+ MatchNoDocsQuery expected = MatchNoDocsQuery.INSTANCE;
assertEquals(expected, parse(""));
assertEquals(expected, parse(" "));
@@ -296,7 +296,7 @@ public class TestSimpleQueryParser extends LuceneTestCase {
public void testGarbageNOT() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "star")), Occur.MUST_NOT);
- expected.add(new MatchAllDocsQuery(), Occur.SHOULD);
+ expected.add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD);
assertEquals(expected.build(), parse("-star"));
assertEquals(expected.build(), parse("---star"));
@@ -435,7 +435,7 @@ public class TestSimpleQueryParser extends LuceneTestCase {
inner3.add(new TermQuery(new Term("field", "back")), Occur.MUST);
inner4.add(new TermQuery(new Term("field", "jarjar")), Occur.MUST_NOT);
- inner4.add(new MatchAllDocsQuery(), Occur.SHOULD);
+ inner4.add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD);
inner3.add(inner4.build(), Occur.MUST);
inner2.add(inner3.build(), Occur.SHOULD);
@@ -633,8 +633,8 @@ public class TestSimpleQueryParser extends LuceneTestCase {
public void testStarBecomesMatchAll() throws Exception {
Query q = parse("*");
- assertEquals(q, new MatchAllDocsQuery());
+ assertEquals(q, MatchAllDocsQuery.INSTANCE);
q = parse(" * ");
- assertEquals(q, new MatchAllDocsQuery());
+ assertEquals(q, MatchAllDocsQuery.INSTANCE);
}
}
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
index 34243620931..5ec23428215 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
@@ -1163,8 +1163,8 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
public void testMatchAllDocs() throws Exception {
CommonQueryParserConfiguration qp =
getParserConfig(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
- assertEquals(new MatchAllDocsQuery(), getQuery("*:*", qp));
- assertEquals(new MatchAllDocsQuery(), getQuery("(*:*)", qp));
+ assertEquals(MatchAllDocsQuery.INSTANCE, getQuery("*:*", qp));
+ assertEquals(MatchAllDocsQuery.INSTANCE, getQuery("(*:*)", qp));
BooleanQuery bq = (BooleanQuery) getQuery("+*:* -*:*", qp);
assertEquals(2, bq.clauses().size());
for (BooleanClause clause : bq) {
@@ -1354,10 +1354,10 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
String oldDefaultField = getDefaultField();
setDefaultField("key");
CommonQueryParserConfiguration qp = getParserConfig(new MockAnalyzer(random()));
- assertEquals(new MatchAllDocsQuery(), getQuery(new MatchAllDocsQuery().toString(), qp));
+ assertEquals(MatchAllDocsQuery.INSTANCE, getQuery(MatchAllDocsQuery.INSTANCE.toString(), qp));
// test parsing with non-default boost
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
query = new BoostQuery(query, 2.3f);
assertEquals(query, getQuery(query.toString(), qp));
setDefaultField(oldDefaultField);
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
index 5a4cf6613a6..c08163dd038 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
@@ -726,7 +726,7 @@ class SimplePrimaryNode extends PrimaryNode {
IndexSearcher searcher = mgr.acquire();
try {
long version = ((DirectoryReader) searcher.getIndexReader()).getVersion();
- int hitCount = searcher.count(new MatchAllDocsQuery());
+ int hitCount = searcher.count(MatchAllDocsQuery.INSTANCE);
// message("version=" + version + " searcher=" + searcher);
out.writeVLong(version);
out.writeVInt(hitCount);
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
index 2b553f39a64..11658194c05 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
@@ -266,7 +266,7 @@ class SimpleReplicaNode extends ReplicaNode {
IndexSearcher searcher = mgr.acquire();
try {
long version = ((DirectoryReader) searcher.getIndexReader()).getVersion();
- int hitCount = searcher.count(new MatchAllDocsQuery());
+ int hitCount = searcher.count(MatchAllDocsQuery.INSTANCE);
// node.message("version=" + version + " searcher=" + searcher);
out.writeVLong(version);
out.writeVInt(hitCount);
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java
index c9043d87541..90f7adbeb2f 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java
@@ -138,7 +138,7 @@ public final class DocValuesMultiRangeQuery {
public Query build() {
if (clauses.isEmpty()) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
if (clauses.size() == 1) {
ByteRange theOnlyOne = clauses.getFirst();
@@ -173,7 +173,7 @@ public final class DocValuesMultiRangeQuery {
public Query build() {
if (clauses.isEmpty()) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
if (clauses.size() == 1) {
LongRange theOnlyOne = clauses.getFirst();
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
index 1ec26113960..cbde5bf0ba1 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
@@ -493,7 +493,7 @@ public class TermAutomatonQuery extends Query implements Accountable {
@Override
public Query rewrite(IndexSearcher indexSearcher) throws IOException {
if (Operations.isEmpty(det)) {
- return new MatchNoDocsQuery();
+ return MatchNoDocsQuery.INSTANCE;
}
IntsRef single = Operations.getSingleton(det);
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestFacetRecorders.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestFacetRecorders.java
index b6262707a92..e1829ff7e84 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestFacetRecorders.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestFacetRecorders.java
@@ -253,7 +253,7 @@ public class TestFacetRecorders extends SandboxFacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TaxonomyFacetsCutter defaultTaxoCutter =
new TaxonomyFacetsCutter(DEFAULT_INDEX_FIELD_NAME, config, taxoReader);
@@ -351,7 +351,7 @@ public class TestFacetRecorders extends SandboxFacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TaxonomyFacetsCutter defaultTaxoCutter =
new TaxonomyFacetsCutter(DEFAULT_INDEX_FIELD_NAME, config, taxoReader);
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestLongValueFacet.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestLongValueFacet.java
index 929036f16b0..73d904acf63 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestLongValueFacet.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestLongValueFacet.java
@@ -70,7 +70,7 @@ public class TestLongValueFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longValuesFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
FacetResult result = getAllChildrenSortByValue("field", longValuesFacetCutter, countRecorder);
assertEquals(
@@ -118,7 +118,7 @@ public class TestLongValueFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longValuesFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
FacetResult result = getAllChildrenSortByValue("field", longValuesFacetCutter, countRecorder);
@@ -221,7 +221,7 @@ public class TestLongValueFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longValuesFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
/* TODO: uncomment and adjust when LongValueFacetCutter supports value sources
if (random().nextBoolean()) {
if (VERBOSE) {
@@ -497,7 +497,7 @@ public class TestLongValueFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longValuesFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
if (VERBOSE) {
System.out.println(" use doc values");
}
@@ -727,7 +727,7 @@ public class TestLongValueFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longValuesFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
FacetResult fr = getAllChildrenSortByValue("field", longValuesFacetCutter, countRecorder);
for (LabelAndValue labelAndValue : fr.labelValues) {
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestRangeFacet.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestRangeFacet.java
index 459325f1f57..739f77fe37c 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestRangeFacet.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestRangeFacet.java
@@ -105,7 +105,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -173,7 +173,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -195,7 +195,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
countRecorder = new CountFacetRecorder();
collectorManager = new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -220,7 +220,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
countRecorder = new CountFacetRecorder();
collectorManager = new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -283,7 +283,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -330,7 +330,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -375,7 +375,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -412,7 +412,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -452,7 +452,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -618,7 +618,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -664,7 +664,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -722,7 +722,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -866,7 +866,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(ranges);
FacetResult result =
@@ -1029,7 +1029,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(ranges);
FacetResult result =
@@ -1190,7 +1190,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(ranges);
FacetResult result =
@@ -1346,7 +1346,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
CountFacetRecorder countRecorder = new CountFacetRecorder();
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(ranges);
FacetResult result =
@@ -1417,7 +1417,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -1468,7 +1468,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(longRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(inputRanges);
assertEquals(
@@ -1576,7 +1576,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
final AtomicBoolean filterWasUsed = new AtomicBoolean();
if (random().nextBoolean()) {
// Sort of silly:
- final Query in = new MatchAllDocsQuery();
+ final Query in = MatchAllDocsQuery.INSTANCE;
fastMatchFilter = new UsedQuery(in, filterWasUsed);
} else {
fastMatchFilter = null;
@@ -1593,7 +1593,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
new FacetFieldCollectorManager<>(doubleRangeFacetCutter, countRecorder);
- s.search(new MatchAllDocsQuery(), collectorManager);
+ s.search(MatchAllDocsQuery.INSTANCE, collectorManager);
OrdToLabel ordToLabel = new RangeOrdToLabel(ranges);
assertEquals(
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestTaxonomyFacet.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestTaxonomyFacet.java
index ee890646749..98fe8b7d50f 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestTaxonomyFacet.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/TestTaxonomyFacet.java
@@ -92,7 +92,7 @@ public class TestTaxonomyFacet extends SandboxFacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TaxonomyFacetsCutter defaultTaxoCutter =
new TaxonomyFacetsCutter(DEFAULT_INDEX_FIELD_NAME, config, taxoReader);
@@ -193,7 +193,7 @@ public class TestTaxonomyFacet extends SandboxFacetTestCase {
IndexSearcher searcher = newSearcher(writer.getReader());
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
TaxonomyFacetsCutter defaultTaxoCutter =
new TaxonomyFacetsCutter(DEFAULT_INDEX_FIELD_NAME, config, taxoReader, true);
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/plain/histograms/TestHistogramCollectorManager.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/plain/histograms/TestHistogramCollectorManager.java
index ab817f5c88a..7dfb9f3cb97 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/plain/histograms/TestHistogramCollectorManager.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/plain/histograms/TestHistogramCollectorManager.java
@@ -62,7 +62,7 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
w.close();
IndexSearcher searcher = newSearcher(reader);
LongIntHashMap actualCounts =
- searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4));
LongIntHashMap expectedCounts = new LongIntHashMap();
expectedCounts.put(0, 1);
expectedCounts.put(1, 2);
@@ -70,7 +70,8 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
expectThrows(
IllegalStateException.class,
- () -> searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4, 1)));
+ () ->
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4, 1)));
reader.close();
dir.close();
@@ -92,7 +93,7 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
w.close();
IndexSearcher searcher = newSearcher(reader);
LongIntHashMap actualCounts =
- searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4));
LongIntHashMap expectedCounts = new LongIntHashMap();
expectedCounts.put(0, 1);
expectedCounts.put(1, 1);
@@ -101,7 +102,8 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
expectThrows(
IllegalStateException.class,
- () -> searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4, 1)));
+ () ->
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4, 1)));
reader.close();
dir.close();
@@ -131,7 +133,7 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
// Validate the MATCH_ALL case
LongIntHashMap actualCounts =
- searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 1000));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 1000));
LongIntHashMap expectedCounts = new LongIntHashMap();
for (long value : values) {
expectedCounts.addTo(Math.floorDiv(value, 1000), 1);
@@ -216,7 +218,8 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
// Validate that exception is thrown when doc values is disabled on numeric field
expectThrows(
IllegalStateException.class,
- () -> searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 1000)));
+ () ->
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 1000)));
reader.close();
dir.close();
@@ -265,7 +268,7 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
w.close();
IndexSearcher searcher = newSearcher(reader);
LongIntHashMap actualCounts =
- searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4));
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4));
LongIntHashMap expectedCounts = new LongIntHashMap();
for (long value : values) {
expectedCounts.addTo(Math.floorDiv(value, 4), 1);
@@ -274,7 +277,8 @@ public class TestHistogramCollectorManager extends LuceneTestCase {
expectThrows(
IllegalStateException.class,
- () -> searcher.search(new MatchAllDocsQuery(), new HistogramCollectorManager("f", 4, 1)));
+ () ->
+ searcher.search(MatchAllDocsQuery.INSTANCE, new HistogramCollectorManager("f", 4, 1)));
// Create a query so that bucket "1" (values from 4 to 8), which is in the middle of the range,
// doesn't match any docs. HistogramCollector should not add an entry with a count of 0 in this
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/utils/TestFacetOrchestrators.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/utils/TestFacetOrchestrators.java
index f2ee77284d0..73740420503 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/utils/TestFacetOrchestrators.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/facet/utils/TestFacetOrchestrators.java
@@ -89,7 +89,7 @@ public class TestFacetOrchestrators extends SandboxFacetTestCase {
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
FacetBuilder authorTop0Builder =
new TaxonomyFacetBuilder(config, taxoReader, "Author").withTopN(0);
@@ -276,7 +276,7 @@ public class TestFacetOrchestrators extends SandboxFacetTestCase {
.addBuilder(taxonomyFacetBuilder)
.addBuilder(longRangeFacetBuilder)
.addBuilder(doubleRangeFacetBuilder)
- .collect(new MatchAllDocsQuery(), s);
+ .collect(MatchAllDocsQuery.INSTANCE, s);
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
taxonomyFacetBuilder.getResult().toString());
@@ -428,7 +428,7 @@ public class TestFacetOrchestrators extends SandboxFacetTestCase {
.addBuilder(allChildrenSortByValue)
.addBuilder(allChildrenSortByCount)
.addBuilder(topChildrenSortByCount)
- .collect(new MatchAllDocsQuery(), s);
+ .collect(MatchAllDocsQuery.INSTANCE, s);
assertEquals(
"dim=field path=[] value=-1 childCount=6\n"
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java
index 4b0f17dc59c..7d8f9a5bdec 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java
@@ -68,10 +68,10 @@ public class TestCombinedFieldQuery extends LuceneTestCase {
IndexReader reader = new MultiReader();
IndexSearcher searcher = new IndexSearcher(reader);
Query actual = searcher.rewrite(builder.build());
- assertEquals(actual, new MatchNoDocsQuery());
+ assertEquals(actual, MatchNoDocsQuery.INSTANCE);
builder.addField("field", 1f);
actual = searcher.rewrite(builder.build());
- assertEquals(actual, new MatchNoDocsQuery());
+ assertEquals(actual, MatchNoDocsQuery.INSTANCE);
builder.addTerm(new BytesRef("foo"));
Query query = builder.build();
actual = searcher.rewrite(query);
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
index 05686015f5d..87742d947ad 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java
@@ -42,7 +42,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
private final Query testQuery =
new BooleanQuery.Builder()
.add(new TermQuery(new Term("field", "5")), BooleanClause.Occur.SHOULD)
- .add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD)
+ .add(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.SHOULD)
.build();
@Override
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerWeight.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerWeight.java
index 41dc054a075..ba5c25a3355 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerWeight.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerWeight.java
@@ -149,7 +149,7 @@ public class TestQueryProfilerWeight extends LuceneTestCase {
}
public void testPropagateMatches() throws IOException {
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
Weight fakeWeight = new FakeWeight(query);
QueryProfilerBreakdown profile = new QueryProfilerBreakdown();
QueryProfilerWeight profileWeight = new QueryProfilerWeight(fakeWeight, profile);
@@ -157,7 +157,7 @@ public class TestQueryProfilerWeight extends LuceneTestCase {
}
public void testPropagateExplain() throws IOException {
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
Weight fakeWeight = new FakeWeight(query);
QueryProfilerBreakdown profile = new QueryProfilerBreakdown();
QueryProfilerWeight profileWeight = new QueryProfilerWeight(fakeWeight, profile);
@@ -165,7 +165,7 @@ public class TestQueryProfilerWeight extends LuceneTestCase {
}
public void testPropagateScorer() throws IOException {
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
Weight fakeWeight = new FakeWeight(query);
QueryProfilerBreakdown profile = new QueryProfilerBreakdown();
QueryProfilerWeight profileWeight = new QueryProfilerWeight(fakeWeight, profile);
@@ -173,7 +173,7 @@ public class TestQueryProfilerWeight extends LuceneTestCase {
}
public void testPropagateTopLevelScoringClause() throws IOException {
- Query query = new MatchAllDocsQuery();
+ Query query = MatchAllDocsQuery.INSTANCE;
Weight fakeWeight = new FakeWeight(query);
QueryProfilerBreakdown profile = new QueryProfilerBreakdown();
QueryProfilerWeight profileWeight = new QueryProfilerWeight(fakeWeight, profile);
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
index 3fe7af422db..08da3a39397 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
@@ -495,7 +495,7 @@ public class BBoxStrategy extends SpatialStrategy {
// Query qDisjoint = makeDisjoint();
// BooleanQuery qNotDisjoint = new BooleanQuery();
- // qNotDisjoint.add(new MatchAllDocsQuery(),BooleanClause.Occur.SHOULD);
+ // qNotDisjoint.add(MatchAllDocsQuery.INSTANCE,BooleanClause.Occur.SHOULD);
// qNotDisjoint.add(qDisjoint,BooleanClause.Occur.MUST_NOT);
return qNotDisjoint.build();
}
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java
index aadaff32ee0..6b8334da348 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java
@@ -174,7 +174,7 @@ public class TestSpatialExample extends LuceneTestCase {
strategy.makeDistanceValueSource(pt, DistanceUtils.DEG_TO_KM); // the distance (in km)
Sort distSort =
new Sort(valueSource.getSortField(false)).rewrite(indexSearcher); // false=asc dist
- TopDocs docs = indexSearcher.search(new MatchAllDocsQuery(), 10, distSort);
+ TopDocs docs = indexSearcher.search(MatchAllDocsQuery.INSTANCE, 10, distSort);
assertDocMatchedIds(indexSearcher, docs, 4, 20, 2);
// To get the distance, we could compute from stored values like earlier.
// However in this example we sorted on it, and the distance will get
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
index f84f6007f3f..e6ddd2a3adc 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
@@ -73,7 +73,7 @@ public class TestPointVectorStrategy extends StrategyTestCase {
this.strategy = PointVectorStrategy.newInstance(ctx, getClass().getSimpleName());
adoc("99", "POINT(-5.0 8.2)");
commit();
- SearchResults results = executeQuery(new MatchAllDocsQuery(), 1);
+ SearchResults results = executeQuery(MatchAllDocsQuery.INSTANCE, 1);
Document document = results.results.get(0).document;
assertNull(
"not stored", document.getField(strategy.getFieldName() + PointVectorStrategy.SUFFIX_X));
@@ -88,7 +88,7 @@ public class TestPointVectorStrategy extends StrategyTestCase {
this.strategy = new PointVectorStrategy(ctx, getClass().getSimpleName(), fieldType);
adoc("99", "POINT(-5.0 8.2)");
commit();
- results = executeQuery(new MatchAllDocsQuery(), 1);
+ results = executeQuery(MatchAllDocsQuery.INSTANCE, 1);
document = results.results.get(0).document;
assertEquals(
"stored",