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

LUCENE-5140: Fixed performance regression of span queries caused by LUCENE-4946. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1508757 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrien Grand 2013-07-31 07:51:41 +00:00
parent ecf245459b
commit 1d603a9f87
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -153,6 +153,9 @@ Optimizations
* LUCENE-5145: All Appending*Buffer now support bulk get. * LUCENE-5145: All Appending*Buffer now support bulk get.
(Boaz Leskes via Adrien Grand) (Boaz Leskes via Adrien Grand)
* LUCENE-5140: Fixed a performance regression of span queries caused by
LUCENE-4946. (Alan Woodward, Adrien Grand)
Documentation Documentation
* LUCENE-4894: remove facet userguide as it was outdated. Partially absorbed into * LUCENE-4894: remove facet userguide as it was outdated. Partially absorbed into

17
lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
View File

@ -22,6 +22,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext; import org.apache.lucene.index.TermContext;
import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.util.InPlaceMergeSorter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -72,13 +73,19 @@ public class NearSpansOrdered extends Spans {
private List<byte[]> matchPayload; private List<byte[]> matchPayload;
private final Spans[] subSpansByDoc; private final Spans[] subSpansByDoc;
private final Comparator<Spans> spanDocComparator = new Comparator<Spans>() { // Even though the array is probably almost sorted, InPlaceMergeSorter will likely
// perform better since it has a lower overhead than TimSorter for small arrays
private final InPlaceMergeSorter sorter = new InPlaceMergeSorter() {
@Override @Override
public int compare(Spans o1, Spans o2) { protected void swap(int i, int j) {
return o1.doc() - o2.doc(); ArrayUtil.swap(subSpansByDoc, i, j);
}
@Override
protected int compare(int i, int j) {
return subSpansByDoc[i].doc() - subSpansByDoc[j].doc();
} }
}; };
private SpanNearQuery query; private SpanNearQuery query;
private boolean collectPayloads = true; private boolean collectPayloads = true;
@ -204,7 +211,7 @@ public class NearSpansOrdered extends Spans {
/** Advance the subSpans to the same document */ /** Advance the subSpans to the same document */
private boolean toSameDoc() throws IOException { private boolean toSameDoc() throws IOException {
ArrayUtil.timSort(subSpansByDoc, spanDocComparator); sorter.sort(0, subSpansByDoc.length);
int firstIndex = 0; int firstIndex = 0;
int maxDoc = subSpansByDoc[subSpansByDoc.length - 1].doc(); int maxDoc = subSpansByDoc[subSpansByDoc.length - 1].doc();
while (subSpansByDoc[firstIndex].doc() != maxDoc) { while (subSpansByDoc[firstIndex].doc() != maxDoc) {