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 2015/12/14 19:38:25 UTC
svn commit: r1719986 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/search/ControlledRealTimeReopenThread.java
test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
Author: mikemccand
Date: Mon Dec 14 18:38:25 2015
New Revision: 1719986
URL: http://svn.apache.org/viewvc?rev=1719986&view=rev
Log:
add getter for the current searching generation
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java?rev=1719986&r1=1719985&r2=1719986&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java Mon Dec 14 18:38:25 2015
@@ -181,7 +181,7 @@ public class ControlledRealTimeReopenThr
if (maxMS < 0) {
wait();
} else {
- long msLeft = (startMS + maxMS) - (System.nanoTime())/1000000;
+ long msLeft = (startMS + maxMS) - System.nanoTime()/1000000;
if (msLeft <= 0) {
return false;
} else {
@@ -248,4 +248,9 @@ public class ControlledRealTimeReopenThr
}
}
}
+
+ /** Returns which {@code generation} the current searcher is guaranteed to include. */
+ public long getSearchingGen() {
+ return searchingGen;
+ }
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java?rev=1719986&r1=1719985&r2=1719986&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java Mon Dec 14 18:38:25 2015
@@ -24,7 +24,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -103,6 +102,7 @@ public class TestControlledRealTimeReope
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
nrtDeletesThread.waitForGeneration(gen);
+ assertTrue(gen <= nrtDeletesThread.getSearchingGen());
final IndexSearcher s = nrtDeletes.acquire();
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: got searcher=" + s);
@@ -126,6 +126,7 @@ public class TestControlledRealTimeReope
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
nrtNoDeletesThread.waitForGeneration(gen);
+ assertTrue(gen <= nrtNoDeletesThread.getSearchingGen());
final IndexSearcher s = nrtNoDeletes.acquire();
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: got searcher=" + s);
@@ -149,6 +150,7 @@ public class TestControlledRealTimeReope
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
nrtNoDeletesThread.waitForGeneration(gen);
+ assertTrue(gen <= nrtNoDeletesThread.getSearchingGen());
final IndexSearcher s = nrtNoDeletes.acquire();
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: got searcher=" + s);
@@ -171,6 +173,7 @@ public class TestControlledRealTimeReope
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
nrtDeletesThread.waitForGeneration(gen);
+ assertTrue(gen <= nrtDeletesThread.getSearchingGen());
final IndexSearcher s = nrtDeletes.acquire();
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: got searcher=" + s);
@@ -193,6 +196,7 @@ public class TestControlledRealTimeReope
System.out.println(Thread.currentThread().getName() + ": nrt: verify del " + id);
}
nrtDeletesThread.waitForGeneration(gen);
+ assertTrue(gen <= nrtDeletesThread.getSearchingGen());
final IndexSearcher s = nrtDeletes.acquire();
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: got searcher=" + s);