Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-03 14:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't assert warmed reader is live unless reader is NRT

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1346520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-06-05 18:45:00 +00:00
parent 1c39e5c147
commit 2b2140b2aa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
View File

@ -91,9 +91,9 @@ public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
writer.commit();
mgr = new SearcherManager(dir, factory);
isNRT = false;
assertMergedSegmentsWarmed = false;
}
lifetimeMGR = new SearcherLifetimeManager();
}

4
lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
View File

@ -344,7 +344,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
String source = diagnostics.get("source");
assertNotNull(source);
if (source.equals("merge")) {
assertTrue("sub reader " + sub + " wasn't warmed", warmed.containsKey(((SegmentReader) sub).core));
assertTrue("sub reader " + sub + " wasn't warmed: " + warmed, !assertMergedSegmentsWarmed || warmed.containsKey(((SegmentReader) sub).core));
}
}
if (s.getIndexReader().numDocs() > 0) {
@ -418,6 +418,8 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
protected void doClose() throws Exception {
}
protected boolean assertMergedSegmentsWarmed = true;
private final Map<SegmentCoreReaders,Boolean> warmed = new WeakHashMap<SegmentCoreReaders,Boolean>();
public void runTest(String testName) throws Exception {