You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/11/10 00:23:15 UTC
svn commit: r1200036 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/test/ lucene/contrib/
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/java/org/apache/lucene/search/
lucene/contrib/misc/src/java/or...
Author: simonw
Date: Wed Nov 9 23:23:14 2011
New Revision: 1200036
URL: http://svn.apache.org/viewvc?rev=1200036&view=rev
Log:
LUCENE-3558: Move SearcherManager, NRTManager, NRTCachingDirectory & SearcherLifetimeManager into core
Added:
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManager.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherManager.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java
- copied unchanged from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNRTManager.java
- copied, changed from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
- copied unchanged from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
- copied unchanged from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Removed:
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/java/org/apache/lucene/index/NRTManagerReopenThread.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.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/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1200036&r1=1200035&r2=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Wed Nov 9 23:23:14 2011
@@ -107,6 +107,9 @@ New Features
for more efficient storage of int arrays when the values are
bounded, for example for storing the terms dict index (Toke
Eskildsen via Mike McCandless)
+
+* LUCENE-3558: Moved SearcherManager, NRTManager & SearcherLifetimeManager into
+ core. All classes are contained in o.a.l.search. (Simon Willnauer)
Optimizations
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=1200036&r1=1200035&r2=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Wed Nov 9 23:23:14 2011
@@ -20,6 +20,9 @@ Changes in backwards compatibility polic
Previously, there was no way to specify an IndexWriterConfig, and some
of these methods would sneakily pass 'true' to optimize. (Robert Muir)
+
+ * LUCENE-3558: Moved NRTManager & NRTManagerReopenThread into lucene core
+ o.a.l.search. (Simon Willnauer)
* LUCENE-3552: Renamed LuceneTaxonomyReader/Writer to DirectoryTR/TW. (Shai Erera)
Copied: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManager.java (from r1200007, 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/src/java/org/apache/lucene/search/NRTManager.java?p2=lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManager.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java&r1=1200007&r2=1200036&rev=1200036&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/src/java/org/apache/lucene/search/NRTManager.java Wed Nov 9 23:23:14 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.index;
+package org.apache.lucene.search;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +31,8 @@ import java.util.concurrent.locks.Reentr
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader; // javadocs
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher; // javadocs
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SearcherManager;
Copied: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java (from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java?p2=lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java&r1=1200007&r2=1200036&rev=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java Wed Nov 9 23:23:14 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.index;
+package org.apache.lucene.search;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +77,8 @@ import org.apache.lucene.util.ThreadInte
* reopenThread.close();
* manager.close();
* </pre>
+ *
+ * @lucene.experimental
*/
public class NRTManagerReopenThread extends Thread implements NRTManager.WaitingListener, Closeable {
Copied: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java?p2=lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java&r1=1200007&r2=1200036&rev=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java Wed Nov 9 23:23:14 2011
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.TimeUnit;
import org.apache.lucene.index.IndexReader; // javadocs
-import org.apache.lucene.index.NRTManager; // javadocs
+import org.apache.lucene.search.NRTManager; // javadocs
import org.apache.lucene.search.IndexSearcher; // javadocs
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.util.IOUtils;
@@ -95,6 +95,8 @@ import org.apache.lucene.util.IOUtils;
* it's unlikely you'll hit two of them in your expiration
* window. Still you should budget plenty of heap in the
* JVM to have a good safety margin.
+ *
+ * @lucene.experimental
*/
public class SearcherLifetimeManager implements Closeable {
Copied: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherManager.java (from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherManager.java?p2=lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherManager.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java&r1=1200007&r2=1200036&rev=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherManager.java Wed Nov 9 23:23:14 2011
@@ -24,7 +24,7 @@ import java.util.concurrent.Semaphore;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.NRTManager; // javadocs
+import org.apache.lucene.search.NRTManager; // javadocs
import org.apache.lucene.search.IndexSearcher; // javadocs
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
Copied: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java (from r1200007, lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java?p2=lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java&r1=1200007&r2=1200036&rev=1200036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java Wed Nov 9 23:23:14 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.NRTManager; // javadocs
+import org.apache.lucene.search.NRTManager; // javadocs
import org.apache.lucene.search.IndexSearcher; // javadocs
/** Pass an implementation of this to {@link NRTManager} or
Copied: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNRTManager.java (from r1200007, 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/src/test/org/apache/lucene/search/TestNRTManager.java?p2=lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNRTManager.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java&r1=1200007&r2=1200036&rev=1200036&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/src/test/org/apache/lucene/search/TestNRTManager.java Wed Nov 9 23:23:14 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.index;
+package org.apache.lucene.search;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,15 +23,16 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.lucene.document.Document;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.SearcherManager;
-import org.apache.lucene.search.SearcherWarmer;
-import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.NRTCachingDirectory;