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

LUCENE-4941: Sort the "from" terms only once when using JoinUtil. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1490697 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Martijn van Groningen 2013-06-07 15:56:40 +00:00
parent 051e0fda3d
commit 8e348ff90f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -147,6 +147,9 @@ Optimizations
* LUCENE-5035: Compress addresses in FieldCacheImpl.SortedDocValuesImpl more
efficiently. (Adrien Grand, Robert Muir)
* LUCENE-4941: Sort "from" terms only once when using JoinUtil.
(Martijn van Groningen)
New Features
* LUCENE-4766: Added a PatternCaptureGroupTokenFilter that uses Java regexes to

10
lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
View File

@ -38,6 +38,7 @@ import java.util.Comparator;
class TermsQuery extends MultiTermQuery {
private final BytesRefHash terms;
private final int[] ords;
private final Query fromQuery; // Used for equals() only
/**
@ -48,6 +49,7 @@ class TermsQuery extends MultiTermQuery {
super(field);
this.fromQuery = fromQuery;
this.terms = terms;
ords = terms.sort(BytesRef.getUTF8SortedAsUnicodeComparator());
}
@Override
@ -56,7 +58,7 @@ class TermsQuery extends MultiTermQuery {
return TermsEnum.EMPTY;
}
return new SeekingTermSetTermsEnum(terms.iterator(null), this.terms);
return new SeekingTermSetTermsEnum(terms.iterator(null), this.terms, ords);
}
@Override
@ -104,12 +106,12 @@ class TermsQuery extends MultiTermQuery {
private BytesRef seekTerm;
private int upto = 0;
SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms) {
SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms, int[] ords) {
super(tenum);
this.terms = terms;
this.ords = ords;
comparator = BytesRef.getUTF8SortedAsUnicodeComparator();
lastElement = terms.size() - 1;
ords = terms.sort(comparator = tenum.getComparator());
lastTerm = terms.get(ords[lastElement], new BytesRef());
seekTerm = terms.get(ords[upto], spare);
}