Skip to content

Apache Lucene open-source search software

Make TotalHits a record. (#13762)

Adrien Grandf0fd51c4d5c4
diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md
index a7c7ded80ea..b155e7d087f 100644
--- a/lucene/MIGRATE.md
+++ b/lucene/MIGRATE.md
@@ -193,6 +193,7 @@ access the members using method calls instead of field accesses. Affected classe
- `IOContext`, `MergeInfo`, and `FlushInfo` (GITHUB#13205)
- `BooleanClause` (GITHUB#13261)
+- `TotalHits` (GITHUB#13762)
- Many basic Lucene classes, including `CollectionStatistics`, `TermStatistics` and `LeafMetadata` (GITHUB#13328)
### Boolean flags on IOContext replaced with a new ReadAdvice enum.
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 0feeccb859d..f7446011b26 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
@@ -125,8 +125,8 @@ public class TestIndexSortBackwardsCompatibility extends BackwardsCompatibilityT
.add(new TermQuery(new Term("bid", "" + i)), BooleanClause.Occur.MUST)
.build(),
2);
- assertEquals(2, children.totalHits.value);
- assertEquals(1, parents.totalHits.value);
+ assertEquals(2, children.totalHits.value());
+ assertEquals(1, parents.totalHits.value());
// make sure it's sorted
assertEquals(children.scoreDocs[0].doc + 1, children.scoreDocs[1].doc);
assertEquals(children.scoreDocs[1].doc + 1, parents.scoreDocs[0].doc);
@@ -195,28 +195,28 @@ public class TestIndexSortBackwardsCompatibility extends BackwardsCompatibilityT
IndexSearcher searcher = newSearcher(reader);
TopDocs topDocs = searcher.search(new FieldExistsQuery("titleTokenized"), 10);
- assertEquals(50, topDocs.totalHits.value);
+ assertEquals(50, topDocs.totalHits.value());
topDocs = searcher.search(new FieldExistsQuery("titleDV"), 10);
- assertEquals(50, topDocs.totalHits.value);
+ assertEquals(50, topDocs.totalHits.value());
topDocs =
searcher.search(
IntPoint.newRangeQuery("docid_int", 42, 44),
10,
new Sort(new SortField("docid_intDV", SortField.Type.INT)));
- assertEquals(3, topDocs.totalHits.value);
+ assertEquals(3, topDocs.totalHits.value());
assertEquals(3, topDocs.scoreDocs.length);
assertEquals(42, ((FieldDoc) topDocs.scoreDocs[0]).fields[0]);
assertEquals(43, ((FieldDoc) topDocs.scoreDocs[1]).fields[0]);
assertEquals(44, ((FieldDoc) topDocs.scoreDocs[2]).fields[0]);
topDocs = searcher.search(new TermQuery(new Term("body", "the")), 5);
- assertTrue(topDocs.totalHits.value > 0);
+ assertTrue(topDocs.totalHits.value() > 0);
topDocs =
searcher.search(
new MatchAllDocsQuery(), 5, new Sort(new SortField("dateDV", SortField.Type.LONG)));
- assertEquals(50, topDocs.totalHits.value);
+ assertEquals(50, topDocs.totalHits.value());
assertEquals(5, topDocs.scoreDocs.length);
long firstDate = (Long) ((FieldDoc) topDocs.scoreDocs[0]).fields[0];
long lastDate = (Long) ((FieldDoc) topDocs.scoreDocs[4]).fields[0];
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.java
index b6da2d2f404..eb8101eeb9b 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.java
@@ -91,7 +91,7 @@ public class TestDocMaker extends BenchmarkTestCase {
IndexReader reader = DirectoryReader.open(runData.getDirectory());
IndexSearcher searcher = newSearcher(reader);
TopDocs td = searcher.search(new TermQuery(new Term("key", "value")), 10);
- assertEquals(numExpectedResults, td.totalHits.value);
+ assertEquals(numExpectedResults, td.totalHits.value());
reader.close();
}
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.java
index 393d352abf2..a060db7a08c 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.java
@@ -160,7 +160,7 @@ public class TestLineDocSource extends BenchmarkTestCase {
reader = DirectoryReader.open(runData.getDirectory());
searcher = newSearcher(reader);
TopDocs td = searcher.search(new TermQuery(new Term("body", "body")), 10);
- assertEquals(numAdds, td.totalHits.value);
+ assertEquals(numAdds, td.totalHits.value());
assertNotNull(td.scoreDocs[0]);
if (storedField == null) {
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
index e16d9b66ab9..1f56d19a714 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
@@ -216,7 +216,7 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
builder.add(query, BooleanClause.Occur.MUST);
}
TopDocs search = indexSearcher.search(builder.build(), 1);
- return search.totalHits.value > 0 ? search.scoreDocs[0].score : 1;
+ return search.totalHits.value() > 0 ? search.scoreDocs[0].score : 1;
}
private double calculateLogPrior(Term term) throws IOException {
@@ -227,6 +227,6 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
bq.add(query, BooleanClause.Occur.MUST);
}
TopDocs topDocs = indexSearcher.search(bq.build(), 1);
- return topDocs.totalHits.value > 0 ? Math.log(topDocs.scoreDocs[0].score) : 0;
+ return topDocs.totalHits.value() > 0 ? Math.log(topDocs.scoreDocs[0].score) : 0;
}
}
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
index 70e3a88593b..ae3e5aa2b97 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
@@ -159,7 +159,7 @@ public class KNearestFuzzyClassifier implements Classifier<BytesRef> {
Map<BytesRef, Integer> classCounts = new HashMap<>();
Map<BytesRef, Double> classBoosts =
new HashMap<>(); // this is a boost based on class ranking positions in topDocs
- float maxScore = topDocs.totalHits.value == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
+ float maxScore = topDocs.totalHits.value() == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
StoredFields storedFields = indexSearcher.storedFields();
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
IndexableField storableField = storedFields.document(scoreDoc.doc).getField(classFieldName);
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
index 7ffb93ae124..2dba8bfd632 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
@@ -192,7 +192,7 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
Map<BytesRef, Integer> classCounts = new HashMap<>();
Map<BytesRef, Double> classBoosts =
new HashMap<>(); // this is a boost based on class ranking positions in topDocs
- float maxScore = topDocs.totalHits.value == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
+ float maxScore = topDocs.totalHits.value() == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
StoredFields storedFields = indexSearcher.storedFields();
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
IndexableField[] storableFields =
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 76a33b0239c..2e6ca311140 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
@@ -138,8 +138,8 @@ public class DatasetSplitter {
// iterate over existing documents
StoredFields storedFields = originalIndex.storedFields();
for (GroupDocs<Object> group : topGroups.groups) {
- assert group.totalHits().relation == TotalHits.Relation.EQUAL_TO;
- long totalHits = group.totalHits().value;
+ assert group.totalHits().relation() == TotalHits.Relation.EQUAL_TO;
+ long totalHits = group.totalHits().value();
double testSize = totalHits * testRatio;
int tc = 0;
double cvSize = totalHits * crossValidationRatio;
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 c0ce4eea3c6..df19de6cc8d 100644
--- a/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
@@ -146,7 +146,7 @@ abstract class AbstractKnnVectorQuery extends Query {
// Perform the approximate kNN search
// We pass cost + 1 here to account for the edge case when we explore exactly cost vectors
TopDocs results = approximateSearch(ctx, acceptDocs, cost + 1, timeLimitingKnnCollectorManager);
- if (results.totalHits.relation == TotalHits.Relation.EQUAL_TO
+ if (results.totalHits.relation() == TotalHits.Relation.EQUAL_TO
// Return partial results only when timeout is met
|| (queryTimeout != null && queryTimeout.shouldExit())) {
return results;
diff --git a/lucene/core/src/java/org/apache/lucene/search/AbstractVectorSimilarityQuery.java b/lucene/core/src/java/org/apache/lucene/search/AbstractVectorSimilarityQuery.java
index 75d639c08fe..dde9ce76ac3 100644
--- a/lucene/core/src/java/org/apache/lucene/search/AbstractVectorSimilarityQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/AbstractVectorSimilarityQuery.java
@@ -159,7 +159,7 @@ abstract class AbstractVectorSimilarityQuery extends Query {
TopDocs results =
approximateSearch(context, acceptDocs, cardinality, timeLimitingKnnCollectorManager);
- if (results.totalHits.relation == TotalHits.Relation.EQUAL_TO
+ if (results.totalHits.relation() == TotalHits.Relation.EQUAL_TO
// Return partial results only when timeout is met
|| (queryTimeout != null && queryTimeout.shouldExit())) {
// Return an iterator over the collected results
diff --git a/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java b/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
index 68c45bb2c66..3139da98a84 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
@@ -102,7 +102,7 @@ public class SortRescorer extends Rescorer {
new TotalHits(1, Relation.EQUAL_TO),
new ScoreDoc[] {new ScoreDoc(docID, firstPassExplanation.getValue().floatValue())});
TopDocs hits = rescore(searcher, oneHit, 1);
- assert hits.totalHits.value == 1;
+ assert hits.totalHits.value() == 1;
List<Explanation> subs = new ArrayList<>();
diff --git a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingKnnCollectorManager.java b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingKnnCollectorManager.java
index aa26a72808c..2a1f312fbc5 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingKnnCollectorManager.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingKnnCollectorManager.java
@@ -95,9 +95,9 @@ public class TimeLimitingKnnCollectorManager implements KnnCollectorManager {
TotalHits.Relation relation =
queryTimeout.shouldExit()
? TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO
- : docs.totalHits.relation;
+ : docs.totalHits.relation();
- return new TopDocs(new TotalHits(docs.totalHits.value, relation), docs.scoreDocs);
+ return new TopDocs(new TotalHits(docs.totalHits.value(), relation), docs.scoreDocs);
}
}
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocs.java b/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
index 08b25a50554..5a4c3bfafb4 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
@@ -291,10 +291,10 @@ public class TopDocs {
final TopDocs shard = shardHits[shardIDX];
// totalHits can be non-zero even if no hits were
// collected, when searchAfter was used:
- totalHitCount += shard.totalHits.value;
+ totalHitCount += shard.totalHits.value();
// If any hit count is a lower bound then the merged
// total hit count is a lower bound as well
- if (shard.totalHits.relation == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
+ if (shard.totalHits.relation() == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
totalHitsRelation = TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO;
}
if (shard.scoreDocs != null && shard.scoreDocs.length > 0) {
diff --git a/lucene/core/src/java/org/apache/lucene/search/TotalHits.java b/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
index 8d3e9f1ed85..7d82654b9e3 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
@@ -24,8 +24,14 @@ import java.util.Objects;
* documents. Given that it is often enough to have a lower bounds of the number of hits, such as
* "there are more than 1000 hits", Lucene has options to stop counting as soon as a threshold has
* been reached in order to improve query times.
+ *
+ * @param value The value of the total hit count. Must be interpreted in the context of {@link
+ * #relation}.
+ * @param relation Whether {@link #value} is the exact hit count, in which case {@link #relation} is
+ * equal to {@link Relation#EQUAL_TO}, or a lower bound of the total hit count, in which case
+ * {@link #relation} is equal to {@link Relation#GREATER_THAN_OR_EQUAL_TO}.
*/
-public final class TotalHits {
+public record TotalHits(long value, Relation relation) {
/** How the {@link TotalHits#value} should be interpreted. */
public enum Relation {
@@ -35,40 +41,12 @@ public final class TotalHits {
GREATER_THAN_OR_EQUAL_TO
}
- /** The value of the total hit count. Must be interpreted in the context of {@link #relation}. */
- public final long value;
-
- /**
- * Whether {@link #value} is the exact hit count, in which case {@link #relation} is equal to
- * {@link Relation#EQUAL_TO}, or a lower bound of the total hit count, in which case {@link
- * #relation} is equal to {@link Relation#GREATER_THAN_OR_EQUAL_TO}.
- */
- public final Relation relation;
-
/** Sole constructor. */
- public TotalHits(long value, Relation relation) {
+ public TotalHits {
if (value < 0) {
throw new IllegalArgumentException("value must be >= 0, got " + value);
}
- this.value = value;
- this.relation = Objects.requireNonNull(relation);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- TotalHits totalHits = (TotalHits) o;
- return value == totalHits.value && relation == totalHits.relation;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value, relation);
+ Objects.requireNonNull(relation);
}
@Override
diff --git a/lucene/core/src/test/org/apache/lucene/TestDemo.java b/lucene/core/src/test/org/apache/lucene/TestDemo.java
index 6c608e1d0b1..9f6f880e1dc 100644
--- a/lucene/core/src/test/org/apache/lucene/TestDemo.java
+++ b/lucene/core/src/test/org/apache/lucene/TestDemo.java
@@ -70,7 +70,7 @@ public class TestDemo extends LuceneTestCase {
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = searcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results.
StoredFields storedFields = searcher.storedFields();
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java
index 3098ca7fbf3..642b20b73dc 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java
@@ -116,7 +116,7 @@ public class TestLucene99HnswQuantizedVectorsFormat extends BaseKnnVectorsFormat
TopKnnCollector topKnnCollector = new TopKnnCollector(5, Integer.MAX_VALUE);
r.searchNearestVectors("f", new float[] {0.6f, 0.8f}, topKnnCollector, null);
TopDocs topDocs = topKnnCollector.topDocs();
- assertEquals(3, topDocs.totalHits.value);
+ assertEquals(3, topDocs.totalHits.value());
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
assertTrue(scoreDoc.score >= 0f);
}
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
index 0e93934855d..e617d527294 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
@@ -119,7 +119,7 @@ public class TestPerFieldDocValuesFormat extends BaseDocValuesFormatTestCase {
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
StoredFields storedFields = isearcher.storedFields();
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
index b9ccab0935a..ebae291f35e 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
@@ -210,7 +210,7 @@ public class TestPerFieldPostingsFormat2 extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
TopDocs search = searcher.search(new TermQuery(t), num + 10);
- assertEquals(num, search.totalHits.value);
+ assertEquals(num, search.totalHits.value());
reader.close();
}
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 a5b5806f358..cd5bde9ba3a 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java
@@ -73,7 +73,7 @@ public class TestFeatureSort extends LuceneTestCase {
Sort sort = new Sort(FeatureField.newFeatureSort("field", "name"));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("30.1", storedFields.document(td.scoreDocs[0].doc).get("value"));
assertEquals("4.2", storedFields.document(td.scoreDocs[1].doc).get("value"));
@@ -106,7 +106,7 @@ public class TestFeatureSort extends LuceneTestCase {
StoredFields storedFields = searcher.storedFields();
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
assertEquals("1.3", storedFields.document(td.scoreDocs[1].doc).get("value"));
@@ -140,7 +140,7 @@ public class TestFeatureSort extends LuceneTestCase {
StoredFields storedFields = searcher.storedFields();
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
assertEquals("1.3", storedFields.document(td.scoreDocs[1].doc).get("value"));
@@ -175,7 +175,7 @@ public class TestFeatureSort extends LuceneTestCase {
StoredFields storedFields = searcher.storedFields();
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
assertEquals("1.3", storedFields.document(td.scoreDocs[1].doc).get("value"));
@@ -216,7 +216,7 @@ public class TestFeatureSort extends LuceneTestCase {
StoredFields storedFields = searcher.storedFields();
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(7, td.totalHits.value);
+ assertEquals(7, td.totalHits.value());
// null is treated as 0
assertEquals("4.2", storedFields.document(td.scoreDocs[0].doc).get("value"));
assertEquals("1.3", storedFields.document(td.scoreDocs[1].doc).get("value"));
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestField.java b/lucene/core/src/test/org/apache/lucene/document/TestField.java
index e813721b595..6e3a855a0df 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestField.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java
@@ -680,7 +680,7 @@ public class TestField extends LuceneTestCase {
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(new Term("binary", br)), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
Document storedDoc = s.storedFields().document(hits.scoreDocs[0].doc);
assertEquals(br, storedDoc.getField("binary").binaryValue());
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 76ed1b5bab3..210b9229532 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java
@@ -232,7 +232,7 @@ public class TestLatLonPointDistanceFeatureQuery extends LuceneTestCase {
Query q = LatLonPoint.newDistanceFeatureQuery("foo", 3, 10, 10, 5000);
TopDocs topHits = searcher.search(q, 2);
- assertEquals(0, topHits.totalHits.value);
+ assertEquals(0, topHits.totalHits.value());
}
public void testMissingValue() throws IOException {
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java
index 2ea6e161435..036e0a5450e 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java
@@ -197,7 +197,7 @@ public class TestLongDistanceFeatureQuery extends LuceneTestCase {
Query q = LongField.newDistanceFeatureQuery("foo", 3, 10, 5);
TopDocs topHits = searcher.search(q, 2);
- assertEquals(0, topHits.totalHits.value);
+ assertEquals(0, topHits.totalHits.value());
}
public void testMissingValue() throws IOException {
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestSortedSetDocValuesSetQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestSortedSetDocValuesSetQuery.java
index 59a7ffbb135..b348ca41ddb 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestSortedSetDocValuesSetQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestSortedSetDocValuesSetQuery.java
@@ -251,7 +251,7 @@ public class TestSortedSetDocValuesSetQuery extends LuceneTestCase {
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
index a0edb9df83a..b76d0e10aec 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
@@ -57,7 +57,7 @@ public class TestBinaryTerms extends LuceneTestCase {
bytes.bytes[1] = (byte) (255 - i);
bytes.length = 2;
TopDocs docs = is.search(new TermQuery(new Term("bytes", bytes)), 5);
- assertEquals(1, docs.totalHits.value);
+ assertEquals(1, docs.totalHits.value());
assertEquals("" + i, is.storedFields().document(docs.scoreDocs[0].doc).get("id"));
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
index 5ed2149963a..cab8c004c1e 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
@@ -105,7 +105,7 @@ public class TestCrashCausesCorruptIndex extends LuceneTestCase {
IndexSearcher indexSearcher = newSearcher(indexReader);
TopDocs topDocs = indexSearcher.search(new TermQuery(new Term(TEXT_FIELD, "fleas")), 10);
assertNotNull(topDocs);
- assertEquals(expectedTotalHits, topDocs.totalHits.value);
+ assertEquals(expectedTotalHits, topDocs.totalHits.value());
indexReader.close();
realDirectory.close();
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
index 7b045e3e136..d06330c2926 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
@@ -75,7 +75,7 @@ public class TestForTooMuchCloning extends LuceneTestCase {
final TopDocs hits =
s.search(
new TermRangeQuery("field", new BytesRef(), new BytesRef("\uFFFF"), true, true), 10);
- assertTrue(hits.totalHits.value > 0);
+ assertTrue(hits.totalHits.value() > 0);
final int queryCloneCount = dir.getInputCloneCount() - cloneCount;
// System.out.println("query clone count=" + queryCloneCount);
// It is rather difficult to reliably predict how many query clone calls will be performed. One
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 0d874b73c7f..91a16792617 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -1780,9 +1780,9 @@ public class TestIndexSorting extends LuceneTestCase {
TermQuery termQuery = new TermQuery(new Term("id", Integer.toString(i)));
final TopDocs topDocs = searcher.search(termQuery, 1);
if (deleted.get(i)) {
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
} else {
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
NumericDocValues values = MultiDocValues.getNumericValues(reader, "id");
assertEquals(topDocs.scoreDocs[0].doc, values.advance(topDocs.scoreDocs[0].doc));
assertEquals(i, values.longValue());
@@ -1832,9 +1832,9 @@ public class TestIndexSorting extends LuceneTestCase {
TermQuery termQuery = new TermQuery(new Term("id", Integer.toString(i)));
final TopDocs topDocs = searcher.search(termQuery, 1);
if (deleted.get(i)) {
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
} else {
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
NumericDocValues values = MultiDocValues.getNumericValues(reader, "id");
assertEquals(topDocs.scoreDocs[0].doc, values.advance(topDocs.scoreDocs[0].doc));
assertEquals(i, values.longValue());
@@ -1937,9 +1937,9 @@ public class TestIndexSorting extends LuceneTestCase {
final TopDocs topDocs =
searcher.search(new TermQuery(new Term("id", Integer.toString(i))), 1);
if (values.containsKey(i) == false) {
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
} else {
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
NumericDocValues dvs = MultiDocValues.getNumericValues(reader, "foo");
int docID = topDocs.scoreDocs[0].doc;
assertEquals(docID, dvs.advance(docID));
@@ -2074,7 +2074,7 @@ public class TestIndexSorting extends LuceneTestCase {
for (int i = 0; i < numDocs; ++i) {
final TopDocs topDocs =
searcher.search(new TermQuery(new Term("id", Integer.toString(i))), 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
NumericDocValues dvs = MultiDocValues.getNumericValues(reader, "bar");
int hitDoc = topDocs.scoreDocs[0].doc;
assertEquals(hitDoc, dvs.advance(hitDoc));
@@ -2181,8 +2181,8 @@ public class TestIndexSorting extends LuceneTestCase {
Query query = new TermQuery(new Term("id", Integer.toString(i)));
final TopDocs topDocs = searcher.search(query, 1);
final TopDocs topDocs2 = searcher2.search(query, 1);
- assertEquals(topDocs.totalHits.value, topDocs2.totalHits.value);
- if (topDocs.totalHits.value == 1) {
+ assertEquals(topDocs.totalHits.value(), topDocs2.totalHits.value());
+ if (topDocs.totalHits.value() == 1) {
NumericDocValues dvs1 = MultiDocValues.getNumericValues(reader, "foo");
int hitDoc1 = topDocs.scoreDocs[0].doc;
assertEquals(hitDoc1, dvs1.advance(hitDoc1));
@@ -2659,11 +2659,11 @@ public class TestIndexSorting extends LuceneTestCase {
s2.search(new MatchAllDocsQuery(), new TopFieldCollectorManager(sort, numHits, 1));
if (VERBOSE) {
- System.out.println(" topDocs query-time sort: totalHits=" + hits1.totalHits.value);
+ System.out.println(" topDocs query-time sort: totalHits=" + hits1.totalHits.value());
for (ScoreDoc scoreDoc : hits1.scoreDocs) {
System.out.println(" " + scoreDoc.doc);
}
- System.out.println(" topDocs index-time sort: totalHits=" + hits2.totalHits.value);
+ System.out.println(" topDocs index-time sort: totalHits=" + hits2.totalHits.value());
for (ScoreDoc scoreDoc : hits2.scoreDocs) {
System.out.println(" " + scoreDoc.doc);
}
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 d9ff3887aa2..5a090c131dd 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -1930,7 +1930,7 @@ public class TestIndexWriter extends LuceneTestCase {
builder.add(new Term("body", "test"), 2);
PhraseQuery pq = builder.build();
// body:"just ? test"
- assertEquals(1, is.search(pq, 5).totalHits.value);
+ assertEquals(1, is.search(pq, 5).totalHits.value());
ir.close();
dir.close();
}
@@ -1963,7 +1963,7 @@ public class TestIndexWriter extends LuceneTestCase {
builder.add(new Term("body", "test"), 3);
PhraseQuery pq = builder.build();
// body:"just ? ? test"
- assertEquals(1, is.search(pq, 5).totalHits.value);
+ assertEquals(1, is.search(pq, 5).totalHits.value());
ir.close();
dir.close();
}
@@ -3484,7 +3484,7 @@ public class TestIndexWriter extends LuceneTestCase {
assertEquals(2, reader.docFreq(new Term("id", "1")));
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs topDocs = searcher.search(new TermQuery(new Term("id", "1")), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
Document document = reader.storedFields().document(topDocs.scoreDocs[0].doc);
assertEquals("2", document.get("version"));
@@ -3500,7 +3500,7 @@ public class TestIndexWriter extends LuceneTestCase {
oldReader.close();
searcher = new IndexSearcher(reader);
topDocs = searcher.search(new TermQuery(new Term("id", "1")), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
document = reader.storedFields().document(topDocs.scoreDocs[0].doc);
assertEquals("3", document.get("version"));
@@ -3513,7 +3513,7 @@ public class TestIndexWriter extends LuceneTestCase {
oldReader.close();
searcher = new IndexSearcher(reader);
topDocs = searcher.search(new TermQuery(new Term("id", "1")), 10);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
int numSoftDeleted = 0;
for (SegmentCommitInfo info : writer.cloneSegmentInfos()) {
numSoftDeleted += info.getSoftDelCount();
@@ -3650,10 +3650,10 @@ public class TestIndexWriter extends LuceneTestCase {
for (String id : ids) {
TopDocs topDocs = searcher.search(new TermQuery(new Term("id", id)), 10);
if (updateSeveralDocs) {
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
assertEquals(Math.abs(topDocs.scoreDocs[0].doc - topDocs.scoreDocs[1].doc), 1);
} else {
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
}
}
if (mixDeletes == false) {
@@ -4442,7 +4442,10 @@ public class TestIndexWriter extends LuceneTestCase {
try {
assertEquals(
1,
- acquire.search(new TermQuery(new Term("id", id)), 10).totalHits.value);
+ acquire
+ .search(new TermQuery(new Term("id", id)), 10)
+ .totalHits
+ .value());
} finally {
manager.release(acquire);
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
index f27298781ca..fe114e5cc51 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
@@ -547,7 +547,7 @@ public class TestIndexWriterDelete extends LuceneTestCase {
private long getHitCount(Directory dir, Term term) throws IOException {
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
- long hitCount = searcher.search(new TermQuery(term), 1000).totalHits.value;
+ long hitCount = searcher.search(new TermQuery(term), 1000).totalHits.value();
reader.close();
return hitCount;
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
index 0f348044b60..48aac56a22d 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
@@ -69,7 +69,7 @@ public class TestIndexWriterMaxDocs extends LuceneTestCase {
TopScoreDocCollectorManager collectorManager =
new TopScoreDocCollectorManager(10, null, Integer.MAX_VALUE, true);
TopDocs hits = searcher.search(new TermQuery(new Term("field", "text")), collectorManager);
- assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value);
+ assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value());
// Sort by docID reversed:
hits =
@@ -77,7 +77,7 @@ public class TestIndexWriterMaxDocs extends LuceneTestCase {
new TermQuery(new Term("field", "text")),
10,
new Sort(new SortField(null, SortField.Type.DOC, true)));
- assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value);
+ assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value());
assertEquals(10, hits.scoreDocs.length);
assertEquals(IndexWriter.MAX_DOCS - 1, hits.scoreDocs[0].doc);
ir.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 c56feb62d84..824b24ed6aa 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
@@ -801,7 +801,7 @@ public class TestIndexWriterMergePolicy extends LuceneTestCase {
new IndexSearcher(reader)
.search(new TermQuery(new Term("id", "1")), 10)
.totalHits
- .value);
+ .value());
}
} else {
if (random().nextBoolean()) {
@@ -815,7 +815,7 @@ public class TestIndexWriterMergePolicy extends LuceneTestCase {
new IndexSearcher(open)
.search(new TermQuery(new Term("id", "1")), 10)
.totalHits
- .value);
+ .value());
}
}
numFullFlushes.decrementAndGet();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
index 339368da1f8..19f6bdd74e1 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
@@ -284,7 +284,7 @@ public class TestIndexableField extends LuceneTestCase {
}
final TopDocs hits = s.search(new TermQuery(new Term("id", "" + id)), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final int docID = hits.scoreDocs[0].doc;
final Document doc = storedFields.document(docID);
final int endCounter = counter + fieldsPerDoc[id];
@@ -354,14 +354,14 @@ public class TestIndexableField extends LuceneTestCase {
bq.add(new TermQuery(new Term("id", "" + id)), BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term(name, "text")), BooleanClause.Occur.MUST);
final TopDocs hits2 = s.search(bq.build(), 1);
- assertEquals(1, hits2.totalHits.value);
+ assertEquals(1, hits2.totalHits.value());
assertEquals(docID, hits2.scoreDocs[0].doc);
bq = new BooleanQuery.Builder();
bq.add(new TermQuery(new Term("id", "" + id)), BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term(name, "" + counter)), BooleanClause.Occur.MUST);
final TopDocs hits3 = s.search(bq.build(), 1);
- assertEquals(1, hits3.totalHits.value);
+ assertEquals(1, hits3.totalHits.value());
assertEquals(docID, hits3.scoreDocs[0].doc);
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
index c920ecd9f24..66d24d6b942 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
@@ -127,7 +127,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
DirectoryReader r = w.getReader();
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(id), 1);
- assertEquals("maxDoc: " + r.maxDoc(), 1, hits.totalHits.value);
+ assertEquals("maxDoc: " + r.maxDoc(), 1, hits.totalHits.value());
Document doc = r.storedFields().document(hits.scoreDocs[0].doc);
assertEquals(maxThread, doc.getField("thread").numericValue().intValue());
r.close();
@@ -276,7 +276,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
TopDocs hits = s.search(new TermQuery(new Term("id", "" + id)), 1);
if (expectedThreadIDs[id] != -1) {
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
Document doc = r.storedFields().document(hits.scoreDocs[0].doc);
int actualThreadID = doc.getField("thread").numericValue().intValue();
if (expectedThreadIDs[id] != actualThreadID) {
@@ -306,14 +306,14 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
}
assertEquals("id=" + id, expectedThreadIDs[id], actualThreadID);
}
- } else if (hits.totalHits.value != 0) {
+ } else if (hits.totalHits.value() != 0) {
System.out.println(
"FAIL: id="
+ id
+ " expectedThreadID="
+ expectedThreadIDs[id]
+ " vs totalHits="
- + hits.totalHits.value
+ + hits.totalHits.value()
+ " commitSeqNo="
+ commitSeqNo
+ " numThreads="
@@ -331,7 +331,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
}
}
}
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
}
}
w.close();
@@ -482,7 +482,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
// We pre-add all ids up front:
assert expectedThreadIDs[id] != -1;
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
int hitDoc = hits.scoreDocs[0].doc;
assertEquals(hitDoc, docValues.advance(hitDoc));
int actualThreadID = (int) docValues.longValue();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
index 086b45a5ec7..a5f8021bb58 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
@@ -476,7 +476,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
for (LeafReaderContext c : reader.leaves()) {
TopDocs topDocs =
new IndexSearcher(c.reader()).search(new TermQuery(new Term("id", "" + doc)), 10);
- if (topDocs.totalHits.value == 1) {
+ if (topDocs.totalHits.value() == 1) {
assertNull(numericIdValues);
assertNull(binaryIdValues);
numericIdValues = c.reader().getNumericDocValues("numericId");
@@ -484,7 +484,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
binaryIdValues = c.reader().getBinaryDocValues("binaryId");
assertEquals(topDocs.scoreDocs[0].doc, binaryIdValues.advance(topDocs.scoreDocs[0].doc));
} else {
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
}
@@ -564,7 +564,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
Long value = values[i];
TopDocs topDocs =
new IndexSearcher(reader).search(new TermQuery(new Term("id", "" + i)), 10);
- assertEquals(topDocs.totalHits.value, 1);
+ assertEquals(topDocs.totalHits.value(), 1);
int docID = topDocs.scoreDocs[0].doc;
List<LeafReaderContext> leaves = reader.leaves();
int subIndex = ReaderUtil.subIndex(docID, leaves);
@@ -591,7 +591,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
do { // retry if we just committing a merge
try (DirectoryReader reader = DirectoryReader.open(writer)) {
TopDocs topDocs = new IndexSearcher(reader).search(new TermQuery(doc), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
int theDoc = topDocs.scoreDocs[0].doc;
seqId = writer.tryUpdateDocValue(reader, theDoc, fields);
}
@@ -676,7 +676,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs is_live = searcher.search(new FieldExistsQuery("is_live"), 5);
- assertEquals(numHits, is_live.totalHits.value);
+ assertEquals(numHits, is_live.totalHits.value());
StoredFields storedFields = reader.storedFields();
for (ScoreDoc doc : is_live.scoreDocs) {
int id = Integer.parseInt(storedFields.document(doc.doc).get("id"));
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
index 4a54f6b1cf2..d5f014b302d 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
@@ -170,7 +170,7 @@ public class TestNumericDocValuesUpdates extends LuceneTestCase {
new TermQuery(new Term("id", id)),
1,
new Sort(new SortField("val", SortField.Type.LONG)));
- assertEquals(id + " missing?", 1, td.totalHits.value);
+ assertEquals(id + " missing?", 1, td.totalHits.value());
assertEquals(id + " value", expect.getValue(), ((FieldDoc) td.scoreDocs[0]).fields[0]);
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
index 9ea726f8abf..e6246a1de2c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
@@ -87,7 +87,7 @@ public class TestReadOnlyIndex extends LuceneTestCase {
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
StoredFields storedFields = isearcher.storedFields();
for (int i = 0; i < hits.scoreDocs.length; i++) {
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
index a1b70deba66..14d09f8d941 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
@@ -83,7 +83,7 @@ public class TestRollingUpdates extends LuceneTestCase {
final boolean doUpdate;
if (s != null && updateCount < SIZE) {
TopDocs hits = s.search(new TermQuery(idTerm), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
doUpdate = w.tryDeleteDocument(r, hits.scoreDocs[0].doc) == -1;
if (VERBOSE) {
if (doUpdate) {
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 1df06462d0e..0e492573409 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
@@ -340,10 +340,10 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
for (String id : ids) {
TopDocs topDocs = searcher.search(new TermQuery(new Term("id", id)), 10);
if (updateSeveralDocs) {
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
assertEquals(Math.abs(topDocs.scoreDocs[0].doc - topDocs.scoreDocs[1].doc), 1);
} else {
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
}
}
writer.addDocument(new Document()); // add a dummy doc to trigger a segment here
@@ -386,13 +386,13 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
TopDocs seq_id =
searcher.search(
IntPoint.newRangeQuery("seq_id", seqIds.intValue() - 50, Integer.MAX_VALUE), 10);
- assertTrue(seq_id.totalHits.value + " hits", seq_id.totalHits.value >= 50);
+ assertTrue(seq_id.totalHits.value() + " hits", seq_id.totalHits.value() >= 50);
searcher = new IndexSearcher(reader);
for (String id : ids) {
if (updateSeveralDocs) {
- assertEquals(2, searcher.search(new TermQuery(new Term("id", id)), 10).totalHits.value);
+ assertEquals(2, searcher.search(new TermQuery(new Term("id", id)), 10).totalHits.value());
} else {
- assertEquals(1, searcher.search(new TermQuery(new Term("id", id)), 10).totalHits.value);
+ assertEquals(1, searcher.search(new TermQuery(new Term("id", id)), 10).totalHits.value());
}
}
IOUtils.close(reader, writer, dir);
@@ -651,7 +651,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
TopDocs topDocs =
new IndexSearcher(new IncludeSoftDeletesWrapper(reader))
.search(new TermQuery(new Term("id", "1")), 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
if (writer.tryDeleteDocument(reader, topDocs.scoreDocs[0].doc) > 0) {
break;
}
@@ -784,7 +784,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(writer)) {
TopDocs topDocs =
new IndexSearcher(new IncludeSoftDeletesWrapper(reader)).search(new TermQuery(doc), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
int theDoc = topDocs.scoreDocs[0].doc;
seqId = writer.tryUpdateDocValue(reader, theDoc, fields);
}
@@ -797,7 +797,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
try (DirectoryReader reader = DirectoryReader.open(writer)) {
TopDocs topDocs =
new IndexSearcher(new IncludeSoftDeletesWrapper(reader)).search(new TermQuery(doc), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
int theDoc = topDocs.scoreDocs[0].doc;
seqId = writer.tryDeleteDocument(reader, theDoc);
}
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java
index 58a0dc601e6..241fc0a5fe5 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java
@@ -290,12 +290,12 @@ public class TestSortingCodecReader extends LuceneTestCase {
IndexSearcher searcher = new IndexSearcher(r);
TopDocs result =
searcher.search(LongPoint.newExactQuery("point_id", ids.longValue()), 1);
- assertEquals(1, result.totalHits.value);
+ assertEquals(1, result.totalHits.value());
assertEquals(idNext, result.scoreDocs[0].doc);
result =
searcher.search(new TermQuery(new Term("string_id", "" + ids.longValue())), 1);
- assertEquals(1, result.totalHits.value);
+ assertEquals(1, result.totalHits.value());
assertEquals(idNext, result.scoreDocs[0].doc);
}
assertEquals(DocIdSetIterator.NO_MORE_DOCS, ids.nextDoc());
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
index ceecf32928d..984a2340d01 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
@@ -110,9 +110,9 @@ public class TestStressDeletes extends LuceneTestCase {
int id = ent.getKey();
TopDocs hits = s.search(new TermQuery(new Term("id", "" + id)), 1);
if (ent.getValue()) {
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
} else {
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
}
}
r.close();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
index 955c335a085..ab8d2aff4c2 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
@@ -418,11 +418,11 @@ public class TestStressNRT extends LuceneTestCase {
Query q = new TermQuery(new Term("id", Integer.toString(id)));
TopDocs results = searcher.search(q, 10);
- if (results.totalHits.value == 0 && tombstones) {
+ if (results.totalHits.value() == 0 && tombstones) {
// if we couldn't find the doc, look for its tombstone
q = new TermQuery(new Term("id", "-" + Integer.toString(id)));
results = searcher.search(q, 1);
- if (results.totalHits.value == 0) {
+ if (results.totalHits.value() == 0) {
if (val == -1L) {
// expected... no doc was added yet
r.decRef();
@@ -438,11 +438,11 @@ public class TestStressNRT extends LuceneTestCase {
}
}
- if (results.totalHits.value == 0 && !tombstones) {
+ if (results.totalHits.value() == 0 && !tombstones) {
// nothing to do - we can't tell anything from a deleted doc without tombstones
} else {
// we should have found the document, or its tombstone
- if (results.totalHits.value != 1) {
+ if (results.totalHits.value() != 1) {
System.out.println("FAIL: hits id:" + id + " val=" + val);
for (ScoreDoc sd : results.scoreDocs) {
final Document doc = r.storedFields().document(sd.doc);
@@ -454,7 +454,7 @@ public class TestStressNRT extends LuceneTestCase {
+ " foundVal="
+ doc.get(field));
}
- fail("id=" + id + " reader=" + r + " totalHits=" + results.totalHits.value);
+ fail("id=" + id + " reader=" + r + " totalHits=" + results.totalHits.value());
}
Document doc = searcher.storedFields().document(results.scoreDocs[0].doc);
long foundVal = Long.parseLong(doc.get(field));
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
index 78d00a1eec4..a1ecc29ca2c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
@@ -71,7 +71,7 @@ public class TestTryDelete extends LuceneTestCase {
IndexSearcher searcher = mgr.acquire();
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
long result;
if (random().nextBoolean()) {
@@ -99,7 +99,7 @@ public class TestTryDelete extends LuceneTestCase {
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
public void testTryDeleteDocumentCloseAndReopen() throws IOException {
@@ -112,7 +112,7 @@ public class TestTryDelete extends LuceneTestCase {
IndexSearcher searcher = mgr.acquire();
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
long result = writer.tryDeleteDocument(DirectoryReader.open(writer), 0);
@@ -128,7 +128,7 @@ public class TestTryDelete extends LuceneTestCase {
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
writer.close();
@@ -136,7 +136,7 @@ public class TestTryDelete extends LuceneTestCase {
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
public void testDeleteDocuments() throws IOException {
@@ -149,7 +149,7 @@ public class TestTryDelete extends LuceneTestCase {
IndexSearcher searcher = mgr.acquire();
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
long result = writer.deleteDocuments(new TermQuery(new Term("foo", "0")));
@@ -165,6 +165,6 @@ public class TestTryDelete extends LuceneTestCase {
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
}
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 7520003ab4f..21a33f9ca3e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
@@ -216,7 +216,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
Query filter = new TermQuery(new Term("id", "id2"));
Query kvq = getKnnVectorQuery("field", new float[] {0, 0}, 10, filter);
TopDocs topDocs = searcher.search(kvq, 3);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertIdMatches(reader, "id2", topDocs.scoreDocs[0]);
}
}
@@ -230,7 +230,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
Query filter = new TermQuery(new Term("other", "value"));
Query kvq = getKnnVectorQuery("field", new float[] {0, 0}, 10, filter);
TopDocs topDocs = searcher.search(kvq, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
}
@@ -510,7 +510,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
// test that
assert reader.hasDeletions() == false;
assertEquals(expected, results.scoreDocs.length);
- assertTrue(results.totalHits.value >= results.scoreDocs.length);
+ assertTrue(results.totalHits.value() >= results.scoreDocs.length);
// verify the results are in descending score order
float last = Float.MAX_VALUE;
for (ScoreDoc scoreDoc : results.scoreDocs) {
@@ -554,8 +554,8 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
TopDocs results =
searcher.search(
getKnnVectorQuery("field", randomVector(dimension), 10, filter1), numDocs);
- assertEquals(9, results.totalHits.value);
- assertEquals(results.totalHits.value, results.scoreDocs.length);
+ assertEquals(9, results.totalHits.value());
+ assertEquals(results.totalHits.value(), results.scoreDocs.length);
expectThrows(
UnsupportedOperationException.class,
() ->
@@ -568,8 +568,8 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
results =
searcher.search(
getKnnVectorQuery("field", randomVector(dimension), 5, filter2), numDocs);
- assertEquals(5, results.totalHits.value);
- assertEquals(results.totalHits.value, results.scoreDocs.length);
+ assertEquals(5, results.totalHits.value());
+ assertEquals(results.totalHits.value(), results.scoreDocs.length);
expectThrows(
UnsupportedOperationException.class,
() ->
@@ -584,8 +584,8 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
getThrowingKnnVectorQuery("field", randomVector(dimension), 5, filter3),
numDocs,
new Sort(new SortField("tag", SortField.Type.INT)));
- assertEquals(5, results.totalHits.value);
- assertEquals(results.totalHits.value, results.scoreDocs.length);
+ assertEquals(5, results.totalHits.value());
+ assertEquals(results.totalHits.value(), results.scoreDocs.length);
for (ScoreDoc scoreDoc : results.scoreDocs) {
FieldDoc fieldDoc = (FieldDoc) scoreDoc;
@@ -838,7 +838,7 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
// Check that results are complete
TopDocs noTimeoutTopDocs = noTimeoutCollector.topDocs();
- assertEquals(TotalHits.Relation.EQUAL_TO, noTimeoutTopDocs.totalHits.relation);
+ assertEquals(TotalHits.Relation.EQUAL_TO, noTimeoutTopDocs.totalHits.relation());
assertEquals(1, noTimeoutTopDocs.scoreDocs.length);
// A collector manager that immediately times out
@@ -854,7 +854,8 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
// Check that partial results are returned
TopDocs timeoutTopDocs = timeoutCollector.topDocs();
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, timeoutTopDocs.totalHits.relation);
+ assertEquals(
+ TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, timeoutTopDocs.totalHits.relation());
assertEquals(1, timeoutTopDocs.scoreDocs.length);
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
index 23168dbd04a..4b10562de26 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
@@ -87,7 +87,7 @@ public class TestAutomatonQuery extends LuceneTestCase {
if (VERBOSE) {
System.out.println("TEST: run aq=" + query);
}
- return searcher.search(query, 5).totalHits.value;
+ return searcher.search(query, 5).totalHits.value();
}
private void assertAutomatonHits(int expected, Automaton automaton) throws IOException {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
index 284d6e1382b..0c4b3b52afc 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
@@ -93,7 +93,7 @@ public class TestAutomatonQueryUnicode extends LuceneTestCase {
}
private long automatonQueryNrHits(AutomatonQuery query) throws IOException {
- return searcher.search(query, 5).totalHits.value;
+ return searcher.search(query, 5).totalHits.value();
}
private void assertAutomatonHits(int expected, Automaton automaton) throws IOException {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
index 9f584b879b7..a538363f4a2 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
@@ -98,7 +98,7 @@ public class TestBlendedTermQuery extends LuceneTestCase {
.build();
TopDocs topDocs = searcher.search(query, 20);
- assertEquals(11, topDocs.totalHits.value);
+ assertEquals(11, topDocs.totalHits.value());
// All docs must have the same score
for (int i = 0; i < topDocs.scoreDocs.length; ++i) {
assertEquals(topDocs.scoreDocs[0].score, topDocs.scoreDocs[i].score, 0.0f);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
index 1b27683a251..70fb8077011 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
@@ -255,7 +255,7 @@ public class TestBoolean2 extends LuceneTestCase {
CheckHits.checkHitsQuery(query, hits1, hits2, expDocNrs);
// sanity check expected num matches in bigSearcher
- assertEquals(mulFactor * topDocs.totalHits.value, bigSearcher.count(query));
+ assertEquals(mulFactor * topDocs.totalHits.value(), bigSearcher.count(query));
// now check 2 diff scorers from the bigSearcher as well
collectorManager = new TopScoreDocCollectorManager(topDocsToCheck, Integer.MAX_VALUE);
@@ -399,7 +399,7 @@ public class TestBoolean2 extends LuceneTestCase {
q3.add(q1, BooleanClause.Occur.SHOULD);
q3.add(new PrefixQuery(new Term("field2", "b")), BooleanClause.Occur.SHOULD);
assertEquals(
- mulFactor * topDocs.totalHits.value + NUM_EXTRA_DOCS / 2,
+ mulFactor * topDocs.totalHits.value() + NUM_EXTRA_DOCS / 2,
bigSearcher.count(q3.build()));
// test diff (randomized) scorers produce the same results on bigSearcher as well
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
index 4faa78f4bd9..cafe06f3403 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
@@ -362,7 +362,7 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
private void assertSubsetOfSameScores(Query q, TopDocs top1, TopDocs top2) {
// The constrained query
// should be a subset to the unconstrained query.
- if (top2.totalHits.value > top1.totalHits.value) {
+ if (top2.totalHits.value() > top1.totalHits.value()) {
fail(
"Constrained results not a subset:\n"
+ CheckHits.topdocsString(top1, 0, 0)
@@ -371,12 +371,12 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
+ q.toString());
}
- for (int hit = 0; hit < top2.totalHits.value; hit++) {
+ for (int hit = 0; hit < top2.totalHits.value(); hit++) {
int id = top2.scoreDocs[hit].doc;
float score = top2.scoreDocs[hit].score;
boolean found = false;
// find this doc in other hits
- for (int other = 0; other < top1.totalHits.value; other++) {
+ for (int other = 0; other < top1.totalHits.value(); other++) {
if (top1.scoreDocs[other].doc == id) {
found = true;
float otherScore = top1.scoreDocs[other].score;
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
index 513150fc402..d957e22d7b2 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
@@ -52,7 +52,7 @@ public class TestBooleanOr extends LuceneTestCase {
private long search(Query q) throws IOException {
QueryUtils.check(random(), q, searcher);
- return searcher.search(q, 1000).totalHits.value;
+ return searcher.search(q, 1000).totalHits.value();
}
public void testElements() throws IOException {
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 d81e98beac9..3c9fa764ba4 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
@@ -226,7 +226,7 @@ public class TestBooleanQuery extends LuceneTestCase {
// PhraseQuery w/ no terms added returns a null scorer
PhraseQuery pq = new PhraseQuery("field", new String[0]);
q.add(pq, BooleanClause.Occur.SHOULD);
- assertEquals(1, s.search(q.build(), 10).totalHits.value);
+ assertEquals(1, s.search(q.build(), 10).totalHits.value());
// A required clause which returns null scorer should return null scorer to
// IndexSearcher.
@@ -234,11 +234,11 @@ public class TestBooleanQuery extends LuceneTestCase {
pq = new PhraseQuery("field", new String[0]);
q.add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD);
q.add(pq, BooleanClause.Occur.MUST);
- assertEquals(0, s.search(q.build(), 10).totalHits.value);
+ assertEquals(0, s.search(q.build(), 10).totalHits.value());
DisjunctionMaxQuery dmq =
new DisjunctionMaxQuery(Arrays.asList(new TermQuery(new Term("field", "a")), pq), 1.0f);
- assertEquals(1, s.search(dmq, 10).totalHits.value);
+ assertEquals(1, s.search(dmq, 10).totalHits.value());
r.close();
w.close();
@@ -273,13 +273,13 @@ public class TestBooleanQuery extends LuceneTestCase {
MultiReader multireader = new MultiReader(reader1, reader2);
IndexSearcher searcher = newSearcher(multireader);
- assertEquals(0, searcher.search(query.build(), 10).totalHits.value);
+ assertEquals(0, searcher.search(query.build(), 10).totalHits.value());
final ExecutorService es =
Executors.newCachedThreadPool(new NamedThreadFactory("NRT search threads"));
searcher = new IndexSearcher(multireader, es);
if (VERBOSE) System.out.println("rewritten form: " + searcher.rewrite(query.build()));
- assertEquals(0, searcher.search(query.build(), 10).totalHits.value);
+ assertEquals(0, searcher.search(query.build(), 10).totalHits.value());
es.shutdown();
es.awaitTermination(1, TimeUnit.SECONDS);
@@ -419,7 +419,7 @@ public class TestBooleanQuery extends LuceneTestCase {
// No doc can match: BQ has only 2 clauses and we are asking for minShouldMatch=4
bq.setMinimumNumberShouldMatch(4);
- assertEquals(0, s.search(bq.build(), 1).totalHits.value);
+ assertEquals(0, s.search(bq.build(), 1).totalHits.value());
r.close();
w.close();
dir.close();
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 15f0c0d0c94..9083a62e37a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java
@@ -541,7 +541,7 @@ public class TestBooleanRewrites extends LuceneTestCase {
}
private void assertEquals(TopDocs td1, TopDocs td2) {
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
assertEquals(td1.scoreDocs.length, td2.scoreDocs.length);
Map<Integer, Float> expectedScores =
Arrays.stream(td1.scoreDocs).collect(Collectors.toMap(sd -> sd.doc, sd -> sd.score));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
index 675aa959b66..9188fc3c2cc 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
@@ -82,7 +82,7 @@ public class TestConjunctions extends LuceneTestCase {
bq.add(new TermQuery(new Term(F1, "nutch")), BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term(F2, "is")), BooleanClause.Occur.MUST);
TopDocs td = searcher.search(bq.build(), 3);
- assertEquals(1, td.totalHits.value);
+ assertEquals(1, td.totalHits.value());
assertEquals(3F, td.scoreDocs[0].score, 0.001F); // f1:nutch + f2:is + f2:is
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java
index e10ed44890e..0882550144c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java
@@ -241,8 +241,8 @@ public class TestConstantScoreScorer extends LuceneTestCase {
TopScoreDocCollectorManager c = new TopScoreDocCollectorManager(10, 10);
TopDocs topDocs = is.search(new ConstantScoreQuery(new TermQuery(new Term("key", "foo"))), c);
- assertEquals(11, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(11, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
c = new TopScoreDocCollectorManager(10, 10);
Query query =
@@ -251,8 +251,8 @@ public class TestConstantScoreScorer extends LuceneTestCase {
.add(new ConstantScoreQuery(new TermQuery(new Term("key", "bar"))), Occur.FILTER)
.build();
topDocs = is.search(query, c);
- assertEquals(11, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(11, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
iw.close();
ir.close();
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
index 1fadd9af22c..2c40a4e7486 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
@@ -112,7 +112,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
}
try {
assertEquals(
- "generation: " + gen, docs.size(), s.search(new TermQuery(id), 10).totalHits.value);
+ "generation: " + gen, docs.size(), s.search(new TermQuery(id), 10).totalHits.value());
} finally {
nrtDeletes.release(s);
}
@@ -139,7 +139,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
}
try {
assertEquals(
- "generation: " + gen, docs.size(), s.search(new TermQuery(id), 10).totalHits.value);
+ "generation: " + gen, docs.size(), s.search(new TermQuery(id), 10).totalHits.value());
} finally {
nrtNoDeletes.release(s);
}
@@ -164,7 +164,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
System.out.println(Thread.currentThread().getName() + ": nrt: got noDeletes searcher=" + s);
}
try {
- assertEquals("generation: " + gen, 1, s.search(new TermQuery(id), 10).totalHits.value);
+ assertEquals("generation: " + gen, 1, s.search(new TermQuery(id), 10).totalHits.value());
} finally {
nrtNoDeletes.release(s);
}
@@ -192,7 +192,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
System.out.println(Thread.currentThread().getName() + ": nrt: got deletes searcher=" + s);
}
try {
- assertEquals("generation: " + gen, 1, s.search(new TermQuery(id), 10).totalHits.value);
+ assertEquals("generation: " + gen, 1, s.search(new TermQuery(id), 10).totalHits.value());
} finally {
nrtDeletes.release(s);
}
@@ -220,7 +220,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
System.out.println(Thread.currentThread().getName() + ": nrt: got deletes searcher=" + s);
}
try {
- assertEquals(0, s.search(new TermQuery(id), 10).totalHits.value);
+ assertEquals(0, s.search(new TermQuery(id), 10).totalHits.value());
} finally {
nrtDeletes.release(s);
}
@@ -563,7 +563,7 @@ public class TestControlledRealTimeReopenThread extends ThreadedIndexingAndSearc
IndexSearcher searcher = sm.acquire();
TopDocs td = searcher.search(new TermQuery(new Term("count", i + "")), 10);
sm.release(searcher);
- assertEquals(1, td.totalHits.value);
+ assertEquals(1, td.totalHits.value());
}
for (Thread commitThread : commitThreads) {
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 3f47591b1e4..9c61faad3fb 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
@@ -342,7 +342,7 @@ public class TestDocValuesQueries extends LuceneTestCase {
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
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 0c30c6baf86..ccdb060047d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java
@@ -225,7 +225,7 @@ public class TestDoubleValuesSource extends LuceneTestCase {
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
- if (size < actual.totalHits.value) {
+ if (size < actual.totalHits.value()) {
expected = searcher.searchAfter(expected.scoreDocs[size - 1], query, size, sort);
actual = searcher.searchAfter(actual.scoreDocs[size - 1], query, size, mutatedSort);
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
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 9edb586da71..75b438fac4b 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestFieldExistsQuery.java
@@ -804,7 +804,7 @@ public class TestFieldExistsQuery extends LuceneTestCase {
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
index d84fb7dbcec..70d491ddb8b 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
@@ -422,7 +422,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
IndexSearcher searcher = newSearcher(mr);
FuzzyQuery fq = new FuzzyQuery(new Term("field", "z123456"), 1, 0, 2, false);
TopDocs docs = searcher.search(fq, 2);
- assertEquals(5, docs.totalHits.value); // 5 docs, from the a and b's
+ assertEquals(5, docs.totalHits.value()); // 5 docs, from the a and b's
mr.close();
ir1.close();
ir2.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 b11abef9ee0..3fc4ec4bf72 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
@@ -167,7 +167,7 @@ public class TestIndexSearcher extends LuceneTestCase {
.add(new TermQuery(new Term("foo", "bar")), Occur.SHOULD)
.add(new TermQuery(new Term("foo", "baz")), Occur.SHOULD)
.build())) {
- assertEquals(searcher.count(query), searcher.search(query, 1).totalHits.value);
+ assertEquals(searcher.count(query), searcher.search(query, 1).totalHits.value());
}
reader.close();
}
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 ff258610ae9..a807a88c8ec 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
@@ -99,7 +99,7 @@ public class TestIndexSortSortedNumericDocValuesRangeQuery extends LuceneTestCas
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
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 f2e5a3e274a..cd66d6a27cd 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java
@@ -223,8 +223,8 @@ public class TestKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {
docs, scores, maxScore, segments, indexReader.getContext().id());
final Weight w = query.createWeight(searcher, ScoreMode.TOP_SCORES, 1.0f);
TopDocs topDocs = searcher.search(query, 100);
- assertEquals(scoreDocs.length, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(scoreDocs.length, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
Arrays.sort(topDocs.scoreDocs, Comparator.comparingInt(scoreDoc -> scoreDoc.doc));
assertEquals(scoreDocs.length, topDocs.scoreDocs.length);
for (int i = 0; i < scoreDocs.length; i++) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java
index dfbc94f4b2a..907b454ea27 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java
@@ -64,8 +64,8 @@ public class TestLiveFieldValues extends LuceneTestCase {
protected Integer lookupFromSearcher(IndexSearcher s, String id) throws IOException {
TermQuery tq = new TermQuery(new Term("id", id));
TopDocs hits = s.search(tq, 1);
- assertTrue(hits.totalHits.value <= 1);
- if (hits.totalHits.value == 0) {
+ assertTrue(hits.totalHits.value() <= 1);
+ if (hits.totalHits.value() == 0) {
return null;
} else {
Document doc = s.storedFields().document(hits.scoreDocs[0].doc);
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 ac3b6e7bd7e..5732e61e3f9 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java
@@ -192,7 +192,7 @@ public class TestLongValuesSource extends LuceneTestCase {
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
- if (size < actual.totalHits.value) {
+ if (size < actual.totalHits.value()) {
expected = searcher.searchAfter(expected.scoreDocs[size - 1], query, size, sort);
actual = searcher.searchAfter(actual.scoreDocs[size - 1], query, size, mutatedSort);
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
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 dca7ff8c815..4d3add04865 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
@@ -121,15 +121,15 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
new TopScoreDocCollectorManager(10, totalHitsThreshold);
TopDocs topDocs = singleThreadedSearcher.search(new MatchAllDocsQuery(), collectorManager);
- assertEquals(totalHitsThreshold + 1, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ 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);
- assertEquals(numDocs, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(numDocs, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
iw.close();
ir.close();
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
index 296a4648922..636dda9deb6 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
@@ -367,10 +367,10 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
mpqb.add(new Term[] {new Term("field", "b"), new Term("field", "c")}, 0);
}
TopDocs hits = s.search(mpqb.build(), 2);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals(hits.scoreDocs[0].score, hits.scoreDocs[1].score, 1e-5);
/*
- for(int hit=0;hit<hits.totalHits.value;hit++) {
+ for(int hit=0;hit<hits.totalHits.value();hit++) {
ScoreDoc sd = hits.scoreDocs[hit];
System.out.println(" hit doc=" + sd.doc + " score=" + sd.score);
}
@@ -458,10 +458,10 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
}
TopDocs hits = s.search(q, 1);
- assertEquals("wrong number of results", nExpected, hits.totalHits.value);
+ assertEquals("wrong number of results", nExpected, hits.totalHits.value());
if (VERBOSE) {
- for (int hit = 0; hit < hits.totalHits.value; hit++) {
+ for (int hit = 0; hit < hits.totalHits.value(); hit++) {
ScoreDoc sd = hits.scoreDocs[hit];
System.out.println(" hit doc=" + sd.doc + " score=" + sd.score);
}
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 b8392fefbdb..78bebc115ea 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
@@ -67,7 +67,7 @@ public class TestNeedsScores extends LuceneTestCase {
bq.add(
new AssertNeedsScores(prohibited, ScoreMode.COMPLETE_NO_SCORES),
BooleanClause.Occur.MUST_NOT);
- assertEquals(4, searcher.search(bq.build(), 5).totalHits.value); // we exclude 3
+ assertEquals(4, searcher.search(bq.build(), 5).totalHits.value()); // we exclude 3
}
/** nested inside constant score query */
@@ -83,33 +83,34 @@ public class TestNeedsScores extends LuceneTestCase {
TopDocs hits =
searcher.search(
constantScore, new TopScoreDocCollectorManager(5, null, Integer.MAX_VALUE, true));
- assertEquals(5, hits.totalHits.value);
+ assertEquals(5, hits.totalHits.value());
// Queries that support dynamic pruning like top-score or top-doc queries that do not compute
// the hit count should use TOP_DOCS
constantScore = new ConstantScoreQuery(new AssertNeedsScores(term, ScoreMode.TOP_DOCS));
- assertEquals(5, searcher.search(constantScore, 5).totalHits.value);
+ assertEquals(5, searcher.search(constantScore, 5).totalHits.value());
assertEquals(
- 5, searcher.search(constantScore, 5, new Sort(SortField.FIELD_DOC)).totalHits.value);
+ 5, searcher.search(constantScore, 5, new Sort(SortField.FIELD_DOC)).totalHits.value());
assertEquals(
5,
- searcher.search(constantScore, 5, new Sort(SortField.FIELD_DOC, SortField.FIELD_SCORE))
+ searcher
+ .search(constantScore, 5, new Sort(SortField.FIELD_DOC, SortField.FIELD_SCORE))
.totalHits
- .value);
+ .value());
}
/** when not sorting by score */
public void testSortByField() throws Exception {
Query query = new AssertNeedsScores(new MatchAllDocsQuery(), ScoreMode.TOP_DOCS);
- assertEquals(5, searcher.search(query, 5, Sort.INDEXORDER).totalHits.value);
+ 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);
- assertEquals(5, searcher.search(query, 5, Sort.RELEVANCE).totalHits.value);
+ assertEquals(5, searcher.search(query, 5, Sort.RELEVANCE).totalHits.value());
}
/**
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
index 067c47db7f8..784cc885733 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
@@ -120,7 +120,7 @@ public class TestPositiveScoresOnlyCollector extends LuceneTestCase {
}
TopDocs td = tdc.topDocs();
ScoreDoc[] sd = td.scoreDocs;
- assertEquals(numPositiveScores, td.totalHits.value);
+ assertEquals(numPositiveScores, td.totalHits.value());
for (int i = 0; i < sd.length; i++) {
assertTrue("only positive scores should return: " + sd[i].score, sd[i].score > 0);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
index e0e3928778b..0b34e2e8eed 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
@@ -82,12 +82,12 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
public void testPrefixQuery() throws Exception {
Query query = new PrefixQuery(new Term(FIELD, "tang"));
- assertEquals("Number of matched documents", 2, searcher.search(query, 1000).totalHits.value);
+ assertEquals("Number of matched documents", 2, searcher.search(query, 1000).totalHits.value());
}
public void testTermQuery() throws Exception {
Query query = new TermQuery(new Term(FIELD, "tangfulin"));
- assertEquals("Number of matched documents", 2, searcher.search(query, 1000).totalHits.value);
+ assertEquals("Number of matched documents", 2, searcher.search(query, 1000).totalHits.value());
}
public void testTermBooleanQuery() throws Exception {
@@ -95,7 +95,7 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
query.add(new TermQuery(new Term(FIELD, "tangfulin")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term(FIELD, "notexistnames")), BooleanClause.Occur.SHOULD);
assertEquals(
- "Number of matched documents", 2, searcher.search(query.build(), 1000).totalHits.value);
+ "Number of matched documents", 2, searcher.search(query.build(), 1000).totalHits.value());
}
public void testPrefixBooleanQuery() throws Exception {
@@ -103,6 +103,6 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
query.add(new PrefixQuery(new Term(FIELD, "tang")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term(FIELD, "notexistnames")), BooleanClause.Occur.SHOULD);
assertEquals(
- "Number of matched documents", 2, searcher.search(query.build(), 1000).totalHits.value);
+ "Number of matched documents", 2, searcher.search(query.build(), 1000).totalHits.value());
}
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
index 9e8761a8b2b..48351e89b63 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
@@ -76,7 +76,7 @@ public class TestPrefixQuery extends LuceneTestCase {
PrefixQuery query = new PrefixQuery(new Term("field", ""));
IndexSearcher searcher = newSearcher(reader);
- assertEquals(1, searcher.search(query, 1000).totalHits.value);
+ assertEquals(1, searcher.search(query, 1000).totalHits.value());
writer.close();
reader.close();
directory.close();
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
index d422f85e012..b3c1978ecaa 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
@@ -169,7 +169,7 @@ public class TestQueryRescorer extends LuceneTestCase {
searcher.setSimilarity(new ClassicSimilarity());
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -179,7 +179,7 @@ public class TestQueryRescorer extends LuceneTestCase {
TopDocs hits2 = QueryRescorer.rescore(searcher, hits, pq, 2.0, 10);
// Resorting changed the order:
- assertEquals(2, hits2.totalHits.value);
+ assertEquals(2, hits2.totalHits.value());
assertEquals("1", searcher.storedFields().document(hits2.scoreDocs[0].doc).get("id"));
assertEquals("0", searcher.storedFields().document(hits2.scoreDocs[1].doc).get("id"));
@@ -212,7 +212,7 @@ public class TestQueryRescorer extends LuceneTestCase {
searcher.setSimilarity(new ClassicSimilarity());
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -221,7 +221,7 @@ public class TestQueryRescorer extends LuceneTestCase {
TopDocs hits2 = QueryRescorer.rescore(searcher, hits, tq, 2.0, 10);
// Just testing that null scorer is handled.
- assertEquals(2, hits2.totalHits.value);
+ assertEquals(2, hits2.totalHits.value());
r.close();
dir.close();
@@ -250,7 +250,7 @@ public class TestQueryRescorer extends LuceneTestCase {
IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -272,7 +272,7 @@ public class TestQueryRescorer extends LuceneTestCase {
}.rescore(searcher, hits, 10);
// Resorting didn't change the order:
- assertEquals(2, hits2.totalHits.value);
+ assertEquals(2, hits2.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits2.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits2.scoreDocs[1].doc).get("id"));
@@ -303,7 +303,7 @@ public class TestQueryRescorer extends LuceneTestCase {
IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -326,7 +326,7 @@ public class TestQueryRescorer extends LuceneTestCase {
TopDocs hits2 = rescorer.rescore(searcher, hits, 10);
// Resorting changed the order:
- assertEquals(2, hits2.totalHits.value);
+ assertEquals(2, hits2.totalHits.value());
assertEquals("1", searcher.storedFields().document(hits2.scoreDocs[0].doc).get("id"));
assertEquals("0", searcher.storedFields().document(hits2.scoreDocs[1].doc).get("id"));
@@ -376,7 +376,7 @@ public class TestQueryRescorer extends LuceneTestCase {
IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -386,7 +386,7 @@ public class TestQueryRescorer extends LuceneTestCase {
TopDocs hits2 = QueryRescorer.rescore(searcher, hits, pq, 2.0, 10);
// Resorting changed the order:
- assertEquals(2, hits2.totalHits.value);
+ assertEquals(2, hits2.totalHits.value());
assertEquals("1", searcher.storedFields().document(hits2.scoreDocs[0].doc).get("id"));
assertEquals("0", searcher.storedFields().document(hits2.scoreDocs[1].doc).get("id"));
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java
index 27ebeb2cff6..d295e911502 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java
@@ -244,7 +244,7 @@ public class TestRangeFieldsDocValuesQuery extends LuceneTestCase {
Query q1 =
LongRangeDocValuesField.newSlowIntersectsQuery("bar", new long[] {20}, new long[] {27});
TopDocs r = searcher.search(q1, 10);
- assertEquals(0, r.totalHits.value);
+ assertEquals(0, r.totalHits.value());
// test on field of wrong type
Query q2 =
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
index 89d70da9d9b..5c7e527040c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
@@ -170,7 +170,7 @@ public class TestRegexpQuery extends LuceneTestCase {
RegexpQuery query =
new RegexpQuery(
newTerm("<quickBrown>"), RegExp.ALL, myProvider, DEFAULT_DETERMINIZE_WORK_LIMIT);
- assertEquals(1, searcher.search(query, 5).totalHits.value);
+ assertEquals(1, searcher.search(query, 5).totalHits.value());
}
/**
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
index f39ac709d7f..89b7b745543 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
@@ -90,7 +90,7 @@ public class TestRegexpRandom extends LuceneTestCase {
private void assertPatternHits(String pattern, int numHits) throws Exception {
Query wq = new RegexpQuery(new Term("field", fillPattern(pattern)));
TopDocs docs = searcher.search(wq, 25);
- assertEquals("Incorrect hits for pattern: " + pattern, numHits, docs.totalHits.value);
+ assertEquals("Incorrect hits for pattern: " + pattern, numHits, docs.totalHits.value());
}
@Override
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
index 02f86826f69..89aab597d95 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
@@ -96,7 +96,7 @@ public class TestSameScoresWithThreads extends LuceneTestCase {
for (Map.Entry<BytesRef, TopDocs> ent : shuffled) {
TopDocs actual = s.search(new TermQuery(new Term("body", ent.getKey())), 100);
TopDocs expected = ent.getValue();
- assertEquals(expected.totalHits.value, actual.totalHits.value);
+ assertEquals(expected.totalHits.value(), actual.totalHits.value());
assertEquals(
"query=" + ent.getKey().utf8ToString(),
expected.scoreDocs.length,
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 d0ecb7c1ad1..bf33e7732e0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
@@ -246,7 +246,7 @@ public class TestSearchAfter extends LuceneTestCase {
}
if (VERBOSE) {
- System.out.println(" all.totalHits.value=" + all.totalHits.value);
+ System.out.println(" all.totalHits.value()=" + all.totalHits.value());
int upto = 0;
StoredFields storedFields = searcher.storedFields();
for (ScoreDoc scoreDoc : all.scoreDocs) {
@@ -261,7 +261,7 @@ public class TestSearchAfter extends LuceneTestCase {
}
int pageStart = 0;
ScoreDoc lastBottom = null;
- while (pageStart < all.totalHits.value) {
+ while (pageStart < all.totalHits.value()) {
TopDocs paged;
final CollectorManager<?, ? extends TopDocs> pagedManager;
if (sort == null) {
@@ -298,7 +298,7 @@ public class TestSearchAfter extends LuceneTestCase {
}
void assertPage(int pageStart, TopDocs all, TopDocs paged) throws IOException {
- assertEquals(all.totalHits.value, paged.totalHits.value);
+ assertEquals(all.totalHits.value(), paged.totalHits.value());
StoredFields storedFields = searcher.storedFields();
for (int i = 0; i < paged.scoreDocs.length; i++) {
ScoreDoc sd1 = all.scoreDocs[pageStart + i];
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
index be0a4825ae6..8a2639bea6a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
@@ -361,12 +361,12 @@ public class TestShardSearching extends ShardSearchingTestBase {
System.out.println(" shard=" + shardID + " maxDoc=" + shardSearchers[shardID].searcher.getIndexReader().maxDoc());
}
*/
- System.out.println(" single searcher: " + hits.totalHits.value);
+ System.out.println(" single searcher: " + hits.totalHits.value());
for (int i = 0; i < hits.scoreDocs.length; i++) {
final ScoreDoc sd = hits.scoreDocs[i];
System.out.println(" doc=" + sd.doc + " score=" + sd.score);
}
- System.out.println(" shard searcher: " + shardHits.totalHits.value);
+ System.out.println(" shard searcher: " + shardHits.totalHits.value());
for (int i = 0; i < shardHits.scoreDocs.length; i++) {
final ScoreDoc sd = shardHits.scoreDocs[i];
System.out.println(
@@ -391,7 +391,7 @@ public class TestShardSearching extends ShardSearchingTestBase {
final ScoreDoc bottomHit;
final ScoreDoc bottomHitShards;
- if (numHitsPaged < hits.totalHits.value) {
+ if (numHitsPaged < hits.totalHits.value()) {
// More hits to page through
moreHits = true;
if (sort == null) {
@@ -408,7 +408,7 @@ public class TestShardSearching extends ShardSearchingTestBase {
}
} else {
- assertEquals(hits.totalHits.value, numHitsPaged);
+ assertEquals(hits.totalHits.value(), numHitsPaged);
bottomHit = null;
bottomHitShards = null;
moreHits = false;
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
index faf4c251fe3..03bea2aee60 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
@@ -81,9 +81,9 @@ public class TestSimilarityProvider extends LuceneTestCase {
// sanity check of searching
TopDocs foodocs = searcher.search(new TermQuery(new Term("foo", "brown")), 10);
- assertTrue(foodocs.totalHits.value > 0);
+ assertTrue(foodocs.totalHits.value() > 0);
TopDocs bardocs = searcher.search(new TermQuery(new Term("bar", "brown")), 10);
- assertTrue(bardocs.totalHits.value > 0);
+ assertTrue(bardocs.totalHits.value() > 0);
assertTrue(foodocs.scoreDocs[0].score < bardocs.scoreDocs[0].score);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
index 8b69510f735..80bbf76b782 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
@@ -300,13 +300,13 @@ public class TestSloppyPhraseQuery extends LuceneTestCase {
builder.add(new Term("lyrics", "drug"), 4);
PhraseQuery pq = builder.build();
// "drug the drug"~1
- assertEquals(1, is.search(pq, 4).totalHits.value);
+ assertEquals(1, is.search(pq, 4).totalHits.value());
builder.setSlop(1);
pq = builder.build();
- assertEquals(3, is.search(pq, 4).totalHits.value);
+ assertEquals(3, is.search(pq, 4).totalHits.value());
builder.setSlop(2);
pq = builder.build();
- assertEquals(4, is.search(pq, 4).totalHits.value);
+ assertEquals(4, is.search(pq, 4).totalHits.value());
ir.close();
dir.close();
}
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 61c202e6884..db2c7bbe884 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java
@@ -109,7 +109,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -137,7 +137,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.STRING, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'foo' comes after 'bar' in reverse order
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -165,7 +165,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -193,7 +193,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'foo' comes after 'bar' in reverse order
assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -225,7 +225,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -258,7 +258,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.INT, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("300000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -289,7 +289,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as a 0
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -324,7 +324,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as a Integer.MAX_VALUE
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -357,7 +357,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -390,7 +390,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.LONG, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -421,7 +421,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -456,7 +456,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as Long.MAX_VALUE
assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -489,7 +489,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// numeric order
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -522,7 +522,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// reverse numeric order
assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -553,7 +553,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as 0
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -588,7 +588,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null is treated as Float.MAX_VALUE
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -625,7 +625,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
// numeric order
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals(
@@ -658,7 +658,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// numeric order
assertEquals("-0", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals("+0", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -694,7 +694,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
// numeric order
assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals(
@@ -732,7 +732,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
// null treated as a 0
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));
@@ -775,7 +775,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
// null treated as Double.MAX_VALUE
assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));
assertEquals(
@@ -826,7 +826,7 @@ public class TestSort extends LuceneTestCase {
new SortField("value2", SortField.Type.LONG));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
// 'bar' comes before 'foo'
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value1"));
assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value1"));
@@ -840,7 +840,7 @@ public class TestSort extends LuceneTestCase {
// Now with overflow
td = searcher.search(new MatchAllDocsQuery(), 1, sort);
- assertEquals(4, td.totalHits.value);
+ 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"));
@@ -896,7 +896,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
assertNull(((FieldDoc) td.scoreDocs[0]).fields[0]);
assertNull(((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -932,7 +932,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
assertEquals(0, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -968,7 +968,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
assertEquals(0L, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0L, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -1004,7 +1004,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
assertEquals(0.0, ((FieldDoc) td.scoreDocs[0]).fields[0]);
assertEquals(0.0, ((FieldDoc) td.scoreDocs[1]).fields[0]);
@@ -1040,7 +1040,7 @@ public class TestSort extends LuceneTestCase {
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ 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 710969ead95..4ddb4dc79c9 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java
@@ -101,8 +101,8 @@ public class TestSortOptimization extends LuceneTestCase {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[i];
assertEquals(i, ((Long) fieldDoc.fields[0]).intValue());
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // paging sort with after
@@ -116,8 +116,8 @@ public class TestSortOptimization extends LuceneTestCase {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[i];
assertEquals(afterValue + 1 + i, fieldDoc.fields[0]);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that if there is the secondary sort on _score, scores are filled correctly
@@ -132,8 +132,8 @@ public class TestSortOptimization extends LuceneTestCase {
float score = (float) fieldDoc.fields[1];
assertEquals(1.0, score, 0.001);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that if numeric field is a secondary sort, no optimization is run
@@ -143,7 +143,7 @@ public class TestSortOptimization extends LuceneTestCase {
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), collectorManager);
assertEquals(topDocs.scoreDocs.length, numHits);
assertEquals(
- topDocs.totalHits.value,
+ topDocs.totalHits.value(),
numDocs); // assert that all documents were collected => optimization was not run
}
@@ -185,7 +185,7 @@ public class TestSortOptimization extends LuceneTestCase {
assertEquals(i, ((Long) fieldDoc.fields[0]).intValue()); // returns expected values
}
assertEquals(
- topDocs.totalHits.value,
+ topDocs.totalHits.value(),
numDocs); // assert that all documents were collected => optimization was not run
reader.close();
@@ -227,7 +227,7 @@ public class TestSortOptimization extends LuceneTestCase {
new TopFieldCollectorManager(sort, numHits, totalHitsThreshold);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), collectorManager);
assertEquals(topDocs.scoreDocs.length, numHits);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that optimization is not run when missing value setting of SortField is competitive
// with Puring.SKIP
@@ -241,7 +241,7 @@ public class TestSortOptimization extends LuceneTestCase {
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
assertEquals(topDocs.scoreDocs.length, numHits);
assertEquals(
- topDocs.totalHits.value,
+ topDocs.totalHits.value(),
numDocs); // assert that all documents were collected => optimization was not run
}
{ // test that optimization is run when missing value setting of SortField is NOT competitive
@@ -252,7 +252,7 @@ public class TestSortOptimization extends LuceneTestCase {
new TopFieldCollectorManager(sort, numHits, totalHitsThreshold);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), collectorManager);
assertEquals(topDocs.scoreDocs.length, numHits);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that optimization is not run when missing value setting of SortField is competitive
@@ -267,7 +267,7 @@ public class TestSortOptimization extends LuceneTestCase {
new TopFieldCollectorManager(sort, numHits, after, totalHitsThreshold, true);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
assertEquals(topDocs.scoreDocs.length, numHits);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that optimization is not run when missing value setting of SortField is competitive
@@ -282,7 +282,7 @@ public class TestSortOptimization extends LuceneTestCase {
new TopFieldCollectorManager(sort, numHits, after, totalHitsThreshold, true);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
assertEquals(topDocs.scoreDocs.length, numHits);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{
@@ -301,12 +301,12 @@ public class TestSortOptimization extends LuceneTestCase {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[i];
assertEquals(afterValue + 1 + i, fieldDoc.fields[0]);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
// expect to skip all but the first leaf in the BKD tree in the first segment as well as the
// second segment
// doc-0 has no target field, so we need to minus 1
final int expectedSkipped = (7001 - 512 - 1) + (numDocs - 7001);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs - expectedSkipped + 1);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs - expectedSkipped + 1);
}
reader.close();
@@ -349,7 +349,7 @@ public class TestSortOptimization extends LuceneTestCase {
CollectorManager<TopFieldCollector, TopFieldDocs> manager =
new TopFieldCollectorManager(sort, numHits, null, totalHitsThreshold, true);
topDocs1 = searcher.search(new MatchAllDocsQuery(), manager);
- assertNonCompetitiveHitsAreSkipped(topDocs1.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs1.totalHits.value(), numDocs);
}
{ // Test that sort on sorted numeric field without sort optimization and with sort optimization
// produce the same results
@@ -371,7 +371,7 @@ public class TestSortOptimization extends LuceneTestCase {
assertEquals(fieldDoc.fields[0], fieldDoc2.fields[0]);
assertEquals(fieldDoc.doc, fieldDoc2.doc);
}
- assertTrue(topDocs1.totalHits.value < topDocs2.totalHits.value);
+ assertTrue(topDocs1.totalHits.value() < topDocs2.totalHits.value());
}
{ // Test that we can't do optimization via NumericDocValues when there are multiple comparators
@@ -384,7 +384,7 @@ public class TestSortOptimization extends LuceneTestCase {
new TopFieldCollectorManager(multiSorts, numHits, null, totalHitsThreshold, true);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
// can't optimization with NumericDocValues when there are multiple comparators
- assertEquals(topDocs.totalHits.value, numDocs);
+ assertEquals(topDocs.totalHits.value(), numDocs);
}
reader.close();
@@ -434,9 +434,9 @@ public class TestSortOptimization extends LuceneTestCase {
}
if (reader.leaves().size() == 1) {
// if segment size equals one, totalHits should always equals numHits plus 1
- assertEquals(topDocs.totalHits.value, numHits + 1);
+ assertEquals(topDocs.totalHits.value(), numHits + 1);
}
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that sorting on a single field with equal values and after parameter
@@ -455,7 +455,7 @@ public class TestSortOptimization extends LuceneTestCase {
assertEquals(100, fieldDoc.fields[0]);
assertTrue(fieldDoc.doc > afterDocID);
}
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that sorting on main field with equal values + another field for tie breaks doesn't
@@ -474,7 +474,7 @@ public class TestSortOptimization extends LuceneTestCase {
}
assertEquals(topDocs.scoreDocs.length, numHits);
assertEquals(
- topDocs.totalHits.value,
+ topDocs.totalHits.value(),
numDocs); // assert that all documents were collected => optimization was not run
}
@@ -513,8 +513,8 @@ public class TestSortOptimization extends LuceneTestCase {
FieldDoc fieldDoc = (FieldDoc) topDocs.scoreDocs[i];
assertEquals(1f * i, fieldDoc.fields[0]);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
reader.close();
@@ -568,7 +568,7 @@ public class TestSortOptimization extends LuceneTestCase {
for (int docID = 0; docID < topDocs[i].scoreDocs.length; docID++) {
topDocs[i].scoreDocs[docID].shardIndex = i;
}
- collectedDocs += topDocs[i].totalHits.value;
+ collectedDocs += topDocs[i].totalHits.value();
totalDocs += numDocsInIndex;
}
TopFieldDocs mergedTopDcs = TopDocs.merge(sort, size, topDocs);
@@ -624,8 +624,8 @@ public class TestSortOptimization extends LuceneTestCase {
int expectedDocID = searchAfter + 1 + i;
assertEquals(expectedDocID, topDocs.scoreDocs[i].doc);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
// sort by _doc + _score with search after should trigger optimization
@@ -642,8 +642,8 @@ public class TestSortOptimization extends LuceneTestCase {
int expectedDocID = searchAfter + 1 + i;
assertEquals(expectedDocID, topDocs.scoreDocs[i].doc);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
// sort by _doc desc should not trigger optimization
@@ -660,7 +660,7 @@ public class TestSortOptimization extends LuceneTestCase {
assertEquals(expectedDocID, topDocs.scoreDocs[i].doc);
}
// assert that all documents were collected
- assertEquals(numDocs, topDocs.totalHits.value);
+ assertEquals(numDocs, topDocs.totalHits.value());
}
}
@@ -739,8 +739,8 @@ public class TestSortOptimization extends LuceneTestCase {
for (int i = 0; i < numHits; i++) {
assertEquals(i, topDocs.scoreDocs[i].doc);
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, 10);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), 10);
}
// sort by _doc with a bool query should skip all non-competitive documents
@@ -760,8 +760,8 @@ public class TestSortOptimization extends LuceneTestCase {
assertEquals(Integer.toString(i + lowerRange), d.get("slf"));
assertEquals("seg1", d.get("tf"));
}
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, 10);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), 10);
}
reader.close();
@@ -1031,8 +1031,8 @@ public class TestSortOptimization extends LuceneTestCase {
}
expectedCollectedHits += numDocs;
- collectedHits += topDocs.totalHits.value;
- collectedHits2 += topDocs2.totalHits.value;
+ collectedHits += topDocs.totalHits.value();
+ collectedHits2 += topDocs2.totalHits.value();
after = scoreDocs[expectedHits - 1];
}
assertEquals(visitedHits, numDocs);
@@ -1110,7 +1110,7 @@ public class TestSortOptimization extends LuceneTestCase {
sortField.setMissingValue(SortField.STRING_LAST);
Sort sort = new Sort(sortField);
TopDocs topDocs = assertSort(reader, sort, numHits, null);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // simple descending sort
@@ -1118,7 +1118,7 @@ public class TestSortOptimization extends LuceneTestCase {
sortField.setMissingValue(SortField.STRING_FIRST);
Sort sort = new Sort(sortField);
TopDocs topDocs = assertSort(reader, sort, numHits, null);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // ascending sort that returns missing values first
@@ -1144,7 +1144,7 @@ public class TestSortOptimization extends LuceneTestCase {
BytesRef afterValue = new BytesRef(random().nextBoolean() ? "23" : "230000000");
FieldDoc after = new FieldDoc(2, Float.NaN, new Object[] {afterValue});
TopDocs topDocs = assertSort(reader, sort, numHits, after);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // paging descending sort with after
@@ -1154,7 +1154,7 @@ public class TestSortOptimization extends LuceneTestCase {
BytesRef afterValue = new BytesRef(random().nextBoolean() ? "17" : "170000000");
FieldDoc after = new FieldDoc(2, Float.NaN, new Object[] {afterValue});
TopDocs topDocs = assertSort(reader, sort, numHits, after);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // paging ascending sort with after that returns missing values first
@@ -1165,7 +1165,7 @@ public class TestSortOptimization extends LuceneTestCase {
BytesRef afterValue = new BytesRef(random().nextBoolean() ? "23" : "230000000");
FieldDoc after = new FieldDoc(2, Float.NaN, new Object[] {afterValue});
TopDocs topDocs = assertSort(reader, sort, numHits, after);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // paging descending sort with after that returns missing values first
@@ -1175,7 +1175,7 @@ public class TestSortOptimization extends LuceneTestCase {
BytesRef afterValue = new BytesRef(random().nextBoolean() ? "17" : "170000000");
FieldDoc after = new FieldDoc(2, Float.NaN, new Object[] {afterValue});
TopDocs topDocs = assertSort(reader, sort, numHits, after);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that if there is the secondary sort on _score, hits are still skipped
@@ -1184,7 +1184,7 @@ public class TestSortOptimization extends LuceneTestCase {
sortField.setMissingValue(SortField.STRING_LAST);
Sort sort = new Sort(sortField, FIELD_SCORE);
TopDocs topDocs = assertSort(reader, sort, numHits, null);
- assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
+ assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value(), numDocs);
}
{ // test that if string field is a secondary sort, no optimization is run
@@ -1194,7 +1194,7 @@ public class TestSortOptimization extends LuceneTestCase {
Sort sort = new Sort(FIELD_SCORE, sortField);
TopDocs topDocs = assertSort(reader, sort, numHits, null);
assertEquals(
- topDocs.totalHits.value,
+ topDocs.totalHits.value(),
numDocs); // assert that all documents were collected => optimization was not run
}
}
@@ -1214,7 +1214,7 @@ public class TestSortOptimization extends LuceneTestCase {
IndexSearcher searcher =
newSearcher(reader, random().nextBoolean(), random().nextBoolean(), false);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
- assertEquals(numDocs, topDocs.totalHits.value);
+ assertEquals(numDocs, topDocs.totalHits.value());
}
private TopDocs assertSort(DirectoryReader reader, Sort sort, int n, FieldDoc after)
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
index e48828e5b2f..5322b2e8796 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
@@ -84,7 +84,7 @@ public class TestSortRescorer extends LuceneTestCase {
// Just first pass query
TopDocs hits = searcher.search(query, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("3", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("2", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
@@ -93,7 +93,7 @@ public class TestSortRescorer extends LuceneTestCase {
Sort sort = new Sort(new SortField("popularity", SortField.Type.INT, true));
Rescorer rescorer = new SortRescorer(sort);
hits = rescorer.rescore(searcher, hits, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("2", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
@@ -120,7 +120,7 @@ public class TestSortRescorer extends LuceneTestCase {
// Just first pass query
TopDocs hits = searcher.search(query, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("3", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("2", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
@@ -131,7 +131,7 @@ public class TestSortRescorer extends LuceneTestCase {
Sort sort = new Sort(source.getSortField(true));
Rescorer rescorer = new SortRescorer(sort);
hits = rescorer.rescore(searcher, hits, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("2", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
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 d6919f014dd..da0ea802eb9 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
@@ -42,7 +42,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
10,
new Sort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG)),
true);
- assertEquals(0, td.totalHits.value);
+ assertEquals(0, td.totalHits.value());
// for an empty index, any selector should work
for (SortedNumericSelector.Type v : SortedNumericSelector.Type.values()) {
@@ -52,7 +52,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
10,
new Sort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG, false, v)),
true);
- assertEquals(0, td.totalHits.value);
+ assertEquals(0, td.totalHits.value());
}
}
@@ -96,7 +96,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -125,7 +125,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT, true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -158,7 +158,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 3 comes before 5
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -193,7 +193,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -222,7 +222,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 3 comes before 5
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -250,7 +250,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.FLOAT));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// -5 comes before -3
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -278,7 +278,7 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.DOUBLE));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// -5 comes before -3
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].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 614c0376f23..2e41b26f70a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
@@ -53,7 +53,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);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -83,7 +83,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);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -118,7 +118,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
// 'baz' comes before 'foo'
@@ -155,7 +155,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 'baz' comes before 'foo'
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -185,7 +185,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);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -216,7 +216,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MIN));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -247,7 +247,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", true, SortedSetSelector.Type.MIDDLE_MIN));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -283,7 +283,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
// 'b' comes before 'c'
@@ -321,7 +321,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -351,7 +351,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MIN));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -382,7 +382,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MAX));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -413,7 +413,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", true, SortedSetSelector.Type.MIDDLE_MAX));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -449,7 +449,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
// 'b' comes before 'c'
@@ -487,7 +487,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 'b' comes before 'c'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -517,7 +517,7 @@ public class TestSortedSetSelector extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false, SortedSetSelector.Type.MIDDLE_MAX));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].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 873d948373f..74bea98cf60 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
@@ -34,12 +34,12 @@ public class TestSortedSetSortField extends LuceneTestCase {
Query query = new TermQuery(new Term("contents", "foo"));
TopDocs td =
empty.search(query, 10, new Sort(new SortedSetSortField("sortedset", false)), true);
- assertEquals(0, td.totalHits.value);
+ assertEquals(0, td.totalHits.value());
// for an empty index, any selector should work
for (SortedSetSelector.Type v : SortedSetSelector.Type.values()) {
td = empty.search(query, 10, new Sort(new SortedSetSortField("sortedset", false, v)), true);
- assertEquals(0, td.totalHits.value);
+ assertEquals(0, td.totalHits.value());
}
}
@@ -79,7 +79,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -108,7 +108,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", true));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("2", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -141,7 +141,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 'bar' comes before 'baz'
// null comes first
assertEquals("3", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
@@ -176,7 +176,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(sortField);
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].doc).get("id"));
@@ -205,7 +205,7 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(new SortedSetSortField("value", false));
TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
// 'bar' comes before 'baz'
assertEquals("1", searcher.storedFields().document(td.scoreDocs[0].doc).get("id"));
assertEquals("2", searcher.storedFields().document(td.scoreDocs[1].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 01a74c3ae81..75b8ecb223e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java
@@ -195,10 +195,10 @@ public class TestSynonymQuery extends LuceneTestCase {
new TopScoreDocCollectorManager(
Math.min(reader.numDocs(), totalHitsThreshold), totalHitsThreshold);
TopDocs topDocs = searcher.search(query, collectorManager);
- if (topDocs.totalHits.value < totalHitsThreshold) {
+ if (topDocs.totalHits.value() < totalHitsThreshold) {
assertEquals(new TotalHits(11, TotalHits.Relation.EQUAL_TO), topDocs.totalHits);
} else {
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
}
// All docs must have the same score
for (int i = 0; i < topDocs.scoreDocs.length; ++i) {
@@ -254,11 +254,11 @@ public class TestSynonymQuery extends LuceneTestCase {
new TopScoreDocCollectorManager(
Math.min(reader.numDocs(), totalHitsThreshold), totalHitsThreshold);
TopDocs topDocs = searcher.search(query, collectorManager);
- if (topDocs.totalHits.value < totalHitsThreshold) {
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
- assertEquals(22, topDocs.totalHits.value);
+ if (topDocs.totalHits.value() < totalHitsThreshold) {
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
+ assertEquals(22, topDocs.totalHits.value());
} else {
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
}
// All docs must have the same score
for (int i = 0; i < topDocs.scoreDocs.length; ++i) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java
index 7200ee5ac1b..7cfd0c5adde 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java
@@ -102,7 +102,7 @@ public class TestTermInSetQuery extends LuceneTestCase {
TermInSetQuery query = new TermInSetQuery(field, queryTerms);
TopDocs topDocs = searcher.search(query, numDocs);
- assertEquals(numDocs, topDocs.totalHits.value);
+ assertEquals(numDocs, topDocs.totalHits.value());
reader.close();
dir.close();
@@ -283,7 +283,7 @@ public class TestTermInSetQuery extends LuceneTestCase {
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
index 7f4ad686baa..e4f25179018 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
@@ -279,7 +279,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "C", "D"}, analyzer);
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
- long numHits = searcher.search(query, 1000).totalHits.value;
+ long numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,C,D => A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert:
@@ -290,7 +290,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "D"}, analyzer);
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
- numHits = searcher.search(query, 1000).totalHits.value;
+ numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,D => A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert:
@@ -299,7 +299,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
addDoc("C");
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
- numHits = searcher.search(query, 1000).totalHits.value;
+ numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("C added, still A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert
@@ -315,7 +315,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "C", "D"}, analyzer);
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
- long numHits = searcher.search(query, 1000).totalHits.value;
+ long numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,C,D => A,B,<empty string>,C in range", 4, numHits);
// until Lucene-38 is fixed, use this assert
@@ -324,7 +324,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "D"}, analyzer);
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
- numHits = searcher.search(query, 1000).totalHits.value;
+ numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,D - A, B and <empty string> in range", 3, numHits);
// until Lucene-38 is fixed, use this assert
@@ -333,7 +333,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
addDoc("C");
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
- numHits = searcher.search(query, 1000).totalHits.value;
+ numHits = searcher.search(query, 1000).totalHits.value();
// When Lucene-38 is fixed, use the assert on the next line:
assertEquals("C added => A,B,<empty string>,C in range", 4, numHits);
// until Lucene-38 is fixed, use this assert
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 15745fa10b3..d4df59f2f72 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
@@ -440,7 +440,7 @@ public class TestTopDocsCollector extends LuceneTestCase {
leafCollector.collect(1);
TopDocs topDocs = collector.topDocs();
- assertEquals(4, topDocs.totalHits.value);
+ assertEquals(4, topDocs.totalHits.value());
assertEquals(totalHitsThreshold < 4, scorer.minCompetitiveScore != null);
assertEquals(
new TotalHits(
@@ -470,18 +470,18 @@ public class TestTopDocsCollector extends LuceneTestCase {
IndexSearcher searcher = new IndexSearcher(reader);
TopScoreDocCollectorManager collectorManager = new TopScoreDocCollectorManager(2, 10);
TopDocs topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertEquals(10, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(10, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
collectorManager = new TopScoreDocCollectorManager(2, 2);
topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertTrue(10 >= topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertTrue(10 >= topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
collectorManager = new TopScoreDocCollectorManager(10, 2);
topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertEquals(10, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(10, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
}
}
}
@@ -589,7 +589,7 @@ public class TestTopDocsCollector extends LuceneTestCase {
assertEquals(Math.nextUp(11f), scorer3.minCompetitiveScore, 0f);
TopDocs topDocs = manager.reduce(Arrays.asList(collector, collector2, collector3));
- assertEquals(11, topDocs.totalHits.value);
+ assertEquals(11, topDocs.totalHits.value());
assertEquals(new TotalHits(11, TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO), topDocs.totalHits);
leafCollector.setScorer(scorer);
@@ -636,8 +636,8 @@ public class TestTopDocsCollector extends LuceneTestCase {
TopDocs tdc = doConcurrentSearchWithThreshold(5, 0, query, indexReader);
TopDocs tdc2 = doSearchWithThreshold(5, 0, query, indexReader);
- assertTrue(tdc.totalHits.value > 0);
- assertTrue(tdc2.totalHits.value > 0);
+ assertTrue(tdc.totalHits.value() > 0);
+ assertTrue(tdc2.totalHits.value() > 0);
CheckHits.checkEqual(query, tdc.scoreDocs, tdc2.scoreDocs);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
index 69a3b052e31..4215b755b36 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
@@ -321,7 +321,7 @@ public class TestTopDocsMerge extends LuceneTestCase {
}
System.out.println(
" top search: "
- + topHits.totalHits.value
+ + topHits.totalHits.value()
+ " totalHits; hits="
+ (topHits.scoreDocs == null ? "null" : topHits.scoreDocs.length));
if (topHits.scoreDocs != null) {
@@ -364,7 +364,7 @@ public class TestTopDocsMerge extends LuceneTestCase {
" shard="
+ shardIDX
+ " "
- + subHits.totalHits.value
+ + subHits.totalHits.value()
+ " totalHits hits="
+ (subHits.scoreDocs == null ? "null" : subHits.scoreDocs.length));
if (subHits.scoreDocs != null) {
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 d56e17683a7..cd6f0ac079d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
@@ -386,7 +386,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
TopDocsCollector<Entry> tdc =
new TopFieldCollectorManager(sort[i], 10, null, Integer.MAX_VALUE, false).newCollector();
TopDocs td = tdc.topDocs();
- assertEquals(0, td.totalHits.value);
+ assertEquals(0, td.totalHits.value());
}
}
@@ -647,7 +647,7 @@ public class TestTopFieldCollector extends LuceneTestCase {
assertEquals(11f, scorer3.minCompetitiveScore, 0f);
TopFieldDocs topDocs = manager.reduce(Arrays.asList(collector, collector2, collector3));
- assertEquals(11, topDocs.totalHits.value);
+ assertEquals(11, topDocs.totalHits.value());
assertEquals(new TotalHits(11, TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO), topDocs.totalHits);
leafCollector.setScorer(scorer);
@@ -695,8 +695,8 @@ public class TestTopFieldCollector extends LuceneTestCase {
TopDocs tdc = doConcurrentSearchWithThreshold(5, 0, query, sort, indexReader);
TopDocs tdc2 = doSearchWithThreshold(5, 0, query, sort, indexReader);
- assertTrue(tdc.totalHits.value > 0);
- assertTrue(tdc2.totalHits.value > 0);
+ assertTrue(tdc.totalHits.value() > 0);
+ assertTrue(tdc2.totalHits.value() > 0);
CheckHits.checkEqual(query, tdc.scoreDocs, tdc2.scoreDocs);
}
@@ -721,18 +721,18 @@ public class TestTopFieldCollector extends LuceneTestCase {
TopFieldCollectorManager collectorManager =
new TopFieldCollectorManager(sort, 2, null, 10, true);
TopDocs topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertEquals(10, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(10, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
collectorManager = new TopFieldCollectorManager(sort, 2, null, 2, true);
topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertTrue(10 >= topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation);
+ assertTrue(10 >= topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, topDocs.totalHits.relation());
collectorManager = new TopFieldCollectorManager(sort, 10, null, 2, true);
topDocs = searcher.search(new TermQuery(new Term("f", "foo")), collectorManager);
- assertEquals(10, topDocs.totalHits.value);
- assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation);
+ assertEquals(10, topDocs.totalHits.value());
+ assertEquals(TotalHits.Relation.EQUAL_TO, topDocs.totalHits.relation());
}
}
}
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 4c788492bec..1540d77270c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
@@ -148,16 +148,16 @@ public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
TopDocs td1 = searcher.search(query, manager1);
TopDocs td2 = searcher.search(query, manager2);
- assertNotEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td1.totalHits.relation);
+ assertNotEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td1.totalHits.relation());
if (paging == false && maxSegmentSize > numHits && query instanceof MatchAllDocsQuery) {
// Make sure that we sometimes early terminate
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td2.totalHits.relation);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td2.totalHits.relation());
}
- if (td2.totalHits.relation == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
- assertTrue(td2.totalHits.value >= td1.scoreDocs.length);
- assertTrue(td2.totalHits.value <= reader.maxDoc());
+ if (td2.totalHits.relation() == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
+ assertTrue(td2.totalHits.value() >= td1.scoreDocs.length);
+ assertTrue(td2.totalHits.value() <= reader.maxDoc());
} else {
- assertEquals(td2.totalHits.value, td1.totalHits.value);
+ assertEquals(td2.totalHits.value(), td1.totalHits.value());
}
CheckHits.checkEqual(query, td1.scoreDocs, td2.scoreDocs);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java
index b27d551a46d..f404cc72ebc 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java
@@ -26,17 +26,18 @@ public class TestTotalHits extends LuceneTestCase {
public void testEqualsAndHashcode() {
TotalHits totalHits1 = randomTotalHits();
assertFalse(totalHits1.equals(null));
- assertFalse(totalHits1.equals(totalHits1.value));
+ assertFalse(totalHits1.equals(totalHits1.value()));
assertEquals(totalHits1, totalHits1);
assertEquals(totalHits1.hashCode(), totalHits1.hashCode());
- TotalHits totalHits2 = new TotalHits(totalHits1.value, totalHits1.relation);
+ TotalHits totalHits2 = new TotalHits(totalHits1.value(), totalHits1.relation());
assertEquals(totalHits1, totalHits2);
assertEquals(totalHits2, totalHits1);
assertEquals(totalHits1.hashCode(), totalHits2.hashCode());
TotalHits totalHits4 = randomTotalHits();
- if (totalHits4.value == totalHits1.value && totalHits4.relation == totalHits1.relation) {
+ if (totalHits4.value() == totalHits1.value()
+ && totalHits4.relation() == totalHits1.relation()) {
assertEquals(totalHits1, totalHits4);
assertEquals(totalHits2, totalHits4);
assertEquals(totalHits1.hashCode(), totalHits4.hashCode());
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
index 36e0515f70c..96134a2295d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
@@ -94,7 +94,7 @@ public class TestWildcardRandom extends LuceneTestCase {
}
Query wq = new WildcardQuery(new Term("field", filledPattern));
TopDocs docs = searcher.search(wq, 25);
- assertEquals("Incorrect hits for pattern: " + pattern, numHits, docs.totalHits.value);
+ assertEquals("Incorrect hits for pattern: " + pattern, numHits, docs.totalHits.value());
}
@Override
diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java
index a40e476a3b6..cbe2c7f3bdc 100644
--- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java
+++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java
@@ -56,16 +56,16 @@ public class TestBooleanSimilarity extends BaseSimilarityTestCase {
IndexSearcher searcher = newSearcher(reader);
searcher.setSimilarity(new BooleanSimilarity());
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "bar")), 2);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
assertEquals(1f, topDocs.scoreDocs[0].score, 0f);
assertEquals(1f, topDocs.scoreDocs[1].score, 0f);
topDocs = searcher.search(new TermQuery(new Term("foo", "baz")), 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1f, topDocs.scoreDocs[0].score, 0f);
topDocs = searcher.search(new BoostQuery(new TermQuery(new Term("foo", "baz")), 3f), 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(3f, topDocs.scoreDocs[0].score, 0f);
reader.close();
@@ -89,11 +89,11 @@ public class TestBooleanSimilarity extends BaseSimilarityTestCase {
PhraseQuery query = new PhraseQuery(2, "foo", "bar", "quux");
TopDocs topDocs = searcher.search(query, 2);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1f, topDocs.scoreDocs[0].score, 0f);
topDocs = searcher.search(new BoostQuery(query, 7), 2);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(7f, topDocs.scoreDocs[0].score, 0f);
reader.close();
diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java
index 2e41b758c3e..3ec08d75f85 100644
--- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java
+++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java
@@ -70,7 +70,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
public void testHit() throws IOException {
Query query = new TermQuery(new Term("test", "hit"));
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -78,13 +78,13 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
public void testMiss() throws IOException {
Query query = new TermQuery(new Term("test", "miss"));
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
public void testEmpty() throws IOException {
Query query = new TermQuery(new Term("empty", "miss"));
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
public void testBQHit() throws IOException {
@@ -93,7 +93,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
.add(new TermQuery(new Term("test", "hit")), Occur.SHOULD)
.build();
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -105,7 +105,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
.add(new TermQuery(new Term("test", "miss")), Occur.SHOULD)
.build();
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -117,7 +117,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
.add(new TermQuery(new Term("empty", "miss")), Occur.SHOULD)
.build();
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -125,7 +125,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
public void testDMQHit() throws IOException {
Query query = new DisjunctionMaxQuery(Arrays.asList(new TermQuery(new Term("test", "hit"))), 0);
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -137,7 +137,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
new TermQuery(new Term("test", "hit")), new TermQuery(new Term("test", "miss"))),
0);
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
@@ -149,7 +149,7 @@ public class TestClassicSimilarity extends BaseSimilarityTestCase {
new TermQuery(new Term("test", "hit")), new TermQuery(new Term("empty", "miss"))),
0);
TopDocs topDocs = indexSearcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(1, topDocs.scoreDocs.length);
assertTrue(topDocs.scoreDocs[0].score != 0);
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
index e75b82ca9a4..1430385c708 100644
--- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
+++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
@@ -90,7 +90,7 @@ public class TestSimilarity2 extends LuceneTestCase {
for (Similarity sim : sims) {
is.setSimilarity(sim);
- assertEquals(0, is.search(new TermQuery(new Term("foo", "bar")), 10).totalHits.value);
+ assertEquals(0, is.search(new TermQuery(new Term("foo", "bar")), 10).totalHits.value());
}
ir.close();
dir.close();
@@ -112,7 +112,7 @@ public class TestSimilarity2 extends LuceneTestCase {
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("foo", "bar")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("bar", "baz")), BooleanClause.Occur.SHOULD);
- assertEquals(1, is.search(query.build(), 10).totalHits.value);
+ assertEquals(1, is.search(query.build(), 10).totalHits.value());
}
ir.close();
dir.close();
@@ -136,7 +136,7 @@ public class TestSimilarity2 extends LuceneTestCase {
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("foo", "bar")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("foo", "baz")), BooleanClause.Occur.SHOULD);
- assertEquals(1, is.search(query.build(), 10).totalHits.value);
+ assertEquals(1, is.search(query.build(), 10).totalHits.value());
}
ir.close();
dir.close();
@@ -160,7 +160,7 @@ public class TestSimilarity2 extends LuceneTestCase {
is.setSimilarity(sim);
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("foo", "bar")), BooleanClause.Occur.SHOULD);
- assertEquals(1, is.search(query.build(), 10).totalHits.value);
+ assertEquals(1, is.search(query.build(), 10).totalHits.value());
}
ir.close();
dir.close();
@@ -234,7 +234,7 @@ public class TestSimilarity2 extends LuceneTestCase {
is.setSimilarity(sim);
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("foo", "bar")), BooleanClause.Occur.SHOULD);
- assertEquals(1, is.search(query.build(), 10).totalHits.value);
+ assertEquals(1, is.search(query.build(), 10).totalHits.value());
}
ir.close();
dir.close();
@@ -260,7 +260,7 @@ public class TestSimilarity2 extends LuceneTestCase {
is.setSimilarity(sim);
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("foo", "bar")), BooleanClause.Occur.SHOULD);
- assertEquals(1, is.search(query.build(), 10).totalHits.value);
+ assertEquals(1, is.search(query.build(), 10).totalHits.value());
}
ir.close();
dir.close();
diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
index 6bb581d108a..fbdecaae2b4 100644
--- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
+++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
@@ -499,7 +499,7 @@ public class TestSimilarityBase extends LuceneTestCase {
for (SimilarityBase sim : sims) {
searcher.setSimilarity(sim);
TopDocs topDocs = searcher.search(q, 1000);
- assertEquals("Failed: " + sim.toString(), 3, topDocs.totalHits.value);
+ assertEquals("Failed: " + sim.toString(), 3, topDocs.totalHits.value());
}
}
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
index 17c2d6b1e6e..51d00d24c93 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
@@ -179,7 +179,7 @@ public class SearchFiles {
TopDocs results = searcher.search(query, 5 * hitsPerPage);
ScoreDoc[] hits = results.scoreDocs;
- int numTotalHits = Math.toIntExact(results.totalHits.value);
+ int numTotalHits = Math.toIntExact(results.totalHits.value());
System.out.println(numTotalHits + " total matching documents");
int start = 0;
diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java
index 5df2e63b2ef..cd9fc010068 100644
--- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java
+++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java
@@ -36,7 +36,7 @@ public class TestDistanceFacetsExample extends LuceneTestCase {
DistanceFacetsExample example = new DistanceFacetsExample();
example.index();
TopDocs hits = example.drillDown(example.FIVE_KM);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
example.close();
}
}
diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java
index 9efdcf5356b..f7fde4c974c 100644
--- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java
+++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java
@@ -55,7 +55,7 @@ public class TestRangeFacetsExample extends LuceneTestCase {
RangeFacetsExample example = new RangeFacetsExample();
example.index();
TopDocs hits = example.drillDown(example.PAST_SIX_HOURS);
- assertEquals(22, hits.totalHits.value);
+ assertEquals(22, hits.totalHits.value());
example.close();
}
}
diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
index 9997170e04e..01a012de346 100644
--- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
+++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
@@ -87,7 +87,7 @@ public class TestExpressionRescorer extends LuceneTestCase {
// Just first pass query
TopDocs hits = searcher.search(query, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("3", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("2", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
@@ -101,7 +101,7 @@ public class TestExpressionRescorer extends LuceneTestCase {
Rescorer rescorer = e.getRescorer(bindings);
hits = rescorer.rescore(searcher, hits, 10);
- assertEquals(3, hits.totalHits.value);
+ assertEquals(3, hits.totalHits.value());
assertEquals("2", r.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", r.storedFields().document(hits.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(hits.scoreDocs[2].doc).get("id"));
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 66d1d534c91..ac3b6959d51 100644
--- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
+++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
@@ -140,7 +140,7 @@ public class TestExpressionSorts extends LuceneTestCase {
TopDocs actual = searcher.search(query, size, mutatedSort, random().nextBoolean());
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
- if (size < actual.totalHits.value) {
+ if (size < actual.totalHits.value()) {
expected = searcher.searchAfter(expected.scoreDocs[size - 1], query, size, sort);
actual = searcher.searchAfter(actual.scoreDocs[size - 1], query, size, mutatedSort);
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
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 066b8c7bcb7..5501744fbe7 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
@@ -125,7 +125,7 @@ public class TestDrillDownQuery extends FacetTestCase {
q.add("a", "2");
q.add("b", "1");
TopDocs docs = searcher.search(q, 100);
- assertEquals(5, docs.totalHits.value);
+ assertEquals(5, docs.totalHits.value());
}
public void testQuery() throws IOException {
@@ -136,14 +136,14 @@ public class TestDrillDownQuery extends FacetTestCase {
q.add("a");
QueryUtils.check(q);
TopDocs docs = searcher.search(q, 100);
- assertEquals(25, docs.totalHits.value);
+ assertEquals(25, docs.totalHits.value());
// Making sure the query yields 5 documents with the facet "b" and the
// previous (facet "a") query as a base query
DrillDownQuery q2 = new DrillDownQuery(config, q);
q2.add("b");
docs = searcher.search(q2, 100);
- assertEquals(5, docs.totalHits.value);
+ assertEquals(5, docs.totalHits.value());
// Making sure that a query of both facet "a" and facet "b" yields 5 results
DrillDownQuery q3 = new DrillDownQuery(config);
@@ -151,14 +151,14 @@ public class TestDrillDownQuery extends FacetTestCase {
q3.add("b");
docs = searcher.search(q3, 100);
- assertEquals(5, docs.totalHits.value);
+ assertEquals(5, docs.totalHits.value());
// Check that content:foo (which yields 50% results) and facet/b (which yields 20%)
// would gather together 10 results (10%..)
Query fooQuery = new TermQuery(new Term("content", "foo"));
DrillDownQuery q4 = new DrillDownQuery(config, fooQuery);
q4.add("b");
docs = searcher.search(q4, 100);
- assertEquals(10, docs.totalHits.value);
+ assertEquals(10, docs.totalHits.value());
}
public void testQueryImplicitDefaultParams() throws IOException {
@@ -173,7 +173,7 @@ public class TestDrillDownQuery extends FacetTestCase {
DrillDownQuery q2 = new DrillDownQuery(config, q);
q2.add("b");
TopDocs docs = searcher.search(q2, 100);
- assertEquals(5, docs.totalHits.value);
+ assertEquals(5, docs.totalHits.value());
// Check that content:foo (which yields 50% results) and facet/b (which yields 20%)
// would gather together 10 results (10%..)
@@ -181,7 +181,7 @@ public class TestDrillDownQuery extends FacetTestCase {
DrillDownQuery q4 = new DrillDownQuery(config, fooQuery);
q4.add("b");
docs = searcher.search(q4, 100);
- assertEquals(10, docs.totalHits.value);
+ assertEquals(10, docs.totalHits.value());
}
public void testZeroLimit() throws IOException {
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 747723cbb0e..eaf75e99eb6 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
@@ -429,7 +429,7 @@ public class TestDrillSideways extends FacetTestCase {
DrillDownQuery ddq = new DrillDownQuery(config);
ddq.add("Author", "Lisa");
DrillSidewaysResult r = ds.search(null, ddq, 10);
- assertEquals(2, r.hits.totalHits.value);
+ assertEquals(2, r.hits.totalHits.value());
// Publish Date is only drill-down, and Lisa published
// one in 2012 and one in 2010:
assertEquals(
@@ -449,7 +449,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
ddq.add("Author", "Bob");
r = ds.search(null, ddq, 10);
- assertEquals(3, r.hits.totalHits.value);
+ assertEquals(3, r.hits.totalHits.value());
// Publish Date is only drill-down: Lisa and Bob
// (drill-down) published twice in 2010 and once in 2012:
assertEquals(
@@ -494,7 +494,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
ddq.add("Publish Date", "2010");
r = ds.search(null, ddq, 10);
- assertEquals(1, r.hits.totalHits.value);
+ assertEquals(1, r.hits.totalHits.value());
// Publish Date is drill-sideways + drill-down: Lisa
// (drill-down) published once in 2010 and once in 2012:
assertEquals(
@@ -515,7 +515,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Publish Date", "2010");
ddq.add("Author", "Bob");
r = ds.search(null, ddq, 10);
- assertEquals(2, r.hits.totalHits.value);
+ assertEquals(2, r.hits.totalHits.value());
// Publish Date is both drill-sideways + drill-down:
// Lisa or Bob published twice in 2010 and once in 2012:
assertEquals(
@@ -531,7 +531,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq = new DrillDownQuery(config);
ddq.add("Foobar", "Baz");
r = ds.search(null, ddq, 10);
- assertEquals(0, r.hits.totalHits.value);
+ assertEquals(0, r.hits.totalHits.value());
assertNull(r.facets.getTopChildren(10, "Publish Date"));
assertNull(r.facets.getTopChildren(10, "Foobar"));
@@ -540,7 +540,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
ddq.add("Author", "Tom");
r = ds.search(null, ddq, 10);
- assertEquals(2, r.hits.totalHits.value);
+ assertEquals(2, r.hits.totalHits.value());
// Publish Date is only drill-down, and Lisa published
// one in 2012 and one in 2010:
assertEquals(
@@ -559,7 +559,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
ddq.add("Author", "Tom");
r = ds.search(null, ddq, 10);
- assertEquals(2, r.hits.totalHits.value);
+ assertEquals(2, r.hits.totalHits.value());
// Publish Date is only drill-down, and Lisa published
// one in 2012 and one in 2010:
assertEquals(
@@ -571,7 +571,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
r = ds.search(null, ddq, 10);
- assertEquals(0, r.hits.totalHits.value);
+ assertEquals(0, r.hits.totalHits.value());
assertNull(r.facets.getTopChildren(10, "Publish Date"));
assertNull(r.facets.getTopChildren(10, "Author"));
@@ -902,7 +902,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
DrillSidewaysResult r = getNewDrillSideways(searcher, config, taxoReader).search(null, ddq, 10);
- assertEquals(1, r.hits.totalHits.value);
+ assertEquals(1, r.hits.totalHits.value());
// Publish Date is only drill-down, and Lisa published
// one in 2012 and one in 2010:
assertEquals(
@@ -968,7 +968,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("dim", "a");
DrillSidewaysResult r = getNewDrillSideways(searcher, config, taxoReader).search(null, ddq, 10);
- assertEquals(3, r.hits.totalHits.value);
+ assertEquals(3, r.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=6 childCount=4\n a (3)\n b (1)\n c (1)\n d (1)\n",
r.facets.getTopChildren(10, "dim").toString());
@@ -1432,7 +1432,7 @@ public class TestDrillSideways extends FacetTestCase {
q = new BooleanQuery.Builder().add(q, Occur.MUST).add(filter, Occur.FILTER).build();
}
TopDocs ddqHits = s.search(q, numDocs);
- assertEquals(expected.hits.size(), ddqHits.totalHits.value);
+ assertEquals(expected.hits.size(), ddqHits.totalHits.value());
for (int i = 0; i < expected.hits.size(); i++) {
// Score should be IDENTICAL:
assertEquals(scores.get(expected.hits.get(i).id), ddqHits.scoreDocs[i].score, 0.0f);
@@ -1863,7 +1863,7 @@ public class TestDrillSideways extends FacetTestCase {
if (VERBOSE) {
System.out.println(" verify totHits=" + expected.hits.size());
}
- assertEquals(expected.hits.size(), actual.resultCount.value);
+ assertEquals(expected.hits.size(), actual.resultCount.value());
assertEquals(expected.hits.size(), actual.results.size());
for (int i = 0; i < expected.hits.size(); i++) {
if (VERBOSE) {
@@ -1991,7 +1991,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
DrillSidewaysResult r = ds.search(ddq, 10); // this used to fail on IllegalArgEx
- assertEquals(0, r.hits.totalHits.value);
+ assertEquals(0, r.hits.totalHits.value());
r =
ds.search(
@@ -2001,7 +2001,7 @@ public class TestDrillSideways extends FacetTestCase {
10,
new Sort(new SortField("foo", SortField.Type.INT)),
false); // this used to fail on IllegalArgEx
- assertEquals(0, r.hits.totalHits.value);
+ assertEquals(0, r.hits.totalHits.value());
writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
@@ -2075,7 +2075,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Bob");
DrillSidewaysResult r = ds.search(null, ddq, 10);
Facets facets = r.facets;
- assertEquals(3, r.hits.totalHits.value);
+ assertEquals(3, r.hits.totalHits.value());
assertEquals(
"dim=Author path=[] value=5 childCount=4\n Lisa (2)\n Bob (1)\n Susan (1)\n Frank (1)\n",
facets.getTopChildren(10, "Author").toString());
@@ -2104,7 +2104,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("Author", "Lisa");
ddq.add("Publish Date", "2010");
r = ds.search(null, ddq, 10);
- assertEquals(1, r.hits.totalHits.value);
+ assertEquals(1, r.hits.totalHits.value());
// Should be able to count on both fields since they're both drill sideways cases
assertEquals(
"dim=Publish Date path=[] value=2 childCount=2\n 2010 (1)\n 2012 (1)\n",
@@ -2156,7 +2156,7 @@ public class TestDrillSideways extends FacetTestCase {
ddq.add("author", bq.build());
ddq.add("dim", bq.build());
DrillSidewaysResult r = ds.search(null, ddq, 10);
- assertEquals(0, r.hits.totalHits.value);
+ assertEquals(0, r.hits.totalHits.value());
writer.close();
IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
@@ -2270,7 +2270,7 @@ public class TestDrillSideways extends FacetTestCase {
drillDownQuery.add("dim1", "dim1");
var result = drill.search(drillDownQuery, 99);
// We expect to match exactly one document from the query above
- assertEquals(1, result.hits.totalHits.value);
+ assertEquals(1, result.hits.totalHits.value());
indexReader.close();
taxonomyReader.close();
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java
index da012e3f0a8..16ecfd09719 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java
@@ -95,7 +95,7 @@ public class TestFacetQuery extends FacetTestCase {
@Test
public void testSingleValued() throws Exception {
TopDocs topDocs = searcher.search(new FacetQuery("Author", "Mark Twain"), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
}
@Test
@@ -105,6 +105,6 @@ public class TestFacetQuery extends FacetTestCase {
new MultiFacetQuery(
"Author", new String[] {"Mark Twain"}, new String[] {"Kurt Vonnegut"}),
10);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
}
}
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 f8ebd615843..d5f57bd827c 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
@@ -525,7 +525,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
DrillDownQuery ddq = new DrillDownQuery(config);
DrillSidewaysResult dsr = ds.search(null, ddq, 10);
- assertEquals(100, dsr.hits.totalHits.value);
+ assertEquals(100, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -538,7 +538,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
ddq.add("dim", "b");
dsr = ds.search(null, ddq, 10);
- assertEquals(75, dsr.hits.totalHits.value);
+ assertEquals(75, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -551,7 +551,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
ddq.add("field", LongPoint.newRangeQuery("field", 0L, 10L));
dsr = ds.search(null, ddq, 10);
- assertEquals(11, dsr.hits.totalHits.value);
+ assertEquals(11, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=11 childCount=2\n b (8)\n a (3)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -1709,7 +1709,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
}
// Test simple drill-down:
- assertEquals(1, s.search(ddq, 10).totalHits.value);
+ assertEquals(1, s.search(ddq, 10).totalHits.value());
// Test drill-sideways after drill-down
DrillSideways ds =
@@ -1737,7 +1737,7 @@ public class TestRangeFacetCounts extends FacetTestCase {
};
DrillSidewaysResult dsr = ds.search(ddq, 10);
- assertEquals(1, dsr.hits.totalHits.value);
+ assertEquals(1, dsr.hits.totalHits.value());
assertEquals(
"dim=field path=[] value=3 childCount=6\n < 1 (0)\n < 2 (1)\n < 5 (3)\n < 10 (3)\n < 20 (3)\n < 50 (3)\n",
dsr.facets.getAllChildren("field").toString());
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 a2c631301b9..9cdadc8ae30 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
@@ -549,7 +549,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
DrillDownQuery ddq = new DrillDownQuery(config);
DrillSideways.DrillSidewaysResult dsr = ds.search(null, ddq, 10);
- assertEquals(100, dsr.hits.totalHits.value);
+ assertEquals(100, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -562,7 +562,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
ddq.add("dim", "b");
dsr = ds.search(null, ddq, 10);
- assertEquals(75, dsr.hits.totalHits.value);
+ assertEquals(75, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -666,7 +666,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
DrillDownQuery ddq = new DrillDownQuery(config);
DrillSideways.DrillSidewaysResult dsr = ds.search(null, ddq, 10);
- assertEquals(100, dsr.hits.totalHits.value);
+ assertEquals(100, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
@@ -679,7 +679,7 @@ public class TestRangeOnRangeFacetCounts extends FacetTestCase {
ddq.add("dim", "b");
dsr = ds.search(null, ddq, 10);
- assertEquals(75, dsr.hits.totalHits.value);
+ assertEquals(75, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=100 childCount=2\n b (75)\n a (25)\n",
dsr.facets.getTopChildren(10, "dim").toString());
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 35c3af60b16..dd86bd44159 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
@@ -163,7 +163,7 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
q.add("a", "foo");
q.add("b", "baz");
TopDocs hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
} finally {
if (exec != null) exec.shutdownNow();
}
@@ -410,17 +410,17 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
q.add("a", "foo");
q.add("b", "baz");
TopDocs hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "buzz", "bif");
hits = searcher.search(q, 2);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "buzz", "biz", "bar");
hits = searcher.search(q, 2);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
} finally {
if (exec != null) exec.shutdownNow();
}
@@ -658,7 +658,7 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
q.add("a", "foo");
q.add("b", "bar");
TopDocs hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
} finally {
if (exec != null) exec.shutdownNow();
}
@@ -710,12 +710,12 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
DrillDownQuery q = new DrillDownQuery(config);
q.add("c", "buzz");
TopDocs hits = searcher.search(q, 1);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "buzz", "bar");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
} finally {
if (exec != null) exec.shutdownNow();
}
@@ -756,52 +756,52 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
DrillDownQuery q = new DrillDownQuery(config);
q.add("c");
TopDocs hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d", "foo");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e", "foo");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f", "foo");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g", "foo");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
}
}
}
@@ -844,102 +844,102 @@ public class TestSortedSetDocValuesFacets extends FacetTestCase {
DrillDownQuery q = new DrillDownQuery(config);
q.add("c");
TopDocs hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "biz");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "biz", "baz");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("c", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d", "biz");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("d", "biz", "baz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e", "biz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("e", "biz", "baz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f", "biz");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("f", "biz", "baz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g", "foo");
hits = searcher.search(q, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g", "biz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
q = new DrillDownQuery(config);
q.add("g", "biz", "baz");
hits = searcher.search(q, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
}
}
}
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalData.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalData.java
index 5b8556c1f88..d80027f5270 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalData.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalData.java
@@ -153,7 +153,7 @@ public class TestOrdinalData extends FacetTestCase {
Query q = queryAndCount.getKey();
int count = queryAndCount.getValue();
TopDocs td = searcher.search(q, Integer.MAX_VALUE);
- assertEquals(count, td.totalHits.value);
+ assertEquals(count, td.totalHits.value());
}
}
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 de0a7a8b5f7..3cea228fc84 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
@@ -321,7 +321,7 @@ public class TestTaxonomyFacetValueSource extends FacetTestCase {
Facets facets =
new TaxonomyFacetFloatAssociations(
taxoReader, config, fc, AssociationAggregationFunction.SUM, DoubleValuesSource.SCORES);
- int expected = (int) (csq.getBoost() * td.totalHits.value);
+ int expected = (int) (csq.getBoost() * td.totalHits.value());
assertEquals(expected, facets.getSpecificValue("dim", "a").intValue());
// Test MAX:
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
index 7350f0bffdb..e8b2f9076b6 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
@@ -540,7 +540,7 @@ public class TestDirectoryTaxonomyWriter extends FacetTestCase {
IndexSearcher searcher = new IndexSearcher(indexReader);
DrillDownQuery ddq = new DrillDownQuery(new FacetsConfig());
ddq.add("dim", bigs);
- assertEquals(1, searcher.search(ddq, 10).totalHits.value);
+ assertEquals(1, searcher.search(ddq, 10).totalHits.value());
IOUtils.close(indexReader, taxoReader, indexDir, taxoDir);
}
diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
index 1f5e107f5f8..0a1c607ab78 100644
--- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
+++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
@@ -201,8 +201,8 @@ public class TopGroups<T> {
}
maxScore = nonNANmax(maxScore, shardGroupDocs.maxScore());
- assert shardGroupDocs.totalHits().relation == Relation.EQUAL_TO;
- totalHits += shardGroupDocs.totalHits().value;
+ assert shardGroupDocs.totalHits().relation() == Relation.EQUAL_TO;
+ totalHits += shardGroupDocs.totalHits().value();
scoreSum += shardGroupDocs.score();
}
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 e08fb61166c..ff6ddc192d1 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
@@ -1141,7 +1141,7 @@ public class TestGrouping extends LuceneTestCase {
" group="
+ (gd.groupValue() == null ? "null" : gd.groupValue())
+ " totalHits="
- + gd.totalHits().value
+ + gd.totalHits().value()
+ " scoreDocs.len="
+ gd.scoreDocs().length);
for (ScoreDoc sd : gd.scoreDocs()) {
@@ -1160,7 +1160,7 @@ public class TestGrouping extends LuceneTestCase {
" group="
+ (gd.groupValue() == null ? "null" : gd.groupValue())
+ " totalHits="
- + gd.totalHits().value);
+ + gd.totalHits().value());
for (ScoreDoc sd : gd.scoreDocs()) {
System.out.println(" id=" + docIDToID[sd.doc] + " score=" + sd.score);
}
@@ -1185,7 +1185,7 @@ public class TestGrouping extends LuceneTestCase {
" group="
+ (gd.groupValue() == null ? "null" : gd.groupValue())
+ " totalHits="
- + gd.totalHits().value);
+ + gd.totalHits().value());
for (ScoreDoc sd : gd.scoreDocs()) {
System.out.println(" id=" + docIDToID[sd.doc] + " score=" + sd.score);
}
@@ -1249,7 +1249,7 @@ public class TestGrouping extends LuceneTestCase {
" group="
+ (gd.groupValue() == null ? "null" : gd.groupValue().utf8ToString())
+ " totalHits="
- + gd.totalHits().value);
+ + gd.totalHits().value());
for (ScoreDoc sd : gd.scoreDocs()) {
System.out.println(" id=" + docIDToIDBlocks[sd.doc] + " score=" + sd.score);
if (first) {
@@ -1556,7 +1556,7 @@ public class TestGrouping extends LuceneTestCase {
// TODO
// assertEquals(expectedGroup.maxScore, actualGroup.maxScore);
- assertEquals(expectedGroup.totalHits().value, actualGroup.totalHits().value);
+ assertEquals(expectedGroup.totalHits().value(), actualGroup.totalHits().value());
final ScoreDoc[] expectedFDs = expectedGroup.scoreDocs();
final ScoreDoc[] actualFDs = actualGroup.scoreDocs();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
index 1664eb4be67..cee95a0ee16 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
@@ -153,7 +153,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
searcher = newSearcher(reader);
TopDocs hits = searcher.search(query, 10, new Sort(SortField.FIELD_DOC, SortField.FIELD_SCORE));
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(scorer);
@@ -205,7 +205,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
searcher = newSearcher(reader);
TopDocs hits = searcher.search(query, 10, new Sort(SortField.FIELD_DOC, SortField.FIELD_SCORE));
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(scorer);
@@ -290,7 +290,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
searcher = newSearcher(reader);
TopDocs hits = searcher.search(query, 10, new Sort(SortField.FIELD_DOC, SortField.FIELD_SCORE));
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(scorer);
@@ -374,7 +374,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text = searcher.storedFields().document(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -398,8 +398,8 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(scorer);
- assertEquals("Must have one hit", 1, hits.totalHits.value);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ assertEquals("Must have one hit", 1, hits.totalHits.value());
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text = searcher.storedFields().document(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
@@ -465,7 +465,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -498,7 +498,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
scorer = new QueryScorer(query, FIELD_NAME);
highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -531,7 +531,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
scorer = new QueryScorer(query, FIELD_NAME);
highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -560,7 +560,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -587,7 +587,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -614,7 +614,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, reader, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -643,7 +643,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text =
searcher
.storedFields()
@@ -671,7 +671,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
Highlighter highlighter = new Highlighter(this, scorer);
highlighter.setTextFragmenter(new SimpleFragmenter(40));
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -693,7 +693,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
int maxNumFragmentsRequired = 2;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -727,7 +727,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -749,7 +749,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
scorer = new QueryScorer(query, FIELD_NAME);
highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text = searcher.storedFields().document(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
@@ -776,7 +776,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -857,7 +857,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
Highlighter highlighter = new Highlighter(new QueryTermScorer(query));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
int maxNumFragmentsRequired = 2;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1102,7 +1102,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
if (VERBOSE) System.out.println("Searching for: " + query.toString(FIELD_NAME));
hits = searcher.search(query, 1000);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1130,7 +1130,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
numHighlights = 0;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1158,7 +1158,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
numHighlights = 0;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1356,7 +1356,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
public void run() throws Exception {
doSearching(new TermQuery(new Term(FIELD_NAME, "kennedy")));
numHighlights = 0;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1372,7 +1372,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
numHighlights == 4);
numHighlights = 0;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1385,7 +1385,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
numHighlights == 4);
numHighlights = 0;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1532,7 +1532,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
doSearching(new TermQuery(new Term(FIELD_NAME, "kennedy")));
// new Highlighter(TestHighlighter.this, new QueryTermScorer(query));
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text = searcher.storedFields().document(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
Highlighter highlighter = getHighlighter(query, FIELD_NAME, TestHighlighter.this);
@@ -1556,7 +1556,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
doSearching(new TermQuery(new Term(FIELD_NAME, "kennedy")));
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -1770,7 +1770,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
int maxNumFragmentsRequired = 3;
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(FIELD_NAME);
@@ -2161,7 +2161,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
Highlighter h = new Highlighter(scorer);
TopDocs hits = searcher.search(query, 10);
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
Document doc = searcher.storedFields().document(hits.scoreDocs[i].doc);
String result = h.getBestFragment(a, "t_text1", doc.get("t_text1"));
if (VERBOSE) System.out.println("result:" + result);
@@ -2230,7 +2230,7 @@ public class TestHighlighter extends BaseTokenStreamTestCase implements Formatte
public void assertExpectedHighlightCount(
final int maxNumFragmentsRequired, final int expectedHighlights) throws Exception {
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
String text = searcher.storedFields().document(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
@@ -2497,7 +2497,7 @@ final class SynonymTokenizer extends TokenStream {
throws Exception {
TermVectors termVectors = searcher.getIndexReader().termVectors();
- for (int i = 0; i < hits.totalHits.value; i++) {
+ for (int i = 0; i < hits.totalHits.value(); i++) {
final int docId = hits.scoreDocs[i].doc;
final Document doc = searcher.storedFields().document(docId);
String text = doc.get(TestHighlighter.FIELD_NAME);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
index f52f277cb37..3803b71461b 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
@@ -73,7 +73,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
final IndexSearcher indexSearcher = newSearcher(indexReader);
final PhraseQuery phraseQuery = new PhraseQuery(FIELD, "fox", "jumped");
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -170,7 +170,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
final IndexSearcher indexSearcher = newSearcher(indexReader);
final PhraseQuery phraseQuery = new PhraseQuery(FIELD, "did", "jump");
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -209,7 +209,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
final IndexSearcher indexSearcher = newSearcher(indexReader);
final PhraseQuery phraseQuery = new PhraseQuery(1, FIELD, "did", "jump");
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -255,7 +255,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
true);
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(0, hits.totalHits.value);
+ assertEquals(0, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -293,7 +293,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
.build();
TopDocs hits = indexSearcher.search(phraseQuery, 100);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -326,7 +326,7 @@ public class TestHighlighterPhrase extends LuceneTestCase {
.build();
TopDocs hits = indexSearcher.search(phraseQuery, 100);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
index 087b460c1da..6a466822b40 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
@@ -128,7 +128,7 @@ public class TestTokenSources extends BaseTokenStreamTestCase {
// new SpanTermQuery(new Term(FIELD, "fox")) }, 0, true);
TopDocs hits = indexSearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(query));
@@ -171,7 +171,7 @@ public class TestTokenSources extends BaseTokenStreamTestCase {
// new SpanTermQuery(new Term(FIELD, "fox")) }, 0, true);
TopDocs hits = indexSearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(query));
@@ -215,7 +215,7 @@ public class TestTokenSources extends BaseTokenStreamTestCase {
true);
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
@@ -260,7 +260,7 @@ public class TestTokenSources extends BaseTokenStreamTestCase {
true);
TopDocs hits = indexSearcher.search(phraseQuery, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final Highlighter highlighter =
new Highlighter(
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(), new QueryScorer(phraseQuery));
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
index 18720a3d0f4..98b1ba86f58 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
@@ -182,7 +182,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("Just a test <b>highlighting</b> from postings. ", snippets[0]);
@@ -243,7 +243,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withMaxLength(maxLength);
@@ -272,7 +272,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals("This is a <b>test</b>", snippets[0]);
@@ -300,7 +300,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -332,7 +332,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new TermQuery(new Term("body", "field"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 10);
assertEquals(1, snippets.length);
String highlightedValue = "This is a multivalued <b>field</b>. Sentencetwo <b>field</b>.";
@@ -369,7 +369,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("title", "best")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
Map<String, String[]> snippets =
highlighter.highlightFields(new String[] {"body", "title"}, query, topDocs);
assertEquals(2, snippets.size());
@@ -405,7 +405,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("body", "first")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("<b>Just</b> a test <b>highlighting</b> from postings. ", snippets[0]);
@@ -434,7 +434,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(2, snippets.length);
assertEquals(
@@ -472,7 +472,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.add(new Term("body", "origins"))
.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withHighlightPhrasesStrictly(false);
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
@@ -528,7 +528,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.add(new Term("body", "george"))
.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withHighlightPhrasesStrictly(false);
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
@@ -560,7 +560,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("body", "massachusetts")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer)
.withMaxLength(Integer.MAX_VALUE - 1);
@@ -590,7 +590,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -625,7 +625,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer)
.withMaxLength(Integer.MAX_VALUE - 1);
@@ -658,7 +658,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -688,7 +688,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
ScoreDoc[] hits = topDocs.scoreDocs;
int[] docIDs = new int[2];
docIDs[0] = hits[0].doc;
@@ -745,7 +745,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
}.build();
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -1014,7 +1014,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new TermQuery(new Term("body", "answer"));
TopDocs hits = searcher.search(query, numDocs);
- assertEquals(numDocs, hits.totalHits.value);
+ assertEquals(numDocs, hits.totalHits.value());
String[] snippets = highlighter.highlight("body", query, hits);
assertEquals(numDocs, snippets.length);
@@ -1088,7 +1088,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
.build();
Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals(
@@ -1131,7 +1131,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter.builder(searcher, indexAnalyzer).withFormatter(passageFormatter).build();
Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
int[] docIDs = new int[1];
docIDs[0] = topDocs.scoreDocs[0].doc;
Map<String, Object[]> snippets =
@@ -1196,7 +1196,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// title
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("title", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals("<b>This</b> <b>is</b> the title <b>field</b>.", snippets[0]);
@@ -1216,7 +1216,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// text
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("text", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals(
@@ -1240,7 +1240,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// category
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("category", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals("<b>This</b> <b>is</b> the <b>category</b> <b>field</b>.", snippets[0]);
@@ -1286,7 +1286,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// title
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("title", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals("<b>This</b> <b>is</b> the title <b>field</b>.", snippets[0]);
@@ -1306,7 +1306,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// text
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("text", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals(
@@ -1330,7 +1330,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// category
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("category", query, topDocs, 10);
assertEquals(1, snippets.length);
assertEquals("<b>This</b> <b>is</b> the <b>category</b> <b>field</b>.", snippets[0]);
@@ -1446,7 +1446,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
}
Query query = boolQueryBuilder.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
Function<String, Set<String>> maskedFieldsFunc =
fieldName -> fieldName.equals(field) ? maskedFields : Collections.emptySet();
@@ -1470,7 +1470,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = UnifiedHighlighter.builder(searcher, indexAnalyzer).build();
Query query = new PhraseQuery(2, "title", "this", "is", "the", "field");
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("title", query, topDocs, 10);
assertEquals(1, snippets.length);
if (highlighter.getFlags("title").contains(HighlightFlag.WEIGHT_MATCHES)) {
@@ -1513,7 +1513,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// title
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("title", query, topDocs, 10);
assertEquals(1, snippets.length);
if (highlighterNoFieldMatch.getFlags("title").contains(HighlightFlag.WEIGHT_MATCHES)) {
@@ -1545,7 +1545,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// text
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("text", query, topDocs, 10);
assertEquals(1, snippets.length);
if (highlighterNoFieldMatch.getFlags("text").contains(HighlightFlag.WEIGHT_MATCHES)) {
@@ -1584,7 +1584,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
// category
{
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighterNoFieldMatch.highlight("category", query, topDocs, 10);
assertEquals(1, snippets.length);
if (highlighterNoFieldMatch.getFlags("category").contains(HighlightFlag.WEIGHT_MATCHES)) {
@@ -1682,7 +1682,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
});
Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals("Just a test <b>highlighting</b> from postings. ", snippets[0]);
@@ -1755,7 +1755,7 @@ public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
BooleanClause.Occur.MUST)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals("Test a <b>one</b> <b>sentence</b> document.", snippets[0]);
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 76193a8e62a..b5652fb0f2b 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
@@ -96,7 +96,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter.Builder uhBuilder = new UnifiedHighlighter.Builder(searcher, indexAnalyzer);
Query query = new WildcardQuery(new Term("body", "te*"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = uhBuilder.build().highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -115,7 +115,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = uhBuilder.withHandleMultiTermQuery(true).build().highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -156,7 +156,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// wrap in a BoostQuery to also show we see inside it
Query query = new BoostQuery(new PrefixQuery(new Term("body", "te")), 2.0f);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -169,7 +169,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new PrefixQuery(new Term("bogus", "te")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = uhBuilder.withFieldMatcher(null).build().highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -198,7 +198,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new RegexpQuery(new Term("body", "te.*"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -211,7 +211,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new RegexpQuery(new Term("bogus", "te.*")), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = uhBuilder.withFieldMatcher(null).build().highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -240,7 +240,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new FuzzyQuery(new Term("body", "tets"), 1);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -249,7 +249,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// with prefix
query = new FuzzyQuery(new Term("body", "tets"), 1, 2);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -258,7 +258,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// with zero max edits
query = new FuzzyQuery(new Term("body", "test"), 0, 2);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -271,7 +271,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new FuzzyQuery(new Term("bogus", "tets"), 1), BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = uhBuilder.withFieldMatcher(null).build().highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -300,7 +300,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = TermRangeQuery.newStringRange("body", "ta", "tf", true, true);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -309,7 +309,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// null start
query = TermRangeQuery.newStringRange("body", null, "tf", true, true);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This <b>is</b> <b>a</b> <b>test</b>.", snippets[0]);
@@ -318,7 +318,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// null end
query = TermRangeQuery.newStringRange("body", "ta", null, true, true);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("<b>This</b> is a <b>test</b>.", snippets[0]);
@@ -327,7 +327,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// exact start inclusive
query = TermRangeQuery.newStringRange("body", "test", "tf", true, true);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -336,7 +336,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
// exact end inclusive
query = TermRangeQuery.newStringRange("body", "ta", "test", true, true);
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -351,7 +351,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -366,7 +366,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -381,7 +381,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
BooleanClause.Occur.SHOULD)
.build();
topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = uhBuilder.withFieldMatcher(null).build().highlight("body", bq, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -412,7 +412,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new WildcardQuery(new Term("body", "te*")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -425,7 +425,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.MUST_NOT)
.build();
topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a test.", snippets[0]);
@@ -457,7 +457,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("body", "test")), BooleanClause.Occur.FILTER)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -485,7 +485,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
ConstantScoreQuery query = new ConstantScoreQuery(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -515,7 +515,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
new DisjunctionMaxQuery(
Collections.singleton(new WildcardQuery(new Term("body", "te*"))), 0);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -543,7 +543,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -573,7 +573,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanOrQuery(new SpanQuery[] {childQuery});
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -603,7 +603,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanNearQuery(new SpanQuery[] {childQuery, childQuery}, 0, false);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -633,7 +633,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
SpanQuery exclude = new SpanTermQuery(new Term("body", "bogus"));
Query query = new SpanNotQuery(include, exclude);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -663,7 +663,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanFirstQuery(childQuery, 1000000);
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -698,7 +698,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
.add(new FuzzyQuery(new Term("body", "zentence~")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
@@ -755,7 +755,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
}
};
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
@@ -1196,7 +1196,7 @@ public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
String fieldVal)
throws IOException {
TopDocs topDocs = searcher.search(query, 1);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight(field, query, topDocs);
assertEquals("[<b>" + fieldVal + "</b>]", Arrays.toString(snippets));
}
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
index 6c7e9c89174..43fb12fdb8e 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
@@ -273,7 +273,7 @@ public class TestUnifiedHighlighterRanking extends UnifiedHighlighterTestBase {
};
Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 1);
assertEquals(1, snippets.length);
assertTrue(snippets[0].startsWith("This <b>test</b> is a better <b>test</b>"));
@@ -331,7 +331,7 @@ public class TestUnifiedHighlighterRanking extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("body", "bar")), BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 1);
assertEquals(1, snippets.length);
assertTrue(snippets[0].startsWith("On the other hand"));
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 2b553d9af48..e2b559b4a20 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
@@ -476,7 +476,7 @@ public class TestUnifiedHighlighterStrictPhrases extends UnifiedHighlighterTestB
.add(phraseQuery, BooleanClause.Occur.MUST) // must match and it will
.build();
topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
snippets = highlighter.highlight("body", query, topDocs, 2);
if (highlighter.getFlags("body").contains(HighlightFlag.WEIGHT_MATCHES)) {
assertEquals("one <b>bravo</b> <b>three</b>... four <b>bravo</b> six", snippets[0]);
@@ -594,7 +594,7 @@ public class TestUnifiedHighlighterStrictPhrases extends UnifiedHighlighterTestB
.add(proximityBoostingQuery, BooleanClause.Occur.SHOULD)
.build();
TopDocs topDocs = searcher.search(totalQuery, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", totalQuery, topDocs);
assertArrayEquals(
new String[] {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
index 4ae9eba826f..1cd57f39418 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
@@ -96,7 +96,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("Just a test <b>highlighting</b> from postings. ", snippets[0]);
@@ -156,7 +156,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withMaxLength(maxLength);
@@ -185,7 +185,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals("This is a <b>test</b>", snippets[0]);
@@ -213,7 +213,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("This is a <b>test</b>.", snippets[0]);
@@ -244,7 +244,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new IntervalQuery("body", Intervals.term("field"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 10);
assertEquals(1, snippets.length);
String highlightedValue = "This is a multivalued <b>field</b>. Sentencetwo <b>field</b>.";
@@ -276,7 +276,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Intervals.or(
Intervals.term("highlighting"), Intervals.term("just"), Intervals.term("first")));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(2, snippets.length);
assertEquals("<b>Just</b> a test <b>highlighting</b> from postings. ", snippets[0]);
@@ -304,7 +304,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(2, snippets.length);
assertEquals(
@@ -337,7 +337,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
IndexSearcher searcher = newSearcher(ir);
Query query = new IntervalQuery("body", Intervals.phrase("buddhist", "origins"));
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withHighlightPhrasesStrictly(false);
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
@@ -367,7 +367,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
IndexSearcher searcher = newSearcher(ir);
Query query = new IntervalQuery("body", Intervals.phrase("curious", "george"));
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer).withHighlightPhrasesStrictly(false);
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
@@ -407,7 +407,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Intervals.term("square"),
Intervals.term("massachusetts")));
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer)
.withMaxLength(Integer.MAX_VALUE - 1);
@@ -439,7 +439,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -465,7 +465,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
new IntervalQuery(
"body", Intervals.notContaining(Intervals.term("terms"), Intervals.term("both")));
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter.Builder uhBuilder =
new UnifiedHighlighter.Builder(searcher, indexAnalyzer)
.withMaxLength(Integer.MAX_VALUE - 1);
@@ -499,7 +499,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -528,7 +528,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(searcher, indexAnalyzer);
Query query = new IntervalQuery("body", Intervals.term("highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
ScoreDoc[] hits = topDocs.scoreDocs;
int[] docIDs = new int[2];
docIDs[0] = hits[0].doc;
@@ -579,7 +579,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Query query = new IntervalQuery("body", Intervals.term("test"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
assertEquals(
@@ -839,7 +839,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
UnifiedHighlighter highlighter = randomUnifiedHighlighter(uhBuilder);
Query query = new IntervalQuery("body", Intervals.term("answer"));
TopDocs hits = searcher.search(query, numDocs);
- assertEquals(numDocs, hits.totalHits.value);
+ assertEquals(numDocs, hits.totalHits.value());
String[] snippets = highlighter.highlight("body", query, hits);
assertEquals(numDocs, snippets.length);
@@ -877,7 +877,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Query query = new IntervalQuery("body", Intervals.term("highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals(
@@ -920,7 +920,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Query query = new IntervalQuery("body", Intervals.term("highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
int[] docIDs = new int[1];
docIDs[0] = topDocs.scoreDocs[0].doc;
Map<String, Object[]> snippets =
@@ -975,7 +975,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
Intervals.term("the"),
Intervals.term("field"))));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("title", query, topDocs, 10);
assertEquals(1, snippets.length);
// All flags are enabled.
@@ -1020,7 +1020,7 @@ public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestB
});
Query query = new IntervalQuery("body", Intervals.term("highlighting"));
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
String[] snippets = highlighter.highlight("body", query, topDocs);
assertEquals(1, snippets.length);
assertEquals("Just a test <b>highlighting</b> from postings. ", snippets[0]);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
index 84ea233affe..edb96e5c6ba 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
@@ -96,7 +96,7 @@ public class TestUnifiedHighlighterTermVec extends UnifiedHighlighterTestBase {
.add(new TermQuery(new Term("body", bbb)), BooleanClause.Occur.MUST)
.build();
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
UnifiedHighlighter highlighter = UnifiedHighlighter.builder(searcher, indexAnalyzer).build();
String[] snippets = highlighter.highlight("body", query, topDocs, 2);
assertEquals(1, snippets.length);
@@ -142,7 +142,7 @@ public class TestUnifiedHighlighterTermVec extends UnifiedHighlighterTestBase {
}
BooleanQuery query = queryBuilder.build();
TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
- assertEquals(numDocs, topDocs.totalHits.value);
+ assertEquals(numDocs, topDocs.totalHits.value());
Map<String, String[]> fieldToSnippets =
highlighter.highlightFields(fields.toArray(new String[numTvFields]), query, topDocs);
String[] expectedSnippetsByDoc = new String[numDocs];
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
index 81e8cef9208..74779697eee 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
@@ -389,7 +389,7 @@ public class TestFastVectorHighlighter extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(writer);
IndexSearcher searcher = newSearcher(reader);
TopDocs hits = searcher.search(query, 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
FieldQuery fieldQuery = highlighter.getFieldQuery(query, reader);
String[] bestFragments = highlighter.getBestFragments(fieldQuery, reader, 1, "field", 1000, 1);
assertEquals(
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 7cec3b71592..03fad9b02a7 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
@@ -113,7 +113,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
new QueryBitSetProducer(new TermQuery(new Term("docType", "_parent")));
Query query = getParentJoinKnnQuery("field", new float[] {2, 2}, null, 3, parentFilter);
TopDocs topDocs = searcher.search(query, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
// Test with match_all filter and large k to test exact search
@@ -121,7 +121,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
getParentJoinKnnQuery(
"field", new float[] {2, 2}, new MatchAllDocsQuery(), 10, parentFilter);
topDocs = searcher.search(query, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
}
}
@@ -154,7 +154,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
new QueryBitSetProducer(new TermQuery(new Term("docType", "_parent")));
Query query = getParentJoinKnnQuery("field", new float[] {2, 2}, null, 3, parentFilter);
TopDocs topDocs = searcher.search(query, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
// Test with match_all filter and large k to test exact search
@@ -162,7 +162,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
getParentJoinKnnQuery(
"field", new float[] {2, 2}, new MatchAllDocsQuery(), 10, parentFilter);
topDocs = searcher.search(query, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
assertEquals(0, topDocs.scoreDocs.length);
}
}
@@ -177,7 +177,7 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
BitSetProducer parentFilter = parentFilter(reader);
Query kvq = getParentJoinKnnQuery("field", new float[] {1, 2}, filter, 2, parentFilter);
TopDocs topDocs = searcher.search(kvq, 3);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
}
}
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 77f00818dec..6e333c0cbd7 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
@@ -148,7 +148,7 @@ public class TestBlockJoin extends LuceneTestCase {
fullQuery.add(new BooleanClause(childJoinQuery, Occur.MUST));
fullQuery.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
TopDocs topDocs = s.search(fullQuery.build(), 2);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
assertEquals(
asSet("Lisa", "Frank"),
asSet(
@@ -159,14 +159,14 @@ public class TestBlockJoin extends LuceneTestCase {
new ParentChildrenBlockJoinQuery(
parentsFilter, childQuery.build(), topDocs.scoreDocs[0].doc);
TopDocs matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
childrenQuery =
new ParentChildrenBlockJoinQuery(
parentsFilter, childQuery.build(), topDocs.scoreDocs[1].doc);
matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
r.close();
@@ -222,7 +222,7 @@ public class TestBlockJoin extends LuceneTestCase {
fullQuery.add(new BooleanClause(childJoinQuery, Occur.SHOULD));
final TopDocs topDocs = s.search(fullQuery.build(), 2);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
assertEquals(
asSet("Lisa", "Frank"),
asSet(
@@ -233,14 +233,14 @@ public class TestBlockJoin extends LuceneTestCase {
new ParentChildrenBlockJoinQuery(
parentsFilter, childQuery.build(), topDocs.scoreDocs[0].doc);
TopDocs matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
childrenQuery =
new ParentChildrenBlockJoinQuery(
parentsFilter, childQuery.build(), topDocs.scoreDocs[1].doc);
matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
r.close();
@@ -281,7 +281,7 @@ public class TestBlockJoin extends LuceneTestCase {
"vector", new float[] {4f, 4f, 4f}, null, 3, parentsFilter);
TopDocs topDocs = s.search(childKnnJoin, 5);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
Document childDoc = s.storedFields().document(topDocs.scoreDocs[0].doc);
assertEquals("parent1", childDoc.get("my_parent_id"));
assertEquals(
@@ -346,7 +346,7 @@ public class TestBlockJoin extends LuceneTestCase {
TopDocs topDocs = s.search(fullQuery.build(), 1);
// assertEquals(1, results.totalHitCount);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
Document parentDoc = s.storedFields().document(topDocs.scoreDocs[0].doc);
assertEquals("Lisa", parentDoc.get("name"));
@@ -354,7 +354,7 @@ public class TestBlockJoin extends LuceneTestCase {
new ParentChildrenBlockJoinQuery(
parentsFilter, childQuery.build(), topDocs.scoreDocs[0].doc);
TopDocs matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
// System.out.println("TEST: now test up");
@@ -367,7 +367,7 @@ public class TestBlockJoin extends LuceneTestCase {
// System.out.println("FULL: " + fullChildQuery);
TopDocs hits = s.search(fullChildQuery.build(), 10);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
Document childDoc = s.storedFields().document(hits.scoreDocs[0].doc);
// System.out.println("CHILD = " + childDoc + " docID=" + hits.scoreDocs[0].doc);
assertEquals("java", childDoc.get("skill"));
@@ -467,7 +467,7 @@ public class TestBlockJoin extends LuceneTestCase {
.add(parentQuery, Occur.FILTER)
.build();
TopDocs ukOnly = s.search(query, 1);
- assertEquals("has filter - single passed", 1, ukOnly.totalHits.value);
+ assertEquals("has filter - single passed", 1, ukOnly.totalHits.value());
assertEquals("Lisa", r.storedFields().document(ukOnly.scoreDocs[0].doc).get("name"));
query =
@@ -477,7 +477,7 @@ public class TestBlockJoin extends LuceneTestCase {
.build();
// looking for US candidates
TopDocs usThen = s.search(query, 1);
- assertEquals("has filter - single passed", 1, usThen.totalHits.value);
+ assertEquals("has filter - single passed", 1, usThen.totalHits.value());
assertEquals("Frank", r.storedFields().document(usThen.scoreDocs[0].doc).get("name"));
TermQuery us = new TermQuery(new Term("country", "United States"));
@@ -889,7 +889,7 @@ public class TestBlockJoin extends LuceneTestCase {
if (VERBOSE) {
System.out.println(
"\nTEST: normal index gets "
- + results.totalHits.value
+ + results.totalHits.value()
+ " hits; sort="
+ parentAndChildSort);
final ScoreDoc[] hits = results.scoreDocs;
@@ -958,7 +958,7 @@ public class TestBlockJoin extends LuceneTestCase {
}
}
- if (results.totalHits.value == 0) {
+ if (results.totalHits.value() == 0) {
assertEquals(0, joinResults.size());
} else {
compareHits(r, joinR, results, joinResults);
@@ -1113,7 +1113,7 @@ public class TestBlockJoin extends LuceneTestCase {
}
final TopDocs results2 = s.search(childQuery2, r.numDocs(), childSort2);
if (VERBOSE) {
- System.out.println(" " + results2.totalHits.value + " totalHits:");
+ System.out.println(" " + results2.totalHits.value() + " totalHits:");
for (ScoreDoc sd : results2.scoreDocs) {
final Document doc = s.storedFields().document(sd.doc);
System.out.println(
@@ -1133,7 +1133,7 @@ public class TestBlockJoin extends LuceneTestCase {
}
TopDocs joinResults2 = joinS.search(childJoinQuery2, joinR.numDocs(), childSort2);
if (VERBOSE) {
- System.out.println(" " + joinResults2.totalHits.value + " totalHits:");
+ System.out.println(" " + joinResults2.totalHits.value() + " totalHits:");
for (ScoreDoc sd : joinResults2.scoreDocs) {
final Document doc = joinS.storedFields().document(sd.doc);
final Document parentDoc = getParentDoc(joinR, parentsFilter, sd.doc);
@@ -1158,7 +1158,7 @@ public class TestBlockJoin extends LuceneTestCase {
private void compareChildHits(
IndexReader r, IndexReader joinR, TopDocs results, TopDocs joinResults) throws Exception {
- assertEquals(results.totalHits.value, joinResults.totalHits.value);
+ assertEquals(results.totalHits.value(), joinResults.totalHits.value());
assertEquals(results.scoreDocs.length, joinResults.scoreDocs.length);
for (int hitCount = 0; hitCount < results.scoreDocs.length; hitCount++) {
ScoreDoc hit = results.scoreDocs[hitCount];
@@ -1252,7 +1252,7 @@ public class TestBlockJoin extends LuceneTestCase {
fullQuery.add(new BooleanClause(childQualificationJoinQuery, Occur.MUST));
final TopDocs topDocs = s.search(fullQuery.build(), 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
Document parentDoc = s.storedFields().document(topDocs.scoreDocs[0].doc);
assertEquals("Lisa", parentDoc.get("name"));
@@ -1260,14 +1260,14 @@ public class TestBlockJoin extends LuceneTestCase {
new ParentChildrenBlockJoinQuery(
parentsFilter, childJobQuery.build(), topDocs.scoreDocs[0].doc);
TopDocs matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals("java", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("skill"));
childrenQuery =
new ParentChildrenBlockJoinQuery(
parentsFilter, childQualificationQuery.build(), topDocs.scoreDocs[0].doc);
matchingChildren = s.search(childrenQuery, 1);
- assertEquals(1, matchingChildren.totalHits.value);
+ assertEquals(1, matchingChildren.totalHits.value());
assertEquals(
"maths", s.storedFields().document(matchingChildren.scoreDocs[0].doc).get("qualification"));
@@ -1453,7 +1453,7 @@ public class TestBlockJoin extends LuceneTestCase {
ToChildBlockJoinQuery parentJoinQuery = new ToChildBlockJoinQuery(parentQuery, parentsFilter);
TopDocs topdocs = s.search(parentJoinQuery, 3);
- assertEquals(1, topdocs.totalHits.value);
+ assertEquals(1, topdocs.totalHits.value());
r.close();
dir.close();
@@ -1735,7 +1735,7 @@ public class TestBlockJoin extends LuceneTestCase {
Query query =
new ToParentBlockJoinQuery(new TermQuery(new Term("foo", "bar")), parents, scoreMode);
TopDocs topDocs = searcher.search(query, 10);
- assertEquals(1, topDocs.totalHits.value);
+ assertEquals(1, topDocs.totalHits.value());
assertEquals(3, topDocs.scoreDocs[0].doc);
float expectedScore;
switch (scoreMode) {
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
index dd5ba445a65..0c9c77ed7e0 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
@@ -224,7 +224,7 @@ public class TestBlockJoinSorting extends LuceneTestCase {
"field2", SortField.Type.STRING, false, parentFilter, childFilter);
Sort sort = new Sort(sortField);
TopFieldDocs topDocs = searcher.search(query, 5, sort);
- assertEquals(7, topDocs.totalHits.value);
+ assertEquals(7, topDocs.totalHits.value());
assertEquals(5, topDocs.scoreDocs.length);
assertEquals(3, topDocs.scoreDocs[0].doc);
assertEquals("a", ((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString());
@@ -247,7 +247,7 @@ public class TestBlockJoinSorting extends LuceneTestCase {
sort = new Sort(sortField);
topDocs = searcher.search(query, 5, sort);
- assertEquals(7, topDocs.totalHits.value);
+ assertEquals(7, topDocs.totalHits.value());
assertEquals(5, topDocs.scoreDocs.length);
assertEquals(3, topDocs.scoreDocs[0].doc);
assertEquals("c", ((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString());
@@ -269,7 +269,7 @@ public class TestBlockJoinSorting extends LuceneTestCase {
"field2", SortField.Type.STRING, true, parentFilter, childFilter));
sort = new Sort(sortField);
topDocs = searcher.search(query, 5, sort);
- assertEquals(topDocs.totalHits.value, 7);
+ assertEquals(topDocs.totalHits.value(), 7);
assertEquals(5, topDocs.scoreDocs.length);
assertEquals(27, topDocs.scoreDocs[0].doc);
assertEquals("o", ((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString());
@@ -298,7 +298,7 @@ public class TestBlockJoinSorting extends LuceneTestCase {
sort = new Sort(sortField);
topDocs = searcher.search(query, 5, sort);
- assertEquals(6, topDocs.totalHits.value);
+ assertEquals(6, topDocs.totalHits.value());
assertEquals(5, topDocs.scoreDocs.length);
assertEquals(23, topDocs.scoreDocs[0].doc);
assertEquals("m", ((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString());
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 972929e8118..227a9550a88 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
@@ -157,7 +157,7 @@ public class TestJoinUtil extends LuceneTestCase {
ScoreMode.None);
TopDocs result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(4, result.scoreDocs[0].doc);
assertEquals(5, result.scoreDocs[1].doc);
@@ -170,7 +170,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.None);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(1, result.scoreDocs[0].doc);
assertEquals(2, result.scoreDocs[1].doc);
@@ -184,7 +184,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.None);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(1, result.totalHits.value);
+ assertEquals(1, result.totalHits.value());
assertEquals(3, result.scoreDocs[0].doc);
indexSearcher.getIndexReader().close();
@@ -278,7 +278,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField, fromQuery, toQuery, indexSearcher, ScoreMode.None, ordinalMap);
TopDocs result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(4, result.scoreDocs[0].doc);
assertEquals(5, result.scoreDocs[1].doc);
@@ -287,7 +287,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField, fromQuery, toQuery, indexSearcher, ScoreMode.None, ordinalMap);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(1, result.scoreDocs[0].doc);
assertEquals(2, result.scoreDocs[1].doc);
@@ -298,7 +298,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField, fromQuery, toQuery, indexSearcher, ScoreMode.None, ordinalMap);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(0, result.scoreDocs[0].doc);
assertEquals(3, result.scoreDocs[1].doc);
@@ -391,7 +391,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
joinField, fromQuery, toQuery, indexSearcher, scoreMode, ordinalMap);
TopDocs result = indexSearcher.search(joinQuery, 10);
- assertEquals(1, result.totalHits.value);
+ assertEquals(1, result.totalHits.value());
assertEquals(4, result.scoreDocs[0].doc); // doc with price: 5.0
Explanation explanation = indexSearcher.explain(joinQuery, 4);
assertTrue(explanation.isMatch());
@@ -534,7 +534,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
"join_field", fromQuery.build(), toQuery, searcher, ScoreMode.Min, ordinalMap);
TopDocs topDocs = searcher.search(joinQuery, numParents);
- assertEquals(numParents, topDocs.totalHits.value);
+ assertEquals(numParents, topDocs.totalHits.value());
for (int i = 0; i < topDocs.scoreDocs.length; i++) {
ScoreDoc scoreDoc = topDocs.scoreDocs[i];
String id = searcher.storedFields().document(scoreDoc.doc).get("id");
@@ -546,7 +546,7 @@ public class TestJoinUtil extends LuceneTestCase {
JoinUtil.createJoinQuery(
"join_field", fromQuery.build(), toQuery, searcher, ScoreMode.Max, ordinalMap);
topDocs = searcher.search(joinQuery, numParents);
- assertEquals(numParents, topDocs.totalHits.value);
+ assertEquals(numParents, topDocs.totalHits.value());
for (int i = 0; i < topDocs.scoreDocs.length; i++) {
ScoreDoc scoreDoc = topDocs.scoreDocs[i];
String id = searcher.storedFields().document(scoreDoc.doc).get("id");
@@ -805,7 +805,7 @@ public class TestJoinUtil extends LuceneTestCase {
scoreMode);
TopDocs result = indexSearcher.search(joinQuery, 10);
- assertEquals(1, result.totalHits.value);
+ assertEquals(1, result.totalHits.value());
assertEquals(0, result.scoreDocs[0].doc);
indexSearcher.getIndexReader().close();
@@ -1003,7 +1003,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.Max);
TopDocs result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(0, result.scoreDocs[0].doc);
assertEquals(3, result.scoreDocs[1].doc);
checkBoost(joinQuery, indexSearcher);
@@ -1018,7 +1018,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.Max);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(3, result.scoreDocs[0].doc);
assertEquals(0, result.scoreDocs[1].doc);
checkBoost(joinQuery, indexSearcher);
@@ -1033,7 +1033,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.Total);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(0, result.scoreDocs[0].doc);
assertEquals(3, result.scoreDocs[1].doc);
checkBoost(joinQuery, indexSearcher);
@@ -1048,7 +1048,7 @@ public class TestJoinUtil extends LuceneTestCase {
indexSearcher,
ScoreMode.Avg);
result = indexSearcher.search(joinQuery, 10);
- assertEquals(2, result.totalHits.value);
+ assertEquals(2, result.totalHits.value());
assertEquals(3, result.scoreDocs[0].doc);
assertEquals(0, result.scoreDocs[1].doc);
checkBoost(joinQuery, indexSearcher);
@@ -1597,7 +1597,7 @@ public class TestJoinUtil extends LuceneTestCase {
IndexSearcher indexSearcher,
Query joinQuery)
throws IOException {
- assertEquals(expectedTopDocs.totalHits.value, actualTopDocs.totalHits.value);
+ assertEquals(expectedTopDocs.totalHits.value(), actualTopDocs.totalHits.value());
assertEquals(expectedTopDocs.scoreDocs.length, actualTopDocs.scoreDocs.length);
if (scoreMode == ScoreMode.None) {
return;
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java
index 54b0bf01718..6fa3df2cdf9 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java
@@ -91,7 +91,7 @@ public class TestParentChildrenBlockJoinQuery extends LuceneTestCase {
ParentChildrenBlockJoinQuery parentChildrenBlockJoinQuery =
new ParentChildrenBlockJoinQuery(parentFilter, childQuery, parentScoreDoc.doc);
TopDocs topDocs = searcher.search(parentChildrenBlockJoinQuery, maxChildDocsPerParent);
- assertEquals(expectedChildDocs, topDocs.totalHits.value);
+ assertEquals(expectedChildDocs, topDocs.totalHits.value());
if (expectedChildDocs > 0) {
for (int i = 0; i < topDocs.scoreDocs.length; i++) {
ScoreDoc childScoreDoc = topDocs.scoreDocs[i];
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
index d00baa55981..8399d347d88 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
@@ -613,14 +613,14 @@ public final class SearchPanelProvider implements SearchTabOperator {
private void populateResults(SearchResults res) {
totalHitsLbl.setText(String.valueOf(res.getTotalHits()));
- if (res.getTotalHits().value > 0) {
+ if (res.getTotalHits().value() > 0) {
startLbl.setText(String.valueOf(res.getOffset() + 1));
endLbl.setText(String.valueOf(res.getOffset() + res.size()));
prevBtn.setEnabled(res.getOffset() > 0);
nextBtn.setEnabled(
- res.getTotalHits().relation == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO
- || res.getTotalHits().value > res.getOffset() + res.size());
+ res.getTotalHits().relation() == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO
+ || res.getTotalHits().value() > res.getOffset() + res.size());
if (!indexHandler.getState().readOnly() && indexHandler.getState().hasDirectoryReader()) {
delBtn.setEnabled(true);
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java
index 56a942ba6aa..3c49e215fed 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java
@@ -342,9 +342,9 @@ public final class SearchImpl extends LukeModel implements Search {
// proceed to next page
currentPage += 1;
- if (totalHits.value == 0
- || (totalHits.relation == TotalHits.Relation.EQUAL_TO
- && currentPage * (long) pageSize >= totalHits.value)) {
+ if (totalHits.value() == 0
+ || (totalHits.relation() == TotalHits.Relation.EQUAL_TO
+ && currentPage * (long) pageSize >= totalHits.value())) {
log.warning("No more next search results are available.");
return Optional.empty();
}
diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java
index 7d5a13d9cea..6a3e4dc2c22 100644
--- a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java
+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java
@@ -309,7 +309,7 @@ public class TestSearchImpl extends LuceneTestCase {
SearchResults res =
search.search(query, new SimilarityConfig.Builder().build(), null, 10, true);
- assertEquals(10, res.getTotalHits().value);
+ assertEquals(10, res.getTotalHits().value());
assertEquals(10, res.size());
assertEquals(0, res.getOffset());
}
@@ -322,7 +322,7 @@ public class TestSearchImpl extends LuceneTestCase {
SearchResults res =
search.search(query, new SimilarityConfig.Builder().build(), sort, null, 10, true);
- assertEquals(10, res.getTotalHits().value);
+ assertEquals(10, res.getTotalHits().value());
assertEquals(10, res.size());
assertEquals(0, res.getOffset());
}
@@ -336,7 +336,7 @@ public class TestSearchImpl extends LuceneTestCase {
assertTrue(opt.isPresent());
SearchResults res = opt.get();
- assertEquals(20, res.getTotalHits().value);
+ assertEquals(20, res.getTotalHits().value());
assertEquals(10, res.size());
assertEquals(10, res.getOffset());
}
@@ -366,7 +366,7 @@ public class TestSearchImpl extends LuceneTestCase {
assertTrue(opt.isPresent());
SearchResults res = opt.get();
- assertEquals(20, res.getTotalHits().value);
+ assertEquals(20, res.getTotalHits().value());
assertEquals(10, res.size());
assertEquals(0, res.getOffset());
}
diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
index 74e1d52aab8..0de8147a487 100644
--- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
+++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
@@ -235,7 +235,7 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
for (String query : queries) {
TopDocs ramDocs = ram.search(qp.parse(query), 1);
TopDocs memDocs = mem.search(qp.parse(query), 1);
- assertEquals(query, ramDocs.totalHits.value, memDocs.totalHits.value);
+ assertEquals(query, ramDocs.totalHits.value(), memDocs.totalHits.value());
}
reader.close();
}
@@ -665,7 +665,7 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
memory.addField("foo", new CannedTokenStream(new Token("", 0, 5)));
IndexSearcher searcher = memory.createSearcher();
TopDocs docs = searcher.search(new TermQuery(new Term("foo", "")), 10);
- assertEquals(1, docs.totalHits.value);
+ assertEquals(1, docs.totalHits.value());
TestUtil.checkReader(searcher.getIndexReader());
}
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java
index cca0c162113..b94960d587a 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java
@@ -87,7 +87,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "universe"));
query.add(new Term("field", "right"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("2", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(search.scoreDocs[2].doc).get("id"));
@@ -100,7 +100,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "this"));
query.add(new Term("field", "end"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 2);
+ assertEquals(search.totalHits.value(), 2);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("2", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
}
@@ -114,7 +114,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "world"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 1);
+ assertEquals(search.totalHits.value(), 1);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
}
@@ -125,7 +125,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "universe"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 1);
+ assertEquals(search.totalHits.value(), 1);
assertEquals("3", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
}
IOUtils.close(r, w, dir, analyzer);
@@ -222,7 +222,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "right"));
query.setLowFreqMinimumNumberShouldMatch(0.5f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 1);
+ assertEquals(search.totalHits.value(), 1);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
}
{
@@ -236,7 +236,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "right"));
query.setLowFreqMinimumNumberShouldMatch(2.0f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 1);
+ assertEquals(search.totalHits.value(), 1);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
}
@@ -251,7 +251,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "right"));
query.setLowFreqMinimumNumberShouldMatch(0.49f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("2", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(search.scoreDocs[2].doc).get("id"));
@@ -268,7 +268,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "right"));
query.setLowFreqMinimumNumberShouldMatch(1.0f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("2", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(search.scoreDocs[2].doc).get("id"));
@@ -287,7 +287,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.setLowFreqMinimumNumberShouldMatch(1.0f);
query.setHighFreqMinimumNumberShouldMatch(4.0f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals(search.scoreDocs[1].score, search.scoreDocs[2].score, 0.0f);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
// doc 2 and 3 only get a score from low freq terms
@@ -309,7 +309,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.setLowFreqMinimumNumberShouldMatch(1.0f);
query.setHighFreqMinimumNumberShouldMatch(2.0f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 4);
+ assertEquals(search.totalHits.value(), 4);
}
{
@@ -322,7 +322,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.setLowFreqMinimumNumberShouldMatch(1.0f);
query.setHighFreqMinimumNumberShouldMatch(2.0f);
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 2);
+ assertEquals(search.totalHits.value(), 2);
assertEquals(
new HashSet<>(Arrays.asList("0", "2")),
new HashSet<>(
@@ -384,7 +384,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "universe"));
query.add(new Term("field", "right"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals("0", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("2", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
assertEquals("3", r.storedFields().document(search.scoreDocs[2].doc).get("id"));
@@ -402,7 +402,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
query.add(new Term("field", "universe"));
query.add(new Term("field", "right"));
TopDocs search = s.search(query, 10);
- assertEquals(search.totalHits.value, 3);
+ assertEquals(search.totalHits.value(), 3);
assertEquals("2", r.storedFields().document(search.scoreDocs[0].doc).get("id"));
assertEquals("3", r.storedFields().document(search.scoreDocs[1].doc).get("id"));
assertEquals("0", r.storedFields().document(search.scoreDocs[2].doc).get("id"));
@@ -481,7 +481,7 @@ public class TestCommonTermsQuery extends LuceneTestCase {
TopDocs cqSearch = searcher.search(cq, reader.maxDoc());
TopDocs verifySearch = searcher.search(verifyQuery.build(), reader.maxDoc());
- assertEquals(verifySearch.totalHits.value, cqSearch.totalHits.value);
+ assertEquals(verifySearch.totalHits.value(), cqSearch.totalHits.value());
Set<Integer> hits = new HashSet<>();
for (ScoreDoc doc : verifySearch.scoreDocs) {
hits.add(doc.doc);
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
index 664e759a9ee..44ef9ed0351 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
@@ -122,7 +122,7 @@ public class TestFieldScoreQuery extends FunctionTestSetup {
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = newSearcher(r);
TopDocs td = s.search(functionQuery, 1000);
- assertEquals("All docs should be matched!", N_DOCS, td.totalHits.value);
+ assertEquals("All docs should be matched!", N_DOCS, td.totalHits.value());
ScoreDoc[] sd = td.scoreDocs;
for (ScoreDoc aSd : sd) {
float score = aSd.score;
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java
index 793bcc256fe..d05c6e2d41d 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java
@@ -54,7 +54,7 @@ public class TestFunctionMatchQuery extends FunctionTestSetup {
FunctionMatchQuery fmq = new FunctionMatchQuery(in, d -> d >= 2 && d < 4);
TopDocs docs = searcher.search(fmq, 10);
- assertEquals(2, docs.totalHits.value);
+ assertEquals(2, docs.totalHits.value());
assertEquals(9, docs.scoreDocs[0].doc);
assertEquals(13, docs.scoreDocs[1].doc);
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 d74c3823e9d..85bcc05cbf7 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
@@ -153,7 +153,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
int[] expectedDocs = new int[] {4, 7, 9};
TopDocs docs = searcher.search(q, 4);
- assertEquals(expectedDocs.length, docs.totalHits.value);
+ assertEquals(expectedDocs.length, docs.totalHits.value());
for (int i = 0; i < expectedDocs.length; i++) {
assertEquals(docs.scoreDocs[i].doc, expectedDocs[i]);
}
@@ -176,7 +176,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
int[] expectedDocs = new int[] {4, 7, 9, 8, 12};
TopDocs docs = searcher.search(fq, 5);
- assertEquals(plain.totalHits.value, docs.totalHits.value);
+ assertEquals(plain.totalHits.value(), docs.totalHits.value());
for (int i = 0; i < expectedDocs.length; i++) {
assertEquals(expectedDocs[i], docs.scoreDocs[i].doc);
}
@@ -199,7 +199,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
int[] expectedDocs = new int[] {6, 1, 0, 2, 8};
TopDocs docs = searcher.search(fq, 20);
- assertEquals(plain.totalHits.value, docs.totalHits.value);
+ assertEquals(plain.totalHits.value(), docs.totalHits.value());
for (int i = 0; i < expectedDocs.length; i++) {
assertEquals(expectedDocs[i], docs.scoreDocs[i].doc);
}
@@ -223,7 +223,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
Query boosted = new BoostQuery(q1, 2);
TopDocs afterboost = searcher.search(boosted, 5);
- assertEquals(plain.totalHits.value, afterboost.totalHits.value);
+ assertEquals(plain.totalHits.value(), afterboost.totalHits.value());
for (int i = 0; i < 5; i++) {
assertEquals(plain.scoreDocs[i].doc, afterboost.scoreDocs[i].doc);
assertEquals(plain.scoreDocs[i].score, afterboost.scoreDocs[i].score / 2, 0.0001);
@@ -358,7 +358,7 @@ public class TestFunctionScoreQuery extends FunctionTestSetup {
q, new PhraseQuery(1, "ExampleText", "function", "plot"), 2);
q = FunctionScoreQuery.boostByValue(q, DoubleValuesSource.SCORES);
- assertEquals(1, new IndexSearcher(reader).search(q, 10).totalHits.value);
+ assertEquals(1, new IndexSearcher(reader).search(q, 10).totalHits.value());
}
}
}
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
index 71228e4178f..af2ec0230c2 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java
@@ -388,7 +388,7 @@ public class TestIntervalQuery extends LuceneTestCase {
Query q = new IntervalQuery(field, source);
TopDocs td = searcher.search(q, 10);
- assertEquals(5, td.totalHits.value);
+ assertEquals(5, td.totalHits.value());
assertEquals(1, td.scoreDocs[0].doc);
assertEquals(3, td.scoreDocs[1].doc);
assertEquals(0, td.scoreDocs[2].doc);
@@ -397,7 +397,7 @@ public class TestIntervalQuery extends LuceneTestCase {
Query boostQ = new BoostQuery(q, 2);
TopDocs boostTD = searcher.search(boostQ, 10);
- assertEquals(5, boostTD.totalHits.value);
+ assertEquals(5, boostTD.totalHits.value());
for (int i = 0; i < 5; i++) {
assertEquals(td.scoreDocs[i].score * 2, boostTD.scoreDocs[i].score, 0);
}
@@ -405,7 +405,7 @@ public class TestIntervalQuery extends LuceneTestCase {
// change the pivot - order should remain the same
Query q1 = new IntervalQuery(field, source, 2);
TopDocs td1 = searcher.search(q1, 10);
- assertEquals(5, td1.totalHits.value);
+ assertEquals(5, td1.totalHits.value());
assertEquals(0.5f, td1.scoreDocs[0].score, 0); // freq=pivot
for (int i = 0; i < 5; i++) {
assertEquals(td.scoreDocs[i].doc, td1.scoreDocs[i].doc);
@@ -414,7 +414,7 @@ public class TestIntervalQuery extends LuceneTestCase {
// increase the exp, docs higher than pivot should get a higher score, and vice versa
Query q2 = new IntervalQuery(field, source, 1.2f, 2f);
TopDocs td2 = searcher.search(q2, 10);
- assertEquals(5, td2.totalHits.value);
+ assertEquals(5, td2.totalHits.value());
for (int i = 0; i < 5; i++) {
assertEquals(td.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (i < 2) {
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
index de2d6b5d9f9..74694956462 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
@@ -162,7 +162,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue(
- "hits Size: " + hits.totalHits.value + " is not: " + 100, hits.totalHits.value == 100);
+ "hits Size: " + hits.totalHits.value() + " is not: " + 100, hits.totalHits.value() == 100);
// they should all have the exact same score, because they all contain seventy once, and we set
// all the other similarity factors to be 1
@@ -216,7 +216,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue(
- "hits Size: " + hits.totalHits.value + " is not: " + 100, hits.totalHits.value == 100);
+ "hits Size: " + hits.totalHits.value() + " is not: " + 100, hits.totalHits.value() == 100);
// they should all have the exact same score, because they all contain seventy once, and we set
// all the other similarity factors to be 1
@@ -260,7 +260,8 @@ public class TestPayloadTermQuery extends LuceneTestCase {
PayloadDecoder.FLOAT_DECODER);
TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null);
- assertTrue("hits Size: " + hits.totalHits.value + " is not: " + 0, hits.totalHits.value == 0);
+ assertTrue(
+ "hits Size: " + hits.totalHits.value() + " is not: " + 0, hits.totalHits.value() == 0);
}
public void testNoPayload() throws Exception {
@@ -281,7 +282,8 @@ public class TestPayloadTermQuery extends LuceneTestCase {
query.add(c2);
TopDocs hits = searcher.search(query.build(), 100);
assertTrue("hits is null and it shouldn't be", hits != null);
- assertTrue("hits Size: " + hits.totalHits.value + " is not: " + 1, hits.totalHits.value == 1);
+ assertTrue(
+ "hits Size: " + hits.totalHits.value() + " is not: " + 1, hits.totalHits.value() == 1);
int[] results = new int[1];
results[0] = 0; // hits.scoreDocs[0].doc;
CheckHits.checkHitCollector(
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java
index f01732458b2..b95c682d655 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java
@@ -66,7 +66,7 @@ public class TestQueryRescorerWithSpans extends LuceneTestCase {
IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -78,7 +78,7 @@ public class TestQueryRescorerWithSpans extends LuceneTestCase {
TopDocs hits3 = QueryRescorer.rescore(searcher, hits, snq, 2.0, 10);
// Resorting changed the order:
- assertEquals(2, hits3.totalHits.value);
+ assertEquals(2, hits3.totalHits.value());
assertEquals("1", searcher.storedFields().document(hits3.scoreDocs[0].doc).get("id"));
assertEquals("0", searcher.storedFields().document(hits3.scoreDocs[1].doc).get("id"));
@@ -109,7 +109,7 @@ public class TestQueryRescorerWithSpans extends LuceneTestCase {
IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq.build(), 10);
- assertEquals(2, hits.totalHits.value);
+ assertEquals(2, hits.totalHits.value());
assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id"));
assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id"));
@@ -121,7 +121,7 @@ public class TestQueryRescorerWithSpans extends LuceneTestCase {
TopDocs hits3 = QueryRescorer.rescore(searcher, hits, snq, 2.0, 10);
// Resorting changed the order:
- assertEquals(2, hits3.totalHits.value);
+ assertEquals(2, hits3.totalHits.value());
assertEquals("1", searcher.storedFields().document(hits3.scoreDocs[0].doc).get("id"));
assertEquals("0", searcher.storedFields().document(hits3.scoreDocs[1].doc).get("id"));
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java
index 20d563171dd..64d1f66f5e1 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java
@@ -54,12 +54,12 @@ public class TestSpanFirstQuery extends LuceneTestCase {
// user queries on "starts-with quick"
SpanQuery sfq = spanFirstQuery(spanTermQuery("field", "quick"), 1);
- assertEquals(1, searcher.search(sfq, 10).totalHits.value);
+ assertEquals(1, searcher.search(sfq, 10).totalHits.value());
// user queries on "starts-with the quick"
SpanQuery include = spanFirstQuery(spanTermQuery("field", "quick"), 2);
sfq = spanNotQuery(include, sfq);
- assertEquals(1, searcher.search(sfq, 10).totalHits.value);
+ assertEquals(1, searcher.search(sfq, 10).totalHits.value());
writer.close();
reader.close();
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java
index 06b8da14a26..d07c20c28cc 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java
@@ -155,7 +155,7 @@ public class TestSpanSimilarity extends LuceneTestCase {
SpanTermQuery s2 = new SpanTermQuery(new Term("foo", "baz"));
Query query = new SpanOrQuery(s1, s2);
TopDocs td = is.search(query, 10);
- assertEquals(1, td.totalHits.value);
+ assertEquals(1, td.totalHits.value());
float score = td.scoreDocs[0].score;
assertFalse("negative score for " + sim, score < 0.0f);
assertFalse("inf score for " + sim, Float.isInfinite(score));
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java
index 359c31709db..00d6c602f62 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java
@@ -349,14 +349,15 @@ public class TestSpans extends LuceneTestCase {
// This throws exception (it shouldn't)
assertEquals(
1,
- searcher.search(
+ searcher
+ .search(
createSpan(
0,
true,
new SpanQuery[] {createSpan(4, false, "chased", "cat"), createSpan("ate")}),
10)
.totalHits
- .value);
+ .value());
reader.close();
dir.close();
}
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 ceba4137ef0..2c8308ee440 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
@@ -1329,7 +1329,7 @@ public class TestQPHelper extends LuceneTestCase {
Query q = new StandardQueryParser(new CannedAnalyzer()).parse("\"a\"", "field");
assertTrue(q instanceof MultiPhraseQuery);
- assertEquals(1, s.search(q, 10).totalHits.value);
+ assertEquals(1, s.search(q, 10).totalHits.value());
r.close();
w.close();
dir.close();
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 b55006ec94d..5aaa35b4c20 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
@@ -1207,7 +1207,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
IndexSearcher s = newSearcher(r);
Query q = getQuery("\"wizard of ozzy\"", a);
- assertEquals(1, s.search(q, 1).totalHits.value);
+ assertEquals(1, s.search(q, 1).totalHits.value());
r.close();
dir.close();
}
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
index 3aa20b57b77..dbd3bcde054 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java
@@ -130,7 +130,7 @@ public class TestCoreParser extends LuceneTestCase {
public void testCustomFieldUserQueryXML() throws ParserException, IOException {
Query q = parse("UserInputQueryCustomField.xml");
- long h = searcher().search(q, 1000).totalHits.value;
+ long h = searcher().search(q, 1000).totalHits.value();
assertEquals("UserInputQueryCustomField should produce 0 result ", 0, h);
}
@@ -149,7 +149,7 @@ public class TestCoreParser extends LuceneTestCase {
public void testSpanPositionRangeQueryXML() throws Exception {
Query q = parse("SpanPositionRangeQuery.xml");
- long h = searcher().search(q, 10).totalHits.value;
+ long h = searcher().search(q, 10).totalHits.value();
assertEquals("SpanPositionRangeQuery should produce 2 result ", 2, h);
SpanQuery sq = parseAsSpan("SpanPositionRangeQuery.xml");
dumpResults("SpanPositionRangeQuery", sq, 5);
@@ -323,7 +323,7 @@ public class TestCoreParser extends LuceneTestCase {
}
final IndexSearcher searcher = searcher();
TopDocs hits = searcher.search(q, numDocs);
- final boolean producedResults = (hits.totalHits.value > 0);
+ final boolean producedResults = (hits.totalHits.value() > 0);
if (!producedResults) {
System.out.println(
"TEST: qType="
@@ -338,7 +338,7 @@ public class TestCoreParser extends LuceneTestCase {
if (VERBOSE) {
ScoreDoc[] scoreDocs = hits.scoreDocs;
StoredFields storedFields = searcher.storedFields();
- for (int i = 0; i < Math.min(numDocs, hits.totalHits.value); i++) {
+ for (int i = 0; i < Math.min(numDocs, hits.totalHits.value()); i++) {
Document ldoc = storedFields.document(scoreDocs[i].doc);
System.out.println("[" + ldoc.get("date") + "]" + ldoc.get("contents"));
}
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 1793694a95b..94b3281847e 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
@@ -539,7 +539,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
DrillDownQuery ddq = new DrillDownQuery(config);
ds.search(ddq, collectorManager, List.of());
- // assertEquals(100, dsr.hits.totalHits.value);
+ // assertEquals(100, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=-2147483648 childCount=2\n b (75)\n a (25)\n",
getTopChildrenByCount(dimCountRecorder, tr, 10, "dim").toString());
@@ -557,7 +557,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
ddq.add("dim", "b");
ds.search(ddq, fieldCollectorManager, List.of(dimCollectorManager));
- // assertEquals(75, dsr.hits.totalHits.value);
+ // assertEquals(75, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=-2147483648 childCount=2\n b (75)\n a (25)\n",
getTopChildrenByCount(dimCountRecorder, tr, 10, "dim").toString());
@@ -575,7 +575,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
ddq.add("field", LongPoint.newRangeQuery("field", 0L, 10L));
ds.search(ddq, dimCollectorManager, List.of(fieldCollectorManager));
- // assertEquals(11, dsr.hits.totalHits.value);
+ // assertEquals(11, dsr.hits.totalHits.value());
assertEquals(
"dim=dim path=[] value=-2147483648 childCount=2\n b (8)\n a (3)\n",
getTopChildrenByCount(dimCountRecorder, tr, 10, "dim").toString());
@@ -1609,7 +1609,7 @@ public class TestRangeFacet extends SandboxFacetTestCase {
}
// Test simple drill-down:
- assertEquals(1, s.search(ddq, 10).totalHits.value);
+ assertEquals(1, s.search(ddq, 10).totalHits.value());
// Test drill-sideways after drill-down
DrillSideways ds =
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 c2e6eefd533..4b0f17dc59c 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
@@ -504,7 +504,7 @@ public class TestCombinedFieldQuery extends LuceneTestCase {
new TopScoreDocCollectorManager(numHits, Integer.MAX_VALUE);
TopDocs firstTopDocs = searcher.search(firstQuery, collectorManager);
- assertEquals(numHits, firstTopDocs.totalHits.value);
+ assertEquals(numHits, firstTopDocs.totalHits.value());
collectorManager = new TopScoreDocCollectorManager(numHits, Integer.MAX_VALUE);
TopDocs secondTopDocs = searcher.search(secondQuery, collectorManager);
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
index 3edc18b16a0..d7088b3f6da 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java
@@ -242,7 +242,7 @@ public class TestCoveringQuery extends LuceneTestCase {
final int maxDoc = searcher.getIndexReader().maxDoc();
final TopDocs td1 = searcher.search(q1, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
final TopDocs td2 = searcher.search(q2, maxDoc, scores ? Sort.RELEVANCE : Sort.INDEXORDER);
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
if (scores) {
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 42cd7e71b6b..4ff1547fa6b 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
@@ -89,7 +89,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
TopDocs topDocs = searcher.search(testQuery, regularCollectorManager);
- assertEquals(largeCollector.totalHits, topDocs.totalHits.value);
+ assertEquals(largeCollector.totalHits, topDocs.totalHits.value());
IllegalArgumentException expected =
expectThrows(
@@ -110,7 +110,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
TopDocs topDocs = searcher.search(testQuery, regularCollectorManager);
- assertEquals(largeCollector.totalHits, topDocs.totalHits.value);
+ assertEquals(largeCollector.totalHits, topDocs.totalHits.value());
assertNull(largeCollector.pq);
assertNull(largeCollector.pqTop);
@@ -125,7 +125,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
TopDocs topDocs = searcher.search(testQuery, regularCollectorManager);
- assertEquals(largeCollector.totalHits, topDocs.totalHits.value);
+ assertEquals(largeCollector.totalHits, topDocs.totalHits.value());
assertNotNull(largeCollector.pq);
assertNotNull(largeCollector.pqTop);
@@ -140,7 +140,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
searcher.search(testQuery, largeCollector);
TopDocs topDocs = searcher.search(testQuery, regularCollectorManager);
- assertEquals(largeCollector.totalHits, topDocs.totalHits.value);
+ assertEquals(largeCollector.totalHits, topDocs.totalHits.value());
assertNull(largeCollector.pq);
assertNull(largeCollector.pqTop);
@@ -167,7 +167,7 @@ public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase {
TopDocs firstTopDocs = largeCollector.topDocs();
TopDocs secondTopDocs = searcher.search(testQuery, regularCollectorManager);
- assertEquals(largeCollector.totalHits, secondTopDocs.totalHits.value);
+ assertEquals(largeCollector.totalHits, secondTopDocs.totalHits.value());
assertEquals(firstTopDocs.scoreDocs.length, secondTopDocs.scoreDocs.length);
CheckHits.checkEqual(testQuery, firstTopDocs.scoreDocs, secondTopDocs.scoreDocs);
}
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
index 937bad87b43..80bebc00452 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java
@@ -102,7 +102,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "sun");
q.finish();
- assertEquals(1, s.search(q, 1).totalHits.value);
+ assertEquals(1, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -135,7 +135,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "moon");
q.finish();
- assertEquals(2, s.search(q, 1).totalHits.value);
+ assertEquals(2, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -172,7 +172,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "sun");
q.finish();
- assertEquals(2, s.search(q, 1).totalHits.value);
+ assertEquals(2, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -228,7 +228,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
// System.out.println("DOT:\n" + q.toDot());
- assertEquals(4, s.search(q, 1).totalHits.value);
+ assertEquals(4, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -273,7 +273,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
TermAutomatonQuery q = new TokenStreamToTermAutomatonQuery().toQuery("field", ts);
// System.out.println("DOT: " + q.toDot());
- assertEquals(4, s.search(q, 1).totalHits.value);
+ assertEquals(4, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -306,7 +306,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "moon");
q.finish();
- assertEquals(2, s.search(q, 1).totalHits.value);
+ assertEquals(2, s.search(q, 1).totalHits.value());
w.close();
r.close();
dir.close();
@@ -367,7 +367,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
TermAutomatonQuery q = new TokenStreamToTermAutomatonQuery().toQuery("field", ts);
// System.out.println("DOT: " + q.toDot());
- assertEquals(3, s.search(q, 1).totalHits.value);
+ assertEquals(3, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -552,7 +552,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
Set<String> hits2Docs = toDocIDs(s, hits2);
try {
- assertEquals(hits2.totalHits.value, hits1.totalHits.value);
+ assertEquals(hits2.totalHits.value(), hits1.totalHits.value());
assertEquals(hits2Docs, hits1Docs);
} catch (AssertionError ae) {
System.out.println("FAILED:");
@@ -668,7 +668,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.setAccept(s1, true);
q.finish();
- assertEquals(1, s.search(q, 1).totalHits.value);
+ assertEquals(1, s.search(q, 1).totalHits.value());
w.close();
r.close();
dir.close();
@@ -703,7 +703,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.setAccept(s4, true);
q.finish();
- assertEquals(1, s.search(q, 1).totalHits.value);
+ assertEquals(1, s.search(q, 1).totalHits.value());
w.close();
r.close();
dir.close();
@@ -723,7 +723,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
TermAutomatonQuery q = new TokenStreamToTermAutomatonQuery().toQuery("field", ts);
// System.out.println("DOT: " + q.toDot());
- assertEquals(0, s.search(q, 1).totalHits.value);
+ assertEquals(0, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -744,7 +744,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
TermAutomatonQuery q = new TokenStreamToTermAutomatonQuery().toQuery("field", ts);
// System.out.println("DOT: " + q.toDot());
- assertEquals(0, s.search(q, 1).totalHits.value);
+ assertEquals(0, s.search(q, 1).totalHits.value());
IOUtils.close(w, r, dir);
}
@@ -860,7 +860,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
assertTrue(rewrittenQuery instanceof TermAutomatonQuery);
TopDocs topDocs = searcher.search(rewrittenQuery, 10);
- assertEquals(0, topDocs.totalHits.value);
+ assertEquals(0, topDocs.totalHits.value());
Explanation explanation = searcher.explain(rewrittenQuery, 0);
assertFalse("Explanation should indicate no match", explanation.isMatch());
@@ -903,7 +903,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
"Rewritten query should be an instance of TermAutomatonQuery",
rewrittenQuery instanceof TermAutomatonQuery);
TopDocs topDocs = searcher.search(q, 10);
- assertEquals(2, topDocs.totalHits.value);
+ assertEquals(2, topDocs.totalHits.value());
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
Explanation explanation = searcher.explain(q, scoreDoc.doc);
@@ -1038,7 +1038,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "moon");
q.finish();
- assertEquals(1, s.search(q, 1).totalHits.value);
+ assertEquals(1, s.search(q, 1).totalHits.value());
w.close();
r.close();
@@ -1068,7 +1068,7 @@ public class TestTermAutomatonQuery extends LuceneTestCase {
q.addTransition(s2, s3, "moon");
q.finish();
- assertEquals(0, s.search(q, 1).totalHits.value);
+ assertEquals(0, s.search(q, 1).totalHits.value());
w.close();
r.close();
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
index cf8fc8b57d7..74a01262868 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
@@ -113,7 +113,7 @@ public abstract class SpatialTestCase extends LuceneTestCase {
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
results.add(new SearchResult(scoreDoc.score, storedFields.document(scoreDoc.doc)));
}
- return new SearchResults(topDocs.totalHits.value, results);
+ return new SearchResults(topDocs.totalHits.value(), results);
} catch (IOException ioe) {
throw new RuntimeException("IOException thrown while executing query", ioe);
}
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 fd0a81105c5..aadaff32ee0 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
@@ -197,8 +197,8 @@ public class TestSpatialExample extends LuceneTestCase {
private void assertDocMatchedIds(IndexSearcher indexSearcher, TopDocs docs, int... ids)
throws IOException {
- assert docs.totalHits.relation == Relation.EQUAL_TO;
- int[] gotIds = new int[Math.toIntExact(docs.totalHits.value)];
+ assert docs.totalHits.relation() == Relation.EQUAL_TO;
+ int[] gotIds = new int[Math.toIntExact(docs.totalHits.value())];
for (int i = 0; i < gotIds.length; i++) {
gotIds[i] =
indexSearcher
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java
index ea0bfa2fb90..6298277fcb4 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java
@@ -119,6 +119,6 @@ public class TestJtsPolygon extends StrategyTestCase {
System.out.println(indexSearcher.storedFields().document(scoreDoc.doc));
}
- assertEquals(1, search.totalHits.value);
+ assertEquals(1, search.totalHits.value());
}
}
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java
index cf939cf54ff..9fcd5df0b97 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java
@@ -110,6 +110,6 @@ public class TestSpatialPrefixTree extends SpatialTestCase {
System.out.println(indexSearcher.storedFields().document(scoreDoc.doc));
}
- assertEquals(1, search.totalHits.value);
+ assertEquals(1, search.totalHits.value());
}
}
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
index 4453af9d1cc..796979195aa 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
@@ -143,7 +143,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
planetModel, toRadians(50), toRadians(-97), Math.PI / 180.)),
1)
.totalHits
- .value);
+ .value());
w.close();
r.close();
dir.close();
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java
index cb2ffc4b608..6670a0b7853 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java
@@ -193,7 +193,7 @@ public class TestPrefixCompletionQuery extends LuceneTestCase {
// if at most half of the top scoring documents have been filtered out
// the search should be admissible for a single segment
TopSuggestDocs suggest = indexSearcher.suggest(query, num, false);
- assertTrue(suggest.totalHits.value >= 1);
+ assertTrue(suggest.totalHits.value() >= 1);
assertEquals("abc_" + topScore, suggest.scoreLookupDocs()[0].key.toString());
assertEquals((float) topScore, suggest.scoreLookupDocs()[0].score, 0);
@@ -481,7 +481,7 @@ public class TestPrefixCompletionQuery extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", "app"));
- assertEquals(0, indexSearcher.suggest(query, 3, false).totalHits.value);
+ assertEquals(0, indexSearcher.suggest(query, 3, false).totalHits.value());
query = new PrefixCompletionQuery(analyzer, new Term("suggest_field2", "app"));
assertSuggestions(indexSearcher.suggest(query, 3, false), new Entry("apples", 3));
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java
index 2d6e9471c98..410c6e76b4e 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java
@@ -138,7 +138,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", "ab"));
TopSuggestDocs lookupDocs = suggestIndexSearcher.suggest(query, 3, false);
- assertEquals(0L, lookupDocs.totalHits.value);
+ assertEquals(0L, lookupDocs.totalHits.value());
reader.close();
iw.close();
}
@@ -510,7 +510,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", "abc_"), filter);
TopSuggestDocs suggest = indexSearcher.suggest(query, num, false);
- assertEquals(0L, suggest.totalHits.value);
+ assertEquals(0L, suggest.totalHits.value());
reader.close();
iw.close();
}
@@ -539,7 +539,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", "abc_"));
TopSuggestDocs suggest = indexSearcher.suggest(query, num, false);
- assertEquals(0L, suggest.totalHits.value);
+ assertEquals(0L, suggest.totalHits.value());
reader.close();
iw.close();
@@ -702,7 +702,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", "abc_"));
TopSuggestDocs suggest = indexSearcher.suggest(query, num, false);
- assertEquals(num, suggest.totalHits.value);
+ assertEquals(num, suggest.totalHits.value());
StoredFields storedFields = reader.storedFields();
for (SuggestScoreDoc suggestScoreDoc : suggest.scoreLookupDocs()) {
String key = suggestScoreDoc.key.toString();
@@ -745,7 +745,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", prefix));
TopSuggestDocs suggest = indexSearcher.suggest(query, num, false);
- assertTrue(suggest.totalHits.value > 0);
+ assertTrue(suggest.totalHits.value() > 0);
float topScore = -1;
for (SuggestScoreDoc scoreDoc : suggest.scoreLookupDocs()) {
if (topScore != -1) {
@@ -798,7 +798,7 @@ public class TestSuggestField extends LuceneTestCase {
PrefixCompletionQuery query =
new PrefixCompletionQuery(analyzer, new Term("suggest_field", title));
TopSuggestDocs suggest = indexSearcher.suggest(query, mappings.size(), false);
- assertTrue(suggest.totalHits.value > 0);
+ assertTrue(suggest.totalHits.value() > 0);
boolean matched = false;
for (ScoreDoc scoreDoc : suggest.scoreDocs) {
matched = Float.compare(scoreDoc.score, (float) entry.getValue()) == 0;
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
index 5c0c134fef3..6861188f699 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
@@ -1643,18 +1643,18 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
public void testSmallSetRect() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", 32.778, 32.779, -96.778, -96.777), 5);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
}
public void testSmallSetDateline() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", -45.0, -44.0, 179.0, -179.0), 20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
public void testSmallSetMultiValued() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", 32.755, 32.776, -96.454, -96.770), 20);
// 3 single valued docs + 2 multi-valued docs
- assertEquals(5, td.totalHits.value);
+ assertEquals(5, td.totalHits.value());
}
public void testSmallSetWholeMap() throws Exception {
@@ -1667,7 +1667,7 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
GeoUtils.MIN_LON_INCL,
GeoUtils.MAX_LON_INCL),
20);
- assertEquals(24, td.totalHits.value);
+ assertEquals(24, td.totalHits.value());
}
public void testSmallSetPoly() throws Exception {
@@ -1691,7 +1691,7 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
-96.6041564, -96.7449188, -96.76826477, -96.7682647
})),
5);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
public void testSmallSetPolyWholeMap() throws Exception {
@@ -1715,18 +1715,18 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
GeoUtils.MIN_LON_INCL
})),
20);
- assertEquals("testWholeMap failed", 24, td.totalHits.value);
+ assertEquals("testWholeMap failed", 24, td.totalHits.value());
}
public void testSmallSetDistance() throws Exception {
TopDocs td =
searchSmallSet(newDistanceQuery("point", 32.94823588839368, -96.4538113027811, 6000), 20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
public void testSmallSetTinyDistance() throws Exception {
TopDocs td = searchSmallSet(newDistanceQuery("point", 40.720611, -73.998776, 1), 20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
/** see https://issues.apache.org/jira/browse/LUCENE-6905 */
@@ -1735,7 +1735,7 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
searchSmallSet(
newDistanceQuery("point", -88.56029371730983, -177.23537676036358, 7757.999232959935),
20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
/** Explicitly large */
@@ -1743,14 +1743,14 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
TopDocs td =
searchSmallSet(
newDistanceQuery("point", 32.94823588839368, -96.4538113027811, 6000000), 20);
- assertEquals(16, td.totalHits.value);
+ assertEquals(16, td.totalHits.value());
}
public void testSmallSetDistanceDateline() throws Exception {
TopDocs td =
searchSmallSet(
newDistanceQuery("point", 32.94823588839368, -179.9538113027811, 120000), 20);
- assertEquals(3, td.totalHits.value);
+ assertEquals(3, td.totalHits.value());
}
public void testNarrowPolygonCloseToNorthPole() throws Exception {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java
index 3a733b5462f..d9deb9fbeed 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java
@@ -1475,18 +1475,18 @@ public abstract class BaseXYPointTestCase extends LuceneTestCase {
public void testSmallSetRect() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", 32.778f, 32.779f, -96.778f, -96.777f), 5);
- assertEquals(4, td.totalHits.value);
+ assertEquals(4, td.totalHits.value());
}
public void testSmallSetRect2() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", -45.0f, -44.0f, -180.0f, 180.0f), 20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
public void testSmallSetMultiValued() throws Exception {
TopDocs td = searchSmallSet(newRectQuery("point", 32.755f, 32.776f, -180f, 180.770f), 20);
// 3 single valued docs + 2 multi-valued docs
- assertEquals(5, td.totalHits.value);
+ assertEquals(5, td.totalHits.value());
}
public void testSmallSetWholeSpace() throws Exception {
@@ -1495,7 +1495,7 @@ public abstract class BaseXYPointTestCase extends LuceneTestCase {
newRectQuery(
"point", -Float.MAX_VALUE, Float.MAX_VALUE, -Float.MAX_VALUE, Float.MAX_VALUE),
20);
- assertEquals(24, td.totalHits.value);
+ assertEquals(24, td.totalHits.value());
}
public void testSmallSetPoly() throws Exception {
@@ -1525,7 +1525,7 @@ public abstract class BaseXYPointTestCase extends LuceneTestCase {
-96.7682647f
})),
5);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
public void testSmallSetPolyWholeSpace() throws Exception {
@@ -1549,18 +1549,18 @@ public abstract class BaseXYPointTestCase extends LuceneTestCase {
-Float.MAX_VALUE
})),
20);
- assertEquals("testWholeMap failed", 24, td.totalHits.value);
+ assertEquals("testWholeMap failed", 24, td.totalHits.value());
}
public void testSmallSetDistance() throws Exception {
TopDocs td =
searchSmallSet(newDistanceQuery("point", 32.94823588839368f, -96.4538113027811f, 6.0f), 20);
- assertEquals(11, td.totalHits.value);
+ assertEquals(11, td.totalHits.value());
}
public void testSmallSetTinyDistance() throws Exception {
TopDocs td = searchSmallSet(newDistanceQuery("point", 40.720611f, -73.998776f, 0.1f), 20);
- assertEquals(2, td.totalHits.value);
+ assertEquals(2, td.totalHits.value());
}
/** Explicitly large */
@@ -1568,6 +1568,6 @@ public abstract class BaseXYPointTestCase extends LuceneTestCase {
TopDocs td =
searchSmallSet(
newDistanceQuery("point", 32.94823588839368f, -96.4538113027811f, Float.MAX_VALUE), 20);
- assertEquals(24, td.totalHits.value);
+ assertEquals(24, td.totalHits.value());
}
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
index bb141039f55..8b7f538de00 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
@@ -1331,8 +1331,8 @@ public abstract class BaseKnnVectorsFormatTestCase extends BaseIndexFileFormatTe
ctx.reader()
.searchNearestVectors(
fieldName, randomNormalizedVector(dimension), k, liveDocs, visitedLimit);
- assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, results.totalHits.relation);
- assertEquals(visitedLimit, results.totalHits.value);
+ assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, results.totalHits.relation());
+ assertEquals(visitedLimit, results.totalHits.value());
// check the limit is not hit when it clearly exceeds the number of vectors
k = vectorValues.size();
@@ -1341,8 +1341,8 @@ public abstract class BaseKnnVectorsFormatTestCase extends BaseIndexFileFormatTe
ctx.reader()
.searchNearestVectors(
fieldName, randomNormalizedVector(dimension), k, liveDocs, visitedLimit);
- assertEquals(TotalHits.Relation.EQUAL_TO, results.totalHits.relation);
- assertTrue(results.totalHits.value <= visitedLimit);
+ assertEquals(TotalHits.Relation.EQUAL_TO, results.totalHits.relation());
+ assertTrue(results.totalHits.value() <= visitedLimit);
}
}
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java
index 63aa50bf713..84fdcde8173 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java
@@ -177,7 +177,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
System.out.println("TEST: test id=" + testID);
}
TopDocs hits = s.search(new TermQuery(new Term("id", testID)), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
Document doc = storedFields.document(hits.scoreDocs[0].doc);
Document docExp = docs.get(testID);
for (int i = 0; i < fieldCount; i++) {
@@ -471,9 +471,9 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
try {
StoredFields storedFields = rd.storedFields();
final TopDocs topDocs = searcher.search(query, 1);
- if (topDocs.totalHits.value != 1) {
+ if (topDocs.totalHits.value() != 1) {
throw new IllegalStateException(
- "Expected 1 hit, got " + topDocs.totalHits.value);
+ "Expected 1 hit, got " + topDocs.totalHits.value());
}
final Document sdoc = storedFields.document(topDocs.scoreDocs[0].doc);
if (sdoc == null || sdoc.get("fld") == null) {
@@ -783,7 +783,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
for (int i = 0; i < numDocs; ++i) {
final Query query = new TermQuery(new Term("id", "" + i));
final TopDocs topDocs = searcher.search(query, 1);
- assertEquals("" + i, 1, topDocs.totalHits.value);
+ assertEquals("" + i, 1, topDocs.totalHits.value());
final Document doc = storedFields.document(topDocs.scoreDocs[0].doc);
assertNotNull(doc);
final IndexableField[] fieldValues = doc.getFields("fld");
@@ -943,7 +943,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
System.out.println("TEST: test id=" + testID);
}
TopDocs hits = searcher.search(new TermQuery(new Term("id", testID)), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
List<IndexableField> expectedFields =
docs.get(testID).getFields().stream()
.filter(f -> f.fieldType().stored())
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/LegacyBaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/LegacyBaseDocValuesFormatTestCase.java
index 2e797c2ced4..a77050a981c 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/LegacyBaseDocValuesFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/LegacyBaseDocValuesFormatTestCase.java
@@ -145,7 +145,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
Document hitDoc = storedFields.document(hits.scoreDocs[i].doc);
@@ -182,7 +182,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int docID = hits.scoreDocs[i].doc;
@@ -221,7 +221,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int docID = hits.scoreDocs[i].doc;
@@ -262,7 +262,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int hitDocID = hits.scoreDocs[i].doc;
@@ -320,7 +320,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
String id = Integer.toString(i);
Query query = new TermQuery(new Term("id", id));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
int hitDocID = hits.scoreDocs[0].doc;
Document hitDoc = storedFields.document(hitDocID);
@@ -358,7 +358,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int docID = hits.scoreDocs[i].doc;
@@ -400,7 +400,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
StoredFields storedFields = isearcher.storedFields();
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int docID = hits.scoreDocs[i].doc;
@@ -447,7 +447,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
BytesRef scratch;
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -627,7 +627,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int hitDocID = hits.scoreDocs[i].doc;
@@ -735,7 +735,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
assertEquals(1, isearcher.count(new TermQuery(new Term("fieldname", longTerm))));
Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
BytesRef scratch;
// Iterate through the results:
StoredFields storedFields = isearcher.storedFields();
@@ -1251,7 +1251,7 @@ public abstract class LegacyBaseDocValuesFormatTestCase extends BaseIndexFileFor
query.add(new TermQuery(new Term("docId", "4")), BooleanClause.Occur.SHOULD);
TopDocs search = searcher.search(query.build(), 10);
- assertEquals(5, search.totalHits.value);
+ assertEquals(5, search.totalHits.value());
ScoreDoc[] scoreDocs = search.scoreDocs;
NumericDocValues docValues = getOnlyLeafReader(reader).getNumericDocValues("docId");
for (int i = 0; i < scoreDocs.length; i++) {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
index 6143b7212a9..44c72caa397 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
@@ -540,7 +540,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
}
IndexSearcher searcher = newSearcher(reader, false);
- sum += searcher.search(new TermQuery(new Term("body", "united")), 10).totalHits.value;
+ sum += searcher.search(new TermQuery(new Term("body", "united")), 10).totalHits.value();
if (VERBOSE) {
System.out.println("TEST: warm visited " + sum + " fields");
@@ -628,12 +628,12 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
// Verify: make sure delIDs are in fact deleted:
for (String id : delIDs) {
final TopDocs hits = s.search(new TermQuery(new Term("docid", id)), 1);
- if (hits.totalHits.value != 0) {
+ if (hits.totalHits.value() != 0) {
System.out.println(
"doc id="
+ id
+ " is supposed to be deleted, but got "
- + hits.totalHits.value
+ + hits.totalHits.value()
+ " hits; first docID="
+ hits.scoreDocs[0].doc);
doFail = true;
@@ -643,12 +643,12 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
// Verify: make sure delPackIDs are in fact deleted:
for (String id : delPackIDs) {
final TopDocs hits = s.search(new TermQuery(new Term("packID", id)), 1);
- if (hits.totalHits.value != 0) {
+ if (hits.totalHits.value() != 0) {
System.out.println(
"packID="
+ id
+ " is supposed to be deleted, but got "
- + hits.totalHits.value
+ + hits.totalHits.value()
+ " matches");
doFail = true;
}
@@ -660,14 +660,14 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
StoredFields storedFields = s.storedFields();
if (!subDocs.deleted) {
// We sort by relevance but the scores should be identical so sort falls back to by docID:
- if (hits.totalHits.value != subDocs.subIDs.size()) {
+ if (hits.totalHits.value() != subDocs.subIDs.size()) {
System.out.println(
"packID="
+ subDocs.packID
+ ": expected "
+ subDocs.subIDs.size()
+ " hits but got "
- + hits.totalHits.value);
+ + hits.totalHits.value());
doFail = true;
} else {
int lastDocID = -1;
@@ -687,7 +687,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
lastDocID = startDocID - 1;
for (String subID : subDocs.subIDs) {
hits = s.search(new TermQuery(new Term("docid", subID)), 1);
- assertEquals(1, hits.totalHits.value);
+ assertEquals(1, hits.totalHits.value());
final int docID = hits.scoreDocs[0].doc;
if (lastDocID != -1) {
assertEquals(1 + lastDocID, docID);
@@ -700,7 +700,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
// deleted. We can't verify packID is deleted
// because we can re-use packID for update:
for (String subID : subDocs.subIDs) {
- assertEquals(0, s.search(new TermQuery(new Term("docid", subID)), 1).totalHits.value);
+ assertEquals(0, s.search(new TermQuery(new Term("docid", subID)), 1).totalHits.value());
}
}
}
@@ -714,12 +714,12 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
String stringID = "" + id;
if (!delIDs.contains(stringID)) {
final TopDocs hits = s.search(new TermQuery(new Term("docid", stringID)), 1);
- if (hits.totalHits.value != 1) {
+ if (hits.totalHits.value() != 1) {
System.out.println(
"doc id="
+ stringID
+ " is not supposed to be deleted, but got hitCount="
- + hits.totalHits.value
+ + hits.totalHits.value()
+ "; delIDs="
+ delIDs);
doFail = true;
@@ -779,9 +779,11 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
private long runQuery(IndexSearcher s, Query q) throws Exception {
s.search(q, 10);
long hitCount =
- s.search(q, 10, new Sort(new SortField("titleDV", SortField.Type.STRING))).totalHits.value;
+ s.search(q, 10, new Sort(new SortField("titleDV", SortField.Type.STRING)))
+ .totalHits
+ .value();
final Sort dvSort = new Sort(new SortField("titleDV", SortField.Type.STRING));
- long hitCount2 = s.search(q, 10, dvSort).totalHits.value;
+ long hitCount2 = s.search(q, 10, dvSort).totalHits.value();
assertEquals(hitCount, hitCount2);
return hitCount;
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java
index a65d1823726..63a47895141 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java
@@ -196,8 +196,8 @@ public abstract class SearchEquivalenceTestBase extends LuceneTestCase {
TopDocs td1 = s1.search(q1, reader.maxDoc(), sort);
TopDocs td2 = s2.search(q2, reader.maxDoc(), sort);
assertTrue(
- "too many hits: " + td1.totalHits.value + " > " + td2.totalHits.value,
- td1.totalHits.value <= td2.totalHits.value);
+ "too many hits: " + td1.totalHits.value() + " > " + td2.totalHits.value(),
+ td1.totalHits.value() <= td2.totalHits.value());
// fill the superset into a bitset
BitSet bitset = new BitSet();
@@ -235,7 +235,7 @@ public abstract class SearchEquivalenceTestBase extends LuceneTestCase {
}
TopDocs td1 = s1.search(q1, reader.maxDoc());
TopDocs td2 = s2.search(q2, reader.maxDoc());
- assertEquals(td1.totalHits.value, td2.totalHits.value);
+ assertEquals(td1.totalHits.value(), td2.totalHits.value());
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
assertEquals(td1.scoreDocs[i].score, td2.scoreDocs[i].score, 10e-5);
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java
index 11e6c7e5f69..17697459650 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java
@@ -1375,15 +1375,17 @@ public final class TestUtil {
/** Assert that the given {@link TopDocs} have the same top docs and consistent hit counts. */
public static void assertConsistent(TopDocs expected, TopDocs actual) {
Assert.assertEquals(
- "wrong total hits", expected.totalHits.value == 0, actual.totalHits.value == 0);
- if (expected.totalHits.relation == TotalHits.Relation.EQUAL_TO) {
- if (actual.totalHits.relation == TotalHits.Relation.EQUAL_TO) {
- Assert.assertEquals("wrong total hits", expected.totalHits.value, actual.totalHits.value);
+ "wrong total hits", expected.totalHits.value() == 0, actual.totalHits.value() == 0);
+ if (expected.totalHits.relation() == TotalHits.Relation.EQUAL_TO) {
+ if (actual.totalHits.relation() == TotalHits.Relation.EQUAL_TO) {
+ Assert.assertEquals(
+ "wrong total hits", expected.totalHits.value(), actual.totalHits.value());
} else {
- Assert.assertTrue("wrong total hits", expected.totalHits.value >= actual.totalHits.value);
+ Assert.assertTrue(
+ "wrong total hits", expected.totalHits.value() >= actual.totalHits.value());
}
- } else if (actual.totalHits.relation == TotalHits.Relation.EQUAL_TO) {
- Assert.assertTrue("wrong total hits", expected.totalHits.value <= actual.totalHits.value);
+ } else if (actual.totalHits.relation() == TotalHits.Relation.EQUAL_TO) {
+ Assert.assertTrue("wrong total hits", expected.totalHits.value() <= actual.totalHits.value());
}
Assert.assertEquals("wrong hit count", expected.scoreDocs.length, actual.scoreDocs.length);
for (int hitIDX = 0; hitIDX < expected.scoreDocs.length; hitIDX++) {