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 2011/11/06 14:52:59 UTC
svn commit: r1198371 - in /lucene/dev/trunk/lucene:
contrib/misc/src/java/org/apache/lucene/index/
contrib/misc/src/test/org/apache/lucene/index/
contrib/misc/src/test/org/apache/lucene/search/
src/test-framework/java/org/apache/lucene/index/
Author: mikemccand
Date: Sun Nov 6 13:52:58 2011
New Revision: 1198371
URL: http://svn.apache.org/viewvc?rev=1198371&view=rev
Log:
add a few asserts/checks, improve NRT tests
Modified:
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java?rev=1198371&r1=1198370&r2=1198371&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java Sun Nov 6 13:52:58 2011
@@ -222,6 +222,10 @@ public class NRTManager implements Close
*/
public SearcherManager waitForGeneration(long targetGen, boolean requireDeletes, long time, TimeUnit unit) {
try {
+ final long curGen = indexingGen.get();
+ if (targetGen > curGen) {
+ throw new IllegalArgumentException("targetGen=" + targetGen + " was never returned by this NRTManager instance (current gen=" + curGen + ")");
+ }
reopenLock.lockInterruptibly();
try {
if (targetGen > getCurrentSearchingGen(requireDeletes)) {
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java?rev=1198371&r1=1198370&r2=1198371&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java Sun Nov 6 13:52:58 2011
@@ -223,12 +223,16 @@ public class TestNRTManager extends Thre
@Override
protected IndexSearcher getCurrentSearcher() throws Exception {
- return nrt.getSearcherManager(false).acquire();
+ // Test doesn't assert deletions until the end, so we
+ // can randomize whether dels must be applied
+ return nrt.getSearcherManager(random.nextBoolean()).acquire();
}
@Override
protected void releaseSearcher(IndexSearcher s) throws Exception {
- nrt.getSearcherManager(false).release(s);
+ // Test doesn't assert deletions until the end, so we
+ // can randomize whether dels must be applied
+ nrt.getSearcherManager(random.nextBoolean()).release(s);
}
@Override
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1198371&r1=1198370&r2=1198371&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java Sun Nov 6 13:52:58 2011
@@ -74,6 +74,9 @@ public class TestSearcherManager extends
}
};
if (random.nextBoolean()) {
+ // TODO: can we randomize the applyAllDeletes? But
+ // somehow for final searcher we must apply
+ // deletes...
mgr = new SearcherManager(writer, true, warmer, es);
isNRT = true;
} else {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1198371&r1=1198370&r2=1198371&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Sun Nov 6 13:52:58 2011
@@ -477,7 +477,7 @@ public abstract class ThreadedIndexingAn
}
}
});
-
+
writer = new IndexWriter(dir, conf);
if (VERBOSE) {
writer.setInfoStream(System.out);
@@ -525,6 +525,9 @@ public abstract class ThreadedIndexingAn
if (VERBOSE) {
System.out.println("TEST: finalSearcher=" + s);
}
+
+ assertFalse(failed.get());
+
boolean doFail = false;
// Verify: make sure delIDs are in fact deleted: