Merge "Merge results from multiple Lucene subindexes"
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index 440bf63..6aecad9 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -17,7 +17,6 @@
import static com.google.gerrit.server.query.change.ChangeQueryBuilder.FIELD_CHANGE;
import static com.google.gerrit.server.query.change.IndexRewriteImpl.CLOSED_STATUSES;
import static com.google.gerrit.server.query.change.IndexRewriteImpl.OPEN_STATUSES;
-
import static org.apache.lucene.search.BooleanClause.Occur.MUST;
import static org.apache.lucene.search.BooleanClause.Occur.MUST_NOT;
import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
@@ -52,12 +51,17 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.SearcherManager;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -75,6 +79,9 @@
* other threads' searchers.
*/
public class LuceneChangeIndex implements ChangeIndex, LifecycleListener {
+ private static final Logger log =
+ LoggerFactory.getLogger(LuceneChangeIndex.class);
+
public static final Version LUCENE_VERSION = Version.LUCENE_43;
public static final String CHANGES_OPEN = "changes_open";
public static final String CHANGES_CLOSED = "changes_closed";
@@ -247,12 +254,23 @@
@Override
public ResultSet<ChangeData> read() throws OrmException {
+ IndexSearcher[] searchers = new IndexSearcher[indexes.size()];
try {
- List<ChangeData> result =
- Lists.newArrayListWithExpectedSize(2 * getCardinality());
- for (SubIndex index : indexes) {
- result.addAll(index.search(query, LIMIT));
+ TopDocs[] hits = new TopDocs[indexes.size()];
+ for (int i = 0; i < indexes.size(); i++) {
+ searchers[i] = indexes.get(i).acquire();
+ hits[i] = searchers[i].search(query, LIMIT);
}
+ TopDocs docs = TopDocs.merge(null, LIMIT, hits);
+
+ List<ChangeData> result =
+ Lists.newArrayListWithCapacity(docs.scoreDocs.length);
+ for (ScoreDoc sd : docs.scoreDocs) {
+ Document doc = searchers[sd.shardIndex].doc(sd.doc);
+ Number v = doc.getField(FIELD_CHANGE).numericValue();
+ result.add(new ChangeData(new Change.Id(v.intValue())));
+ }
+
final List<ChangeData> r = Collections.unmodifiableList(result);
return new ResultSet<ChangeData>() {
@Override
@@ -272,6 +290,16 @@
};
} catch (IOException e) {
throw new OrmException(e);
+ } finally {
+ for (int i = 0; i < indexes.size(); i++) {
+ if (searchers[i] != null) {
+ try {
+ indexes.get(i).release(searchers[i]);
+ } catch (IOException e) {
+ log.warn("cannot release Lucene searcher", e);
+ }
+ }
+ }
}
}
}
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
index 0a48519..96956c5 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
@@ -15,11 +15,6 @@
package com.google.gerrit.lucene;
import static com.google.gerrit.lucene.LuceneChangeIndex.LUCENE_VERSION;
-import static com.google.gerrit.server.query.change.ChangeQueryBuilder.FIELD_CHANGE;
-
-import com.google.common.collect.Lists;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.server.query.change.ChangeData;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
@@ -28,8 +23,6 @@
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.SearcherManager;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
@@ -38,8 +31,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
/** Piece of the change index that is implemented as a separate Lucene index. */
class SubIndex {
@@ -92,20 +83,12 @@
commit();
}
- List<ChangeData> search(Query query, int limit) throws IOException {
- IndexSearcher searcher = searcherManager.acquire();
- try {
- ScoreDoc[] docs = searcher.search(query, limit).scoreDocs;
- List<ChangeData> result = Lists.newArrayListWithCapacity(docs.length);
- for (ScoreDoc sd : docs) {
- Document doc = searcher.doc(sd.doc);
- Number v = doc.getField(FIELD_CHANGE).numericValue();
- result.add(new ChangeData(new Change.Id(v.intValue())));
- }
- return Collections.unmodifiableList(result);
- } finally {
- searcherManager.release(searcher);
- }
+ IndexSearcher acquire() throws IOException {
+ return searcherManager.acquire();
+ }
+
+ void release(IndexSearcher searcher) throws IOException {
+ searcherManager.release(searcher);
}
private void commit() throws IOException {
