You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2018/07/30 16:21:34 UTC
[7/8] lucene-solr:master: LUCENE-8430: TopDocs.totalHits may now be a
lower bound of the hit count.
LUCENE-8430: TopDocs.totalHits may now be a lower bound of the hit count.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9ca05371
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9ca05371
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9ca05371
Branch: refs/heads/master
Commit: 9ca053712af0795cbd0d0d9f2d862f24d9e547c3
Parents: 3a837ca
Author: Adrien Grand <jp...@gmail.com>
Authored: Mon Jul 30 10:08:16 2018 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Mon Jul 30 16:38:05 2018 +0200
----------------------------------------------------------------------
lucene/MIGRATE.txt | 8 ++
.../benchmark/byTask/feeds/DocMakerTest.java | 2 +-
.../byTask/feeds/LineDocSourceTest.java | 2 +-
.../lucene/classification/BM25NBClassifier.java | 4 +-
.../classification/KNearestFuzzyClassifier.java | 2 +-
.../KNearestNeighborClassifier.java | 2 +-
.../classification/utils/DatasetSplitter.java | 4 +-
.../org/apache/lucene/search/SortRescorer.java | 5 +-
.../java/org/apache/lucene/search/TopDocs.java | 17 ++-
.../apache/lucene/search/TopDocsCollector.java | 9 +-
.../apache/lucene/search/TopFieldCollector.java | 25 +---
.../org/apache/lucene/search/TopFieldDocs.java | 2 +-
.../lucene/search/TopScoreDocCollector.java | 33 ++----
.../org/apache/lucene/search/TotalHits.java | 71 +++++++++++
.../src/test/org/apache/lucene/TestDemo.java | 2 +-
.../perfield/TestPerFieldDocValuesFormat.java | 2 +-
.../perfield/TestPerFieldPostingsFormat2.java | 2 +-
.../org/apache/lucene/document/TestField.java | 2 +-
.../apache/lucene/index/TestBinaryTerms.java | 2 +-
.../index/TestCrashCausesCorruptIndex.java | 2 +-
.../lucene/index/TestForTooMuchCloning.java | 2 +-
.../apache/lucene/index/TestIndexSorting.java | 22 ++--
.../apache/lucene/index/TestIndexWriter.java | 14 +--
.../lucene/index/TestIndexWriterDelete.java | 2 +-
.../lucene/index/TestIndexWriterMaxDocs.java | 4 +-
.../lucene/index/TestIndexWriterReader.java | 12 +-
.../apache/lucene/index/TestIndexableField.java | 6 +-
.../index/TestIndexingSequenceNumbers.java | 12 +-
.../lucene/index/TestMixedDocValuesUpdates.java | 10 +-
.../index/TestNumericDocValuesUpdates.java | 2 +-
.../apache/lucene/index/TestReadOnlyIndex.java | 2 +-
.../apache/lucene/index/TestRollingUpdates.java | 2 +-
.../TestSoftDeletesRetentionMergePolicy.java | 14 +--
.../apache/lucene/index/TestStressDeletes.java | 4 +-
.../org/apache/lucene/index/TestStressNRT.java | 10 +-
.../org/apache/lucene/index/TestTryDelete.java | 14 +--
.../lucene/search/TermInSetQueryTest.java | 2 +-
.../lucene/search/TestAutomatonQuery.java | 2 +-
.../search/TestAutomatonQueryUnicode.java | 2 +-
.../lucene/search/TestBlendedTermQuery.java | 2 +-
.../org/apache/lucene/search/TestBoolean2.java | 4 +-
.../search/TestBooleanMinShouldMatch.java | 6 +-
.../org/apache/lucene/search/TestBooleanOr.java | 2 +-
.../apache/lucene/search/TestBooleanQuery.java | 12 +-
.../lucene/search/TestBooleanRewrites.java | 2 +-
.../apache/lucene/search/TestBooleanScorer.java | 2 +-
.../apache/lucene/search/TestConjunctions.java | 2 +-
.../TestControlledRealTimeReopenThread.java | 12 +-
.../lucene/search/TestDocValuesQueries.java | 2 +-
.../lucene/search/TestDoubleValuesSource.java | 2 +-
.../lucene/search/TestFieldValueQuery.java | 2 +-
.../apache/lucene/search/TestFuzzyQuery.java | 2 +-
.../apache/lucene/search/TestIndexSearcher.java | 2 +-
.../apache/lucene/search/TestLRUQueryCache.java | 2 +-
.../lucene/search/TestLiveFieldValues.java | 4 +-
.../lucene/search/TestLongValuesSource.java | 2 +-
.../lucene/search/TestMultiPhraseQuery.java | 8 +-
.../apache/lucene/search/TestNeedsScores.java | 8 +-
.../search/TestNormsFieldExistsQuery.java | 2 +-
.../search/TestPositiveScoresOnlyCollector.java | 2 +-
.../lucene/search/TestPrefixInBooleanQuery.java | 8 +-
.../apache/lucene/search/TestPrefixQuery.java | 2 +-
.../apache/lucene/search/TestQueryRescorer.java | 24 ++--
.../apache/lucene/search/TestRegexpQuery.java | 4 +-
.../apache/lucene/search/TestRegexpRandom.java | 2 +-
.../search/TestSameScoresWithThreads.java | 2 +-
.../apache/lucene/search/TestSearchAfter.java | 6 +-
.../lucene/search/TestShardSearching.java | 8 +-
.../lucene/search/TestSimilarityProvider.java | 4 +-
.../lucene/search/TestSloppyPhraseQuery.java | 6 +-
.../test/org/apache/lucene/search/TestSort.java | 50 ++++----
.../apache/lucene/search/TestSortRescorer.java | 8 +-
.../search/TestSortedNumericSortField.java | 18 +--
.../lucene/search/TestSortedSetSelector.java | 30 ++---
.../lucene/search/TestSortedSetSortField.java | 14 +--
.../apache/lucene/search/TestSynonymQuery.java | 2 +-
.../lucene/search/TestTermRangeQuery.java | 12 +-
.../lucene/search/TestTopDocsCollector.java | 64 +---------
.../apache/lucene/search/TestTopDocsMerge.java | 33 +++++-
.../lucene/search/TestTopFieldCollector.java | 2 +-
.../TestTopFieldCollectorEarlyTermination.java | 6 +-
.../lucene/search/TestWildcardRandom.java | 2 +-
.../similarities/TestBooleanSimilarity.java | 10 +-
.../similarities/TestClassicSimilarity.java | 18 +--
.../search/similarities/TestSimilarity2.java | 14 +--
.../search/similarities/TestSimilarityBase.java | 2 +-
.../lucene/search/spans/TestSpanFirstQuery.java | 4 +-
.../apache/lucene/search/spans/TestSpans.java | 2 +-
.../org/apache/lucene/demo/SearchFiles.java | 2 +-
.../demo/facet/TestDistanceFacetsExample.java | 2 +-
.../demo/facet/TestRangeFacetsExample.java | 2 +-
.../expressions/TestExpressionRescorer.java | 4 +-
.../lucene/expressions/TestExpressionSorts.java | 2 +-
.../apache/lucene/facet/FacetsCollector.java | 3 +-
.../apache/lucene/facet/TestDrillDownQuery.java | 14 +--
.../apache/lucene/facet/TestDrillSideways.java | 32 ++---
.../org/apache/lucene/facet/TestFacetQuery.java | 4 +-
.../facet/range/TestRangeFacetCounts.java | 14 +--
.../sortedset/TestSortedSetDocValuesFacets.java | 2 +-
.../TestTaxonomyFacetSumValueSource.java | 2 +-
.../directory/TestDirectoryTaxonomyWriter.java | 2 +-
.../search/grouping/BlockGroupingCollector.java | 3 +-
.../lucene/search/grouping/GroupDocs.java | 5 +-
.../lucene/search/grouping/TopGroups.java | 7 +-
.../lucene/search/grouping/TestGrouping.java | 13 +-
.../search/highlight/HighlighterPhraseTest.java | 12 +-
.../search/highlight/HighlighterTest.java | 68 +++++------
.../search/highlight/TokenSourcesTest.java | 8 +-
.../uhighlight/TestUnifiedHighlighter.java | 56 ++++-----
.../uhighlight/TestUnifiedHighlighterMTQ.java | 60 +++++-----
.../TestUnifiedHighlighterRanking.java | 4 +-
.../TestUnifiedHighlighterStrictPhrases.java | 7 +-
.../TestUnifiedHighlighterTermVec.java | 2 +-
.../FastVectorHighlighterTest.java | 2 +-
.../lucene/search/join/TestBlockJoin.java | 44 +++----
.../search/join/TestBlockJoinSorting.java | 8 +-
.../apache/lucene/search/join/TestJoinUtil.java | 32 ++---
.../join/TestParentChildrenBlockJoinQuery.java | 2 +-
.../memory/TestMemoryIndexAgainstRAMDir.java | 4 +-
.../search/DiversifiedTopDocsCollector.java | 2 +-
.../lucene/queries/CommonTermsQueryTest.java | 28 ++---
.../queries/function/TestFieldScoreQuery.java | 2 +-
.../function/TestFunctionMatchQuery.java | 2 +-
.../function/TestFunctionScoreQuery.java | 8 +-
.../queries/payloads/TestPayloadTermQuery.java | 8 +-
.../queryparser/classic/TestQueryParser.java | 2 +-
.../flexible/standard/TestQPHelper.java | 2 +-
.../queryparser/util/QueryParserTestBase.java | 2 +-
.../lucene/queryparser/xml/TestCoreParser.java | 6 +-
.../IndexAndTaxonomyReplicationClientTest.java | 2 +-
.../document/FloatPointNearestNeighbor.java | 3 +-
.../search/LatLonPointPrototypeQueries.java | 2 +-
.../search/TestDocValuesNumbersQuery.java | 2 +-
.../lucene/search/TestDocValuesTermsQuery.java | 2 +-
.../lucene/search/TestTermAutomatonQuery.java | 28 ++---
.../apache/lucene/spatial/SpatialExample.java | 4 +-
.../apache/lucene/spatial/SpatialTestCase.java | 2 +-
.../lucene/spatial/prefix/JtsPolygonTest.java | 2 +-
.../prefix/tree/SpatialPrefixTreeTest.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 2 +-
.../search/suggest/document/TopSuggestDocs.java | 7 +-
.../document/TopSuggestDocsCollector.java | 3 +-
.../document/TestPrefixCompletionQuery.java | 4 +-
.../suggest/document/TestSuggestField.java | 12 +-
.../apache/lucene/geo/BaseGeoPointTestCase.java | 22 ++--
.../index/BaseDocValuesFormatTestCase.java | 20 ++--
.../index/BaseStoredFieldsFormatTestCase.java | 8 +-
.../ThreadedIndexingAndSearchingTestCase.java | 26 ++--
.../search/SearchEquivalenceTestBase.java | 4 +-
.../java/org/apache/lucene/util/TestUtil.java | 3 +-
.../dataimport/TestHierarchicalDocBuilder.java | 2 +-
.../java/org/apache/solr/ltr/LTRRescorer.java | 6 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 4 +-
.../apache/solr/ltr/TestLTRScoringQuery.java | 2 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../org/apache/solr/cloud/ElectionContext.java | 2 +-
.../org/apache/solr/handler/BlobHandler.java | 8 +-
.../solr/handler/admin/RequestSyncShardOp.java | 2 +-
.../solr/handler/component/ExpandComponent.java | 4 +-
.../handler/component/RealTimeGetComponent.java | 2 +-
.../apache/solr/search/ExportQParserPlugin.java | 3 +-
.../java/org/apache/solr/search/Grouping.java | 6 +-
.../org/apache/solr/search/ReRankCollector.java | 2 +-
.../apache/solr/search/SolrIndexSearcher.java | 3 +-
.../TopGroupsResultTransformer.java | 14 ++-
.../GroupedEndResultTransformer.java | 9 +-
.../solr/search/mlt/SimpleMLTQParser.java | 4 +-
.../handler/TestReplicationHandlerBackup.java | 2 +-
.../TestMultiValuedNumericRangeQuery.java | 2 +-
.../solr/legacy/TestNumericRangeQuery32.java | 10 +-
.../solr/legacy/TestNumericRangeQuery64.java | 10 +-
.../solr/search/TestFilteredDocIdSet.java | 4 +-
.../apache/solr/search/TestRankQueryPlugin.java | 5 +-
.../solr/search/function/TestOrdValues.java | 2 +-
.../apache/solr/search/join/BJQParserTest.java | 2 +-
.../solr/uninverting/TestFieldCacheSort.java | 118 +++++++++----------
.../uninverting/TestFieldCacheSortRandom.java | 2 +-
.../solr/uninverting/TestNumericTerms32.java | 2 +-
.../solr/uninverting/TestNumericTerms64.java | 2 +-
.../apache/solr/update/AddBlockUpdateTest.java | 4 +-
180 files changed, 859 insertions(+), 800 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/MIGRATE.txt
----------------------------------------------------------------------
diff --git a/lucene/MIGRATE.txt b/lucene/MIGRATE.txt
index 4c14651..fc0930c 100644
--- a/lucene/MIGRATE.txt
+++ b/lucene/MIGRATE.txt
@@ -89,3 +89,11 @@ Computing scores at collection time is less efficient than running a second
request in order to only compute scores for documents that made it to the top
hits. As a consequence, the trackDocScores option has been removed and can be
replaced with the new TopFieldCollector#populateScores helper method.
+
+## TopDocs.totalHits is no longer a long ##
+
+Lucene 8 received optimizations for collection of top-k matches by not visiting
+all matches. However these optimizations won't help if all matches still need
+to be visited in order to compute the total number of hits. As a consequence,
+TopDocs.totalHits is now an TotalHits object that is either an exact hit count
+or a lower bound of the hit count.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
----------------------------------------------------------------------
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
index c2ead39..331fd23 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
@@ -94,7 +94,7 @@ public class DocMakerTest 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);
+ assertEquals(numExpectedResults, td.totalHits.value);
reader.close();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
----------------------------------------------------------------------
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
index 197ce4a..e826e43 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
@@ -154,7 +154,7 @@ public class LineDocSourceTest 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);
+ assertEquals(numAdds, td.totalHits.value);
assertNotNull(td.scoreDocs[0]);
if (storedField==null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
----------------------------------------------------------------------
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 0613856..b23fc39 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
@@ -217,7 +217,7 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
builder.add(query, BooleanClause.Occur.MUST);
}
TopDocs search = indexSearcher.search(builder.build(), 1);
- return search.totalHits > 0 ? search.scoreDocs[0].score : 1;
+ return search.totalHits.value > 0 ? search.scoreDocs[0].score : 1;
}
private double calculateLogPrior(Term term) throws IOException {
@@ -228,7 +228,7 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
bq.add(query, BooleanClause.Occur.MUST);
}
TopDocs topDocs = indexSearcher.search(bq.build(), 1);
- return topDocs.totalHits > 0 ? Math.log(topDocs.scoreDocs[0].score) : 0;
+ return topDocs.totalHits.value > 0 ? Math.log(topDocs.scoreDocs[0].score) : 0;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
----------------------------------------------------------------------
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 0e90ccd..0398fbc 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> {
private List<ClassificationResult<BytesRef>> buildListFromTopDocs(TopDocs topDocs) throws IOException {
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 == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
+ float maxScore = topDocs.totalHits.value == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
IndexableField storableField = indexSearcher.doc(scoreDoc.doc).getField(classFieldName);
if (storableField != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
----------------------------------------------------------------------
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 6c55493..dadb885 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
@@ -190,7 +190,7 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
protected List<ClassificationResult<BytesRef>> buildListFromTopDocs(TopDocs topDocs) throws IOException {
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 == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
+ float maxScore = topDocs.totalHits.value == 0 ? Float.NaN : topDocs.scoreDocs[0].score;
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
IndexableField[] storableFields = indexSearcher.doc(scoreDoc.doc).getFields(classFieldName);
for (IndexableField singleStorableField : storableFields) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java
----------------------------------------------------------------------
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 d75daf9..c2f04d3 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
@@ -35,6 +35,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.grouping.GroupDocs;
import org.apache.lucene.search.grouping.GroupingSearch;
import org.apache.lucene.search.grouping.TopGroups;
@@ -122,7 +123,8 @@ public class DatasetSplitter {
// iterate over existing documents
for (GroupDocs<Object> group : topGroups.groups) {
- long totalHits = group.totalHits;
+ assert group.totalHits.relation == TotalHits.Relation.EQUAL_TO;
+ long totalHits = group.totalHits.value;
double testSize = totalHits * testRatio;
int tc = 0;
double cvSize = totalHits * crossValidationRatio;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
----------------------------------------------------------------------
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 95f2982..5d35a58 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java
@@ -24,6 +24,7 @@ import java.util.Comparator;
import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.TotalHits.Relation;
/**
* A {@link Rescorer} that re-sorts according to a provided
@@ -98,9 +99,9 @@ public class SortRescorer extends Rescorer {
@Override
public Explanation explain(IndexSearcher searcher, Explanation firstPassExplanation, int docID) throws IOException {
- TopDocs oneHit = new TopDocs(1, new ScoreDoc[] {new ScoreDoc(docID, firstPassExplanation.getValue().floatValue())});
+ TopDocs oneHit = new TopDocs(new TotalHits(1, Relation.EQUAL_TO), new ScoreDoc[] {new ScoreDoc(docID, firstPassExplanation.getValue().floatValue())});
TopDocs hits = rescore(searcher, oneHit, 1);
- assert hits.totalHits == 1;
+ assert hits.totalHits.value == 1;
List<Explanation> subs = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
----------------------------------------------------------------------
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 25f7b34..d466893 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
@@ -23,13 +23,13 @@ import org.apache.lucene.util.PriorityQueue;
public class TopDocs {
/** The total number of hits for the query. */
- public long totalHits;
+ public TotalHits totalHits;
/** The top hits for the query. */
public ScoreDoc[] scoreDocs;
/** Constructs a TopDocs. */
- public TopDocs(long totalHits, ScoreDoc[] scoreDocs) {
+ public TopDocs(TotalHits totalHits, ScoreDoc[] scoreDocs) {
this.totalHits = totalHits;
this.scoreDocs = scoreDocs;
}
@@ -246,12 +246,18 @@ public class TopDocs {
}
long totalHitCount = 0;
+ TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO;
int availHitCount = 0;
for(int shardIDX=0;shardIDX<shardHits.length;shardIDX++) {
final TopDocs shard = shardHits[shardIDX];
// totalHits can be non-zero even if no hits were
// collected, when searchAfter was used:
- totalHitCount += shard.totalHits;
+ 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) {
+ totalHitsRelation = TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO;
+ }
if (shard.scoreDocs != null && shard.scoreDocs.length > 0) {
availHitCount += shard.scoreDocs.length;
queue.add(new ShardRef(shardIDX, setShardIndex == false));
@@ -292,10 +298,11 @@ public class TopDocs {
}
}
+ TotalHits totalHits = new TotalHits(totalHitCount, totalHitsRelation);
if (sort == null) {
- return new TopDocs(totalHitCount, hits);
+ return new TopDocs(totalHits, hits);
} else {
- return new TopFieldDocs(totalHitCount, hits, sort.getSort());
+ return new TopFieldDocs(totalHits, hits, sort.getSort());
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
index 1ad3553..3e9f834 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
@@ -35,7 +35,7 @@ public abstract class TopDocsCollector<T extends ScoreDoc> implements Collector
/** This is used in case topDocs() is called with illegal parameters, or there
* simply aren't (enough) results. */
- protected static final TopDocs EMPTY_TOPDOCS = new TopDocs(0, new ScoreDoc[0]);
+ protected static final TopDocs EMPTY_TOPDOCS = new TopDocs(new TotalHits(0, TotalHits.Relation.EQUAL_TO), new ScoreDoc[0]);
/**
* The priority queue which holds the top documents. Note that different
@@ -47,7 +47,10 @@ public abstract class TopDocsCollector<T extends ScoreDoc> implements Collector
/** The total number of documents that the collector encountered. */
protected int totalHits;
-
+
+ /** Whether {@link #totalHits} is exact or a lower bound. */
+ protected TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO;
+
protected TopDocsCollector(PriorityQueue<T> pq) {
this.pq = pq;
}
@@ -69,7 +72,7 @@ public abstract class TopDocsCollector<T extends ScoreDoc> implements Collector
* topDocs were invalid.
*/
protected TopDocs newTopDocs(ScoreDoc[] results, int start) {
- return results == null ? EMPTY_TOPDOCS : new TopDocs(totalHits, results);
+ return results == null ? EMPTY_TOPDOCS : new TopDocs(new TotalHits(totalHits, totalHitsRelation), results);
}
/** The total number of documents that matched this query. */
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java
index 99f4e2c..af2310b 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
+import org.apache.lucene.search.TotalHits.Relation;
import org.apache.lucene.util.FutureObjects;
import org.apache.lucene.util.PriorityQueue;
@@ -77,13 +78,6 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
return Arrays.asList(fields1).equals(Arrays.asList(fields2).subList(0, fields1.length));
}
- static int estimateRemainingHits(int hitCount, int doc, int maxDoc) {
- double hitRatio = (double) hitCount / (doc + 1);
- int remainingDocs = maxDoc - doc - 1;
- int remainingHits = (int) (remainingDocs * hitRatio);
- return remainingHits;
- }
-
/*
* Implements a TopFieldCollector over one SortField criteria, with tracking
* document scores and maxScore.
@@ -111,7 +105,6 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
final boolean canEarlyTerminate = trackTotalHits == false &&
indexSort != null &&
canEarlyTerminate(sort, indexSort);
- final int initialTotalHits = totalHits;
return new MultiComparatorLeafCollector(comparators, reverseMul) {
@@ -124,10 +117,7 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
// this document is largest than anything else in the queue, and
// therefore not competitive.
if (canEarlyTerminate) {
- // scale totalHits linearly based on the number of docs
- // and terminate collection
- totalHits += estimateRemainingHits(totalHits - initialTotalHits, doc, context.reader().maxDoc());
- earlyTerminated = true;
+ totalHitsRelation = Relation.GREATER_THAN_OR_EQUAL_TO;
throw new CollectionTerminatedException();
} else {
// just move to the next doc
@@ -193,7 +183,6 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
final boolean canEarlyTerminate = trackTotalHits == false &&
indexSort != null &&
canEarlyTerminate(sort, indexSort);
- final int initialTotalHits = totalHits;
return new MultiComparatorLeafCollector(queue.getComparators(context), queue.getReverseMul()) {
@Override
@@ -209,10 +198,7 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
if (cmp <= 0) {
// not competitive since documents are visited in doc id order
if (canEarlyTerminate) {
- // scale totalHits linearly based on the number of docs
- // and terminate collection
- totalHits += estimateRemainingHits(totalHits - initialTotalHits, doc, context.reader().maxDoc());
- earlyTerminated = true;
+ totalHitsRelation = Relation.GREATER_THAN_OR_EQUAL_TO;
throw new CollectionTerminatedException();
} else {
// just move to the next doc
@@ -261,7 +247,6 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
FieldValueHitQueue.Entry bottom = null;
boolean queueFull;
int docBase;
- boolean earlyTerminated = false;
final boolean needsScores;
// Declaring the constructor private prevents extending this class by anyone
@@ -423,7 +408,7 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
}
// If this is a maxScoring tracking collector and there were no results,
- return new TopFieldDocs(totalHits, results, ((FieldValueHitQueue<Entry>) pq).getFields());
+ return new TopFieldDocs(new TotalHits(totalHits, totalHitsRelation), results, ((FieldValueHitQueue<Entry>) pq).getFields());
}
@Override
@@ -433,6 +418,6 @@ public abstract class TopFieldCollector extends TopDocsCollector<Entry> {
/** Return whether collection terminated early. */
public boolean isEarlyTerminated() {
- return earlyTerminated;
+ return totalHitsRelation == Relation.GREATER_THAN_OR_EQUAL_TO;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java b/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java
index 95c7dee..772d7a9 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java
@@ -31,7 +31,7 @@ public class TopFieldDocs extends TopDocs {
* @param scoreDocs The top hits for the query.
* @param fields The sort criteria used to find the top hits.
*/
- public TopFieldDocs (long totalHits, ScoreDoc[] scoreDocs, SortField[] fields) {
+ public TopFieldDocs (TotalHits totalHits, ScoreDoc[] scoreDocs, SortField[] fields) {
super (totalHits, scoreDocs);
this.fields = fields;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
index a319de7..839a626 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.TotalHits.Relation;
/**
* A {@link Collector} implementation that collects the top-scoring hits,
@@ -49,22 +50,20 @@ public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
private static class SimpleTopScoreDocCollector extends TopScoreDocCollector {
- private final int numHits;
private final boolean trackTotalHits;
- private int sumMaxDoc;
- private int maxCollectedExactly = -1;
SimpleTopScoreDocCollector(int numHits, boolean trackTotalHits) {
super(numHits);
- this.numHits = numHits;
this.trackTotalHits = trackTotalHits;
+ if (trackTotalHits == false) {
+ totalHitsRelation = Relation.GREATER_THAN_OR_EQUAL_TO;
+ }
}
@Override
public LeafCollector getLeafCollector(LeafReaderContext context)
throws IOException {
final int docBase = context.docBase;
- sumMaxDoc += context.reader().maxDoc();
return new ScorerLeafCollector() {
@Override
@@ -100,10 +99,6 @@ public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
// since we tie-break on doc id and collect in doc id order, we can require
// the next float
scorer.setMinCompetitiveScore(Math.nextUp(pqTop.score));
- if (maxCollectedExactly < 0) {
- assert totalHits == numHits;
- maxCollectedExactly = doc + docBase;
- }
}
}
@@ -111,20 +106,6 @@ public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
}
@Override
- public TopDocs topDocs() {
- TopDocs topDocs = super.topDocs();
- if (trackTotalHits == false && maxCollectedExactly >= 0) {
- // assume matches are evenly spread in the doc id space
- // this may be completely off
- long totalHitsEstimate = (long) numHits * sumMaxDoc / (maxCollectedExactly + 1);
- // we take the max since the current topDocs.totalHits is a lower bound
- // of the total hit count
- topDocs.totalHits = Math.max(topDocs.totalHits, totalHitsEstimate);
- }
- return topDocs;
- }
-
- @Override
public ScoreMode scoreMode() {
return trackTotalHits ? ScoreMode.COMPLETE : ScoreMode.TOP_SCORES;
}
@@ -148,7 +129,9 @@ public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
@Override
protected TopDocs newTopDocs(ScoreDoc[] results, int start) {
- return results == null ? new TopDocs(totalHits, new ScoreDoc[0]) : new TopDocs(totalHits, results);
+ return results == null
+ ? new TopDocs(new TotalHits(totalHits, totalHitsRelation), new ScoreDoc[0])
+ : new TopDocs(new TotalHits(totalHits, totalHitsRelation), results);
}
@Override
@@ -240,7 +223,7 @@ public abstract class TopScoreDocCollector extends TopDocsCollector<ScoreDoc> {
return EMPTY_TOPDOCS;
}
- return new TopDocs(totalHits, results);
+ return new TopDocs(new TotalHits(totalHits, totalHitsRelation), results);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/TotalHits.java b/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
new file mode 100644
index 0000000..1b852a9
--- /dev/null
+++ b/lucene/core/src/java/org/apache/lucene/search/TotalHits.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.lucene.search;
+
+import java.util.Objects;
+
+/**
+ * Description of the total number of hits of a query. The total hit count
+ * can't generally be computed accurately without visiting all matches, which
+ * is costly for queries that match lots of 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.
+ */
+public final class TotalHits {
+
+ /** How the {@link TotalHits#value} should be interpreted. */
+ public enum Relation {
+ /**
+ * The total hit count is equal to {@link TotalHits#value}.
+ */
+ EQUAL_TO,
+ /**
+ * The total hit count is greater than or eual to {@link TotalHits#value}.
+ */
+ 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) {
+ if (value < 0) {
+ throw new IllegalArgumentException("value must be >= 0, got " + value);
+ }
+ this.value = value;
+ this.relation = Objects.requireNonNull(relation);
+ }
+
+ @Override
+ public String toString() {
+ return value + (relation == Relation.EQUAL_TO ? "" : "+") + " hits";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/TestDemo.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/TestDemo.java b/lucene/core/src/test/org/apache/lucene/TestDemo.java
index a49bbe5..f2d3a61 100644
--- a/lucene/core/src/test/org/apache/lucene/TestDemo.java
+++ b/lucene/core/src/test/org/apache/lucene/TestDemo.java
@@ -61,7 +61,7 @@ public class TestDemo 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);
+ assertEquals(1, hits.totalHits.value);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
Document hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
----------------------------------------------------------------------
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 1541dcb..ea3f9cc 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
@@ -117,7 +117,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);
+ assertEquals(1, hits.totalHits.value);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
int hitDocID = hits.scoreDocs[i].doc;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
----------------------------------------------------------------------
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 f72ffcc..b7cc2bf 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
@@ -209,7 +209,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);
+ assertEquals(num, search.totalHits.value);
reader.close();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/document/TestField.java
----------------------------------------------------------------------
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 c087505..5c5f47b 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestField.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java
@@ -487,7 +487,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);
+ assertEquals(1, hits.totalHits.value);
Document storedDoc = s.doc(hits.scoreDocs[0].doc);
assertEquals(br, storedDoc.getField("binary").binaryValue());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
----------------------------------------------------------------------
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 8da8c23..81593b7 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
@@ -60,7 +60,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);
+ assertEquals(1, docs.totalHits.value);
assertEquals("" + i, is.doc(docs.scoreDocs[0].doc).get("id"));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
----------------------------------------------------------------------
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 9fd20ab..c7d300b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
@@ -112,7 +112,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);
+ assertEquals(expectedTotalHits, topDocs.totalHits.value);
indexReader.close();
realDirectory.close();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
----------------------------------------------------------------------
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 89a77cd..6be8e78 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
@@ -71,7 +71,7 @@ public class TestForTooMuchCloning extends LuceneTestCase {
new BytesRef("\uFFFF"),
true,
true), 10);
- assertTrue(hits.totalHits > 0);
+ assertTrue(hits.totalHits.value > 0);
final int queryCloneCount = dir.getInputCloneCount() - cloneCount;
//System.out.println("query clone count=" + queryCloneCount);
assertTrue("too many calls to IndexInput.clone during TermRangeQuery: " + queryCloneCount, queryCloneCount < 50);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
----------------------------------------------------------------------
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 858a874..2eab9c6 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -1534,9 +1534,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);
+ assertEquals(0, topDocs.totalHits.value);
} else {
- assertEquals(1, topDocs.totalHits);
+ 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());
@@ -1586,9 +1586,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);
+ assertEquals(0, topDocs.totalHits.value);
} else {
- assertEquals(1, topDocs.totalHits);
+ 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());
@@ -1685,9 +1685,9 @@ 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);
if (values.containsKey(i) == false) {
- assertEquals(0, topDocs.totalHits);
+ assertEquals(0, topDocs.totalHits.value);
} else {
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
NumericDocValues dvs = MultiDocValues.getNumericValues(reader, "foo");
int docID = topDocs.scoreDocs[0].doc;
assertEquals(docID, dvs.advance(docID));
@@ -1807,7 +1807,7 @@ public class TestIndexSorting extends LuceneTestCase {
IndexSearcher searcher = newSearcher(reader);
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);
+ assertEquals(1, topDocs.totalHits.value);
NumericDocValues dvs = MultiDocValues.getNumericValues(reader, "bar");
int hitDoc = topDocs.scoreDocs[0].doc;
assertEquals(hitDoc, dvs.advance(hitDoc));
@@ -1865,8 +1865,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, topDocs2.totalHits);
- if (topDocs.totalHits == 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));
@@ -2334,11 +2334,11 @@ public class TestIndexSorting extends LuceneTestCase {
TopDocs hits2 = c2.topDocs();
if (VERBOSE) {
- System.out.println(" topDocs query-time sort: totalHits=" + hits1.totalHits);
+ 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);
+ System.out.println(" topDocs index-time sort: totalHits=" + hits2.totalHits.value);
for(ScoreDoc scoreDoc : hits2.scoreDocs) {
System.out.println(" " + scoreDoc.doc);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
----------------------------------------------------------------------
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 4861929..b640298 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -1778,7 +1778,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);
+ assertEquals(1, is.search(pq, 5).totalHits.value);
ir.close();
dir.close();
}
@@ -1810,7 +1810,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);
+ assertEquals(1, is.search(pq, 5).totalHits.value);
ir.close();
dir.close();
}
@@ -3109,7 +3109,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);
+ assertEquals(1, topDocs.totalHits.value);
Document document = reader.document(topDocs.scoreDocs[0].doc);
assertEquals("2", document.get("version"));
@@ -3125,7 +3125,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);
+ assertEquals(1, topDocs.totalHits.value);
document = reader.document(topDocs.scoreDocs[0].doc);
assertEquals("3", document.get("version"));
@@ -3138,7 +3138,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);
+ assertEquals(0, topDocs.totalHits.value);
int numSoftDeleted = 0;
for (SegmentCommitInfo info : writer.cloneSegmentInfos()) {
numSoftDeleted += info.getSoftDelCount();
@@ -3261,10 +3261,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);
+ assertEquals(2, topDocs.totalHits.value);
assertEquals(Math.abs(topDocs.scoreDocs[0].doc - topDocs.scoreDocs[1].doc), 1);
} else {
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
}
}
if (mixDeletes == false) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
----------------------------------------------------------------------
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 2f15cbb..1ee4bd0 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
@@ -477,7 +477,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;
+ long hitCount = searcher.search(new TermQuery(term), 1000).totalHits.value;
reader.close();
return hitCount;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
----------------------------------------------------------------------
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 237ad38..5d41459 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
@@ -68,11 +68,11 @@ public class TestIndexWriterMaxDocs extends LuceneTestCase {
assertEquals(IndexWriter.MAX_DOCS, ir.numDocs());
IndexSearcher searcher = new IndexSearcher(ir);
TopDocs hits = searcher.search(new TermQuery(new Term("field", "text")), 10);
- assertEquals(IndexWriter.MAX_DOCS, hits.totalHits);
+ assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value);
// Sort by docID reversed:
hits = searcher.search(new TermQuery(new Term("field", "text")), 10, new Sort(new SortField(null, SortField.Type.DOC, true)));
- assertEquals(IndexWriter.MAX_DOCS, hits.totalHits);
+ assertEquals(IndexWriter.MAX_DOCS, hits.totalHits.value);
assertEquals(10, hits.scoreDocs.length);
assertEquals(IndexWriter.MAX_DOCS-1, hits.scoreDocs[0].doc);
ir.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
index 86881ac..de05b20 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
@@ -700,7 +700,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
assertEquals(100, r.numDocs());
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- assertEquals(100, searcher.search(q, 10).totalHits);
+ assertEquals(100, searcher.search(q, 10).totalHits.value);
expectThrows(AlreadyClosedException.class, () -> {
DirectoryReader.openIfChanged(r);
@@ -768,7 +768,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
r = r2;
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- final long count = searcher.search(q, 10).totalHits;
+ final long count = searcher.search(q, 10).totalHits.value;
assertTrue(count >= lastCount);
lastCount = count;
}
@@ -785,7 +785,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
}
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- final long count = searcher.search(q, 10).totalHits;
+ final long count = searcher.search(q, 10).totalHits.value;
assertTrue(count >= lastCount);
assertEquals(0, excs.size());
@@ -865,7 +865,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
r = r2;
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- sum += searcher.search(q, 10).totalHits;
+ sum += searcher.search(q, 10).totalHits.value;
}
}
@@ -880,7 +880,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
}
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- sum += searcher.search(q, 10).totalHits;
+ sum += searcher.search(q, 10).totalHits.value;
assertTrue("no documents found at all", sum > 0);
assertEquals(0, excs.size());
@@ -966,7 +966,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
.setMergedSegmentWarmer((r) -> {
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(new Term("foo", "bar")), 10);
- assertEquals(20, hits.totalHits);
+ assertEquals(20, hits.totalHits.value);
didWarm.set(true);
})
.setMergePolicy(newLogMergePolicy(10))
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
----------------------------------------------------------------------
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 510a899..25b48c8 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
@@ -228,7 +228,7 @@ public class TestIndexableField extends LuceneTestCase {
}
final TopDocs hits = s.search(new TermQuery(new Term("id", ""+id)), 1);
- assertEquals(1, hits.totalHits);
+ assertEquals(1, hits.totalHits.value);
final int docID = hits.scoreDocs[0].doc;
final Document doc = s.doc(docID);
final int endCounter = counter + fieldsPerDoc[id];
@@ -298,14 +298,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);
+ 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);
+ assertEquals(1, hits3.totalHits.value);
assertEquals(docID, hits3.scoreDocs[0].doc);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
----------------------------------------------------------------------
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 44ea74d..e3f42fc 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java
@@ -126,7 +126,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);
+ assertEquals("maxDoc: " + r.maxDoc(), 1, hits.totalHits.value);
Document doc = r.document(hits.scoreDocs[0].doc);
assertEquals(maxThread, doc.getField("thread").numericValue().intValue());
r.close();
@@ -270,7 +270,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);
+ assertEquals(1, hits.totalHits.value);
Document doc = r.document(hits.scoreDocs[0].doc);
int actualThreadID = doc.getField("thread").numericValue().intValue();
if (expectedThreadIDs[id] != actualThreadID) {
@@ -284,8 +284,8 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
}
assertEquals("id=" + id, expectedThreadIDs[id], actualThreadID);
}
- } else if (hits.totalHits != 0) {
- System.out.println("FAIL: id=" + id + " expectedThreadID=" + expectedThreadIDs[id] + " vs totalHits=" + hits.totalHits + " commitSeqNo=" + commitSeqNo + " numThreads=" + numThreads);
+ } else if (hits.totalHits.value != 0) {
+ System.out.println("FAIL: id=" + id + " expectedThreadID=" + expectedThreadIDs[id] + " vs totalHits=" + hits.totalHits.value + " commitSeqNo=" + commitSeqNo + " numThreads=" + numThreads);
for(int threadID=0;threadID<threadOps.size();threadID++) {
for(Operation op : threadOps.get(threadID)) {
if (id == op.id) {
@@ -293,7 +293,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
}
}
}
- assertEquals(0, hits.totalHits);
+ assertEquals(0, hits.totalHits.value);
}
}
w.close();
@@ -439,7 +439,7 @@ public class TestIndexingSequenceNumbers extends LuceneTestCase {
// We pre-add all ids up front:
assert expectedThreadIDs[id] != -1;
- assertEquals(1, hits.totalHits);
+ assertEquals(1, hits.totalHits.value);
int hitDoc = hits.scoreDocs[0].doc;
assertEquals(hitDoc, docValues.advance(hitDoc));
int actualThreadID = (int) docValues.longValue();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
----------------------------------------------------------------------
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 e3f34c0..9e5393d 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
@@ -434,7 +434,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
BinaryDocValues binaryIdValues = null;
for (LeafReaderContext c : reader.leaves()) {
TopDocs topDocs = new IndexSearcher(c.reader()).search(new TermQuery(new Term("id", "" + doc)), 10);
- if (topDocs.totalHits == 1) {
+ if (topDocs.totalHits.value == 1) {
assertNull(idValues);
assertNull(binaryIdValues);
idValues = c.reader().getNumericDocValues("id");
@@ -442,7 +442,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);
+ assertEquals(0, topDocs.totalHits.value);
}
}
@@ -513,7 +513,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
try {
Long value = values[i];
TopDocs topDocs = new IndexSearcher(reader).search(new TermQuery(new Term("id", "" + i)), 10);
- assertEquals(topDocs.totalHits, 1);
+ assertEquals(topDocs.totalHits.value, 1);
int docID = topDocs.scoreDocs[0].doc;
List<LeafReaderContext> leaves = reader.leaves();
int subIndex = ReaderUtil.subIndex(docID, leaves);
@@ -540,7 +540,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
do { // retry if we just committing a merge
try (DirectoryReader reader = writer.getReader()) {
TopDocs topDocs = new IndexSearcher(reader).search(new TermQuery(doc), 10);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
int theDoc = topDocs.scoreDocs[0].doc;
seqId = writer.tryUpdateDocValue(reader, theDoc, fields);
}
@@ -625,7 +625,7 @@ public class TestMixedDocValuesUpdates extends LuceneTestCase {
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs is_live = searcher.search(new DocValuesFieldExistsQuery("is_live"), 5);
- assertEquals(numHits, is_live.totalHits);
+ assertEquals(numHits, is_live.totalHits.value);
for (ScoreDoc doc : is_live.scoreDocs) {
int id = Integer.parseInt(reader.document(doc.doc).get("id"));
int i = ReaderUtil.subIndex(doc.doc, reader.leaves());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
----------------------------------------------------------------------
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 c6b9340..4c2b219 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
@@ -165,7 +165,7 @@ public class TestNumericDocValuesUpdates extends LuceneTestCase {
String id = "doc-" + expect.getKey();
TopFieldDocs td = searcher.search(new TermQuery(new Term("id", id)), 1,
new Sort(new SortField("val", SortField.Type.LONG)));
- assertEquals(id + " missing?", 1, td.totalHits);
+ assertEquals(id + " missing?", 1, td.totalHits.value);
assertEquals(id + " value", expect.getValue(), ((FieldDoc)td.scoreDocs[0]).fields[0]);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
----------------------------------------------------------------------
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 0c9f185..5eb1151 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java
@@ -86,7 +86,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);
+ assertEquals(1, hits.totalHits.value);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
Document hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
----------------------------------------------------------------------
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 10e714e..fbafc9b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
@@ -79,7 +79,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);
+ assertEquals(1, hits.totalHits.value);
doUpdate = w.tryDeleteDocument(r, hits.scoreDocs[0].doc) == -1;
if (VERBOSE) {
if (doUpdate) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
----------------------------------------------------------------------
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 f6c1f6c..909ee9c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
@@ -313,10 +313,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);
+ assertEquals(2, topDocs.totalHits.value);
assertEquals(Math.abs(topDocs.scoreDocs[0].doc - topDocs.scoreDocs[1].doc), 1);
} else {
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
}
}
writer.addDocument(new Document()); // add a dummy doc to trigger a segment here
@@ -355,13 +355,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 + " hits", seq_id.totalHits >= 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);
+ 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);
+ assertEquals(1, searcher.search(new TermQuery(new Term("id", id)), 10).totalHits.value);
}
}
IOUtils.close(reader, writer, dir);
@@ -595,7 +595,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
while (true) {
try (DirectoryReader reader = writer.getReader()) {
TopDocs topDocs = new IndexSearcher(new NoDeletesWrapper(reader)).search(new TermQuery(new Term("id", "1")), 1);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
if (writer.tryDeleteDocument(reader, topDocs.scoreDocs[0].doc) > 0) {
break;
}
@@ -635,7 +635,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
do { // retry if we just committing a merge
try (DirectoryReader reader = writer.getReader()) {
TopDocs topDocs = new IndexSearcher(new NoDeletesWrapper(reader)).search(new TermQuery(doc), 10);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
int theDoc = topDocs.scoreDocs[0].doc;
seqId = writer.tryUpdateDocValue(reader, theDoc, fields);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
----------------------------------------------------------------------
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 32becf3..100a177 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
@@ -108,9 +108,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);
+ assertEquals(1, hits.totalHits.value);
} else {
- assertEquals(0, hits.totalHits);
+ assertEquals(0, hits.totalHits.value);
}
}
r.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
----------------------------------------------------------------------
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 06aa277..25b9d38 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
@@ -340,11 +340,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 == 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 == 0) {
+ if (results.totalHits.value == 0) {
if (val == -1L) {
// expected... no doc was added yet
r.decRef();
@@ -354,17 +354,17 @@ public class TestStressNRT extends LuceneTestCase {
}
}
- if (results.totalHits == 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 != 1) {
+ if (results.totalHits.value != 1) {
System.out.println("FAIL: hits id:" + id + " val=" + val);
for(ScoreDoc sd : results.scoreDocs) {
final Document doc = r.document(sd.doc);
System.out.println(" docID=" + sd.doc + " id:" + doc.get("id") + " foundVal=" + doc.get(field));
}
- fail("id=" + id + " reader=" + r + " totalHits=" + results.totalHits);
+ fail("id=" + id + " reader=" + r + " totalHits=" + results.totalHits.value);
}
Document doc = searcher.doc(results.scoreDocs[0].doc);
long foundVal = Long.parseLong(doc.get(field));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
----------------------------------------------------------------------
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 561006f..0f0601a 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
@@ -83,7 +83,7 @@ public class TestTryDelete extends LuceneTestCase
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")),
100);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
long result;
if (random().nextBoolean()) {
@@ -111,7 +111,7 @@ public class TestTryDelete extends LuceneTestCase
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits);
+ assertEquals(0, topDocs.totalHits.value);
}
public void testTryDeleteDocumentCloseAndReopen ()
@@ -128,7 +128,7 @@ public class TestTryDelete extends LuceneTestCase
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")),
100);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
long result = writer.tryDeleteDocument(DirectoryReader.open(writer), 0);
@@ -144,7 +144,7 @@ public class TestTryDelete extends LuceneTestCase
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits);
+ assertEquals(0, topDocs.totalHits.value);
writer.close();
@@ -152,7 +152,7 @@ public class TestTryDelete extends LuceneTestCase
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits);
+ assertEquals(0, topDocs.totalHits.value);
}
@@ -170,7 +170,7 @@ public class TestTryDelete extends LuceneTestCase
TopDocs topDocs = searcher.search(new TermQuery(new Term("foo", "0")),
100);
- assertEquals(1, topDocs.totalHits);
+ assertEquals(1, topDocs.totalHits.value);
long result = writer.deleteDocuments(new TermQuery(new Term("foo", "0")));
@@ -186,6 +186,6 @@ public class TestTryDelete extends LuceneTestCase
topDocs = searcher.search(new TermQuery(new Term("foo", "0")), 100);
- assertEquals(0, topDocs.totalHits);
+ assertEquals(0, topDocs.totalHits.value);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java b/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java
index ee14c3b..9633ea4 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java
@@ -105,7 +105,7 @@ public class TermInSetQueryTest 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, td2.totalHits);
+ 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
----------------------------------------------------------------------
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 cfb1f5b..8fa443c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
@@ -89,7 +89,7 @@ public class TestAutomatonQuery extends LuceneTestCase {
if (VERBOSE) {
System.out.println("TEST: run aq=" + query);
}
- return searcher.search(query, 5).totalHits;
+ return searcher.search(query, 5).totalHits.value;
}
private void assertAutomatonHits(int expected, Automaton automaton)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
----------------------------------------------------------------------
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 4817036..ac25ce9 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
@@ -95,7 +95,7 @@ public class TestAutomatonQueryUnicode extends LuceneTestCase {
}
private long automatonQueryNrHits(AutomatonQuery query) throws IOException {
- return searcher.search(query, 5).totalHits;
+ return searcher.search(query, 5).totalHits.value;
}
private void assertAutomatonHits(int expected, Automaton automaton)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
----------------------------------------------------------------------
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 c1010c3..3b064e2 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java
@@ -108,7 +108,7 @@ public class TestBlendedTermQuery extends LuceneTestCase {
.build();
TopDocs topDocs = searcher.search(query, 20);
- assertEquals(11, topDocs.totalHits);
+ 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
----------------------------------------------------------------------
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 bc0531e..cb2d886 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 {
// sanity check expected num matches in bigSearcher
assertEquals(mulFactor * collector.totalHits,
- bigSearcher.search(query, 1).totalHits);
+ bigSearcher.search(query, 1).totalHits.value);
// now check 2 diff scorers from the bigSearcher as well
collector = TopScoreDocCollector.create(topDocsToCheck);
@@ -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);
TopDocs hits4 = bigSearcher.search(q3.build(), 1);
- assertEquals(mulFactor*collector.totalHits + NUM_EXTRA_DOCS/2, hits4.totalHits);
+ assertEquals(mulFactor*collector.totalHits + NUM_EXTRA_DOCS/2, hits4.totalHits.value);
// test diff (randomized) scorers produce the same results on bigSearcher as well
collector = TopFieldCollector.create(sort, 1000 * mulFactor, false);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
----------------------------------------------------------------------
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 1d01f9a..643b45d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
@@ -359,19 +359,19 @@ 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 > top1.totalHits) {
+ if (top2.totalHits.value > top1.totalHits.value) {
fail("Constrained results not a subset:\n"
+ CheckHits.topdocsString(top1,0,0)
+ CheckHits.topdocsString(top2,0,0)
+ "for query:" + q.toString());
}
- for (int hit=0; hit<top2.totalHits; 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; other++) {
+ for (int other=0; other<top1.totalHits.value; other++) {
if (top1.scoreDocs[other].doc == id) {
found=true;
float otherScore = top1.scoreDocs[other].score;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
----------------------------------------------------------------------
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 b9c3f10..d8273a5 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
@@ -53,7 +53,7 @@ public class TestBooleanOr extends LuceneTestCase {
private long search(Query q) throws IOException {
QueryUtils.check(random(), q,searcher);
- return searcher.search(q, 1000).totalHits;
+ return searcher.search(q, 1000).totalHits.value;
}
public void testElements() throws IOException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca05371/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
----------------------------------------------------------------------
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 8397d7c..d07bb7e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
@@ -202,7 +202,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);
+ assertEquals(1, s.search(q.build(), 10).totalHits.value);
// A required clause which returns null scorer should return null scorer to
// IndexSearcher.
@@ -210,12 +210,12 @@ 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);
+ 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);
+ assertEquals(1, s.search(dmq, 10).totalHits.value);
r.close();
w.close();
@@ -247,13 +247,13 @@ public class TestBooleanQuery extends LuceneTestCase {
MultiReader multireader = new MultiReader(reader1, reader2);
IndexSearcher searcher = newSearcher(multireader);
- assertEquals(0, searcher.search(query.build(), 10).totalHits);
+ 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);
+ assertEquals(0, searcher.search(query.build(), 10).totalHits.value);
es.shutdown();
es.awaitTermination(1, TimeUnit.SECONDS);
@@ -420,7 +420,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);
+ assertEquals(0, s.search(bq.build(), 1).totalHits.value);
r.close();
w.close();
dir.close();