Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3558: Move SearcherManager, NRTManager, NRTCachingDirectory & SearcherLifetimeManager into core 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1200007 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Willnauer 2011-11-09 22:14:29 +00:00
parent 28b884350f
commit 8162656384
11 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -727,6 +727,9 @@ New Features
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
* LUCENE-3426: Add NGramPhraseQuery which extends PhraseQuery and tries to

3
lucene/contrib/CHANGES.txt
View File

@ -97,6 +97,9 @@ Changes in backwards compatibility policy
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
* LUCENE-1824: Add BoundaryScanner interface and its implementation classes,

12
lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java → lucene/src/java/org/apache/lucene/search/NRTManager.java
View File

@ -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.Condition;
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;

4
lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java → lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java
View File

@ -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.ThreadInterruptedException;
* reopenThread.close();
* manager.close();
* </pre>
*
* @lucene.experimental
*/
public class NRTManagerReopenThread extends Thread implements NRTManager.WaitingListener, Closeable {

4
lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java → lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
View File

@ -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 {

2
lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java → lucene/src/java/org/apache/lucene/search/SearcherManager.java
View File

@ -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;

2
lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java → lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
View File

@ -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

0
lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java → lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java
View File

13
lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java → lucene/src/test/org/apache/lucene/search/TestNRTManager.java
View File

@ -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.Analyzer;
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;

0
lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java → lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
View File

0
lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java → lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
View File