You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/06/05 20:46:25 UTC
svn commit: r1346522 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/test/org/apache/lucene/search/
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/index/
Author: mikemccand
Date: Tue Jun 5 18:46:24 2012
New Revision: 1346522
URL: http://svn.apache.org/viewvc?rev=1346522&view=rev
Log:
don't assert warmed reader is live unless reader is NRT
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1346522&r1=1346521&r2=1346522&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java Tue Jun 5 18:46:24 2012
@@ -91,8 +91,8 @@ public class TestSearcherManager extends
writer.commit();
mgr = new SearcherManager(dir, factory);
isNRT = false;
+ assertMergedSegmentsWarmed = false;
}
-
lifetimeMGR = new SearcherLifetimeManager();
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1346522&r1=1346521&r2=1346522&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Tue Jun 5 18:46:24 2012
@@ -344,7 +344,7 @@ public abstract class ThreadedIndexingAn
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 ThreadedIndexingAn
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 {