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/09 23:14:29 UTC
svn commit: r1200007 - in /lucene/dev/trunk/lucene: ./ contrib/ contrib/misc/src/java/org/apache/lucene/index/ contrib/misc/src/java/org/apache/lucene/search/ contrib/misc/src/java/org/apache/lucene/store/ contrib/misc/src/test/org/apache/lucene/index/...

Author: simonw
Date: Wed Nov  9 22:14:29 2011
New Revision: 1200007

URL: http://svn.apache.org/viewvc?rev=1200007&view=rev
Log:
LUCENE-3558: Move SearcherManager, NRTManager, NRTCachingDirectory & SearcherLifetimeManager into core

Added:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java
      - copied unchanged from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java
      - copied, changed from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
      - copied unchanged from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
      - copied unchanged from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Removed:
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.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/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/contrib/CHANGES.txt

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1200007&r1=1200006&r2=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Wed Nov  9 22:14:29 2011
@@ -726,6 +726,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/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1200007&r1=1200006&r2=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Wed Nov  9 22:14:29 2011
@@ -96,6 +96,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)
 
 New Features
 

Copied: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java?p2=lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java Wed Nov  9 22:14:29 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
@@ -28,11 +28,11 @@ import java.util.concurrent.locks.Condit
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.IndexReader; // javadocs
-import org.apache.lucene.search.IndexSearcher; // javadocs
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.SearcherManager;
-import org.apache.lucene.search.SearcherWarmer;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.NRTManagerReopenThread;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.ThreadInterruptedException;
 

Copied: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java?p2=lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java Wed Nov  9 22:14:29 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/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java?p2=lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java Wed Nov  9 22:14:29 2011
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.lucene.index.NRTManager;        // javadocs
+import org.apache.lucene.search.NRTManager;        // javadocs
 import org.apache.lucene.index.IndexReader;        // javadocs
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.util.IOUtils;
@@ -94,6 +94,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/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java?p2=lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java Wed Nov  9 22:14:29 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/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java?p2=lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java Wed Nov  9 22:14:29 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
 
 /** Pass an implementation of this to {@link NRTManager} or
  *  {@link SearcherManager} to warm a new {@link

Copied: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java (from r1199988, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java?p2=lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java&p1=lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java&r1=1199988&r2=1200007&rev=1200007&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java Wed Nov  9 22:14:29 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
@@ -27,10 +27,13 @@ import org.apache.lucene.analysis.Analyz
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.TextField;
-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.IndexableField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase;
+import org.apache.lucene.search.NRTManagerReopenThread;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.LockObtainFailedException;
 import org.apache.lucene.store.NRTCachingDirectory;