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 15:03:45 UTC
svn commit: r1198372 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/test/
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/test/org/apache/lucene/index/
lucene/contrib/misc/src/test/org/apache/lucene/s...
Author: mikemccand
Date: Sun Nov 6 14:03:44 2011
New Revision: 1198372
URL: http://svn.apache.org/viewvc?rev=1198372&view=rev
Log:
add a few asserts/checks, improve NRT tests
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java?rev=1198372&r1=1198371&r2=1198372&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java Sun Nov 6 14:03:44 2011
@@ -224,6 +224,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/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java?rev=1198372&r1=1198371&r2=1198372&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java Sun Nov 6 14:03:44 2011
@@ -222,12 +222,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/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1198372&r1=1198371&r2=1198372&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java Sun Nov 6 14:03:44 2011
@@ -71,6 +71,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/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1198372&r1=1198371&r2=1198372&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Sun Nov 6 14:03:44 2011
@@ -467,7 +467,7 @@ public abstract class ThreadedIndexingAn
}
}
});
-
+
writer = new IndexWriter(dir, conf);
if (VERBOSE) {
writer.setInfoStream(System.out);
@@ -515,6 +515,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: