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/08/05 20:46:21 UTC
[2/2] lucene-solr:master: LUCENE-8060: Fix test bug.
LUCENE-8060: Fix test bug.
Should use IndexSearcher#count to get accurate counts.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3b15be37
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3b15be37
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3b15be37
Branch: refs/heads/master
Commit: 3b15be378101ddd1e6f4529f6b02694128fb9ae4
Parents: fb7fce8
Author: Adrien Grand <jp...@gmail.com>
Authored: Sun Aug 5 22:41:02 2018 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Sun Aug 5 22:41:02 2018 +0200
----------------------------------------------------------------------
.../apache/lucene/index/TestIndexWriterReader.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3b15be37/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 de05b20..f5bf9c0 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
@@ -32,7 +32,6 @@ import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException;
@@ -700,7 +699,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.value);
+ assertEquals(100, searcher.count(q));
expectThrows(AlreadyClosedException.class, () -> {
DirectoryReader.openIfChanged(r);
@@ -768,7 +767,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.value;
+ final long count = searcher.count(q);
assertTrue(count >= lastCount);
lastCount = count;
}
@@ -785,7 +784,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.value;
+ final long count = searcher.count(q);
assertTrue(count >= lastCount);
assertEquals(0, excs.size());
@@ -865,7 +864,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.value;
+ sum += searcher.count(q);
}
}
@@ -880,7 +879,7 @@ public class TestIndexWriterReader extends LuceneTestCase {
}
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
- sum += searcher.search(q, 10).totalHits.value;
+ sum += searcher.count(q);
assertTrue("no documents found at all", sum > 0);
assertEquals(0, excs.size());
@@ -965,8 +964,8 @@ public class TestIndexWriterReader extends LuceneTestCase {
.setReaderPooling(true)
.setMergedSegmentWarmer((r) -> {
IndexSearcher s = newSearcher(r);
- TopDocs hits = s.search(new TermQuery(new Term("foo", "bar")), 10);
- assertEquals(20, hits.totalHits.value);
+ int count = s.count(new TermQuery(new Term("foo", "bar")));
+ assertEquals(20, count);
didWarm.set(true);
})
.setMergePolicy(newLogMergePolicy(10))