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

LUCENE-2440: add custom ExecutorService to ParallelMultiSearcher 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@946338 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-05-19 18:58:23 +00:00
parent 9f973b6988
commit 28a153babc
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -169,6 +169,10 @@ New features
process the payloads of the segments as they are merged (e.g. if one wants to process the payloads of the segments as they are merged (e.g. if one wants to
rewrite payloads of external indexes as they are added, or of local ones). rewrite payloads of external indexes as they are added, or of local ones).
(Shai Erera, Michael Busch, Mike McCandless) (Shai Erera, Michael Busch, Mike McCandless)
* LUCENE-2440: Add support for custom ExecutorService in
ParallelMultiSearcher (Edward Drapkin via Mike McCandless)
======================= Lucene 3.x (not yet released) ======================= ======================= Lucene 3.x (not yet released) =======================

14
lucene/src/java/org/apache/lucene/search/ParallelMultiSearcher.java
View File

@ -42,19 +42,25 @@ import org.apache.lucene.util.ThreadInterruptedException;
* or {@link #search(Query,Filter,int)} methods. * or {@link #search(Query,Filter,int)} methods.
*/ */
public class ParallelMultiSearcher extends MultiSearcher { public class ParallelMultiSearcher extends MultiSearcher {
private final ExecutorService executor; private final ExecutorService executor;
private final Searchable[] searchables; private final Searchable[] searchables;
private final int[] starts; private final int[] starts;
/** Creates a {@link Searchable} which searches <i>searchables</i>. */ /** Creates a {@link Searchable} which searches <i>searchables</i> with the default
* executor service (a cached thread pool). */
public ParallelMultiSearcher(Searchable... searchables) throws IOException { public ParallelMultiSearcher(Searchable... searchables) throws IOException {
this(Executors.newCachedThreadPool(new NamedThreadFactory(ParallelMultiSearcher.class.getSimpleName())), searchables);
}
/**
* Creates a {@link Searchable} which searches <i>searchables</i> with the specified ExecutorService.
*/
public ParallelMultiSearcher(ExecutorService executor, Searchable... searchables) throws IOException {
super(searchables); super(searchables);
this.searchables = searchables; this.searchables = searchables;
this.starts = getStarts(); this.starts = getStarts();
executor = Executors.newCachedThreadPool(new NamedThreadFactory(this.getClass().getSimpleName())); this.executor = executor;
} }
/** /**
* Executes each {@link Searchable}'s docFreq() in its own thread and waits for each search to complete and merge * Executes each {@link Searchable}'s docFreq() in its own thread and waits for each search to complete and merge
* the results back together. * the results back together.