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

LUCENE-1145: small improvements to DisjunctionSumScorer 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@755639 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2009-03-18 16:44:50 +00:00
parent cd5028b79a
commit 7004e8c042
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/lucene/search/BooleanScorer2.java
View File

@ -178,7 +178,7 @@ class BooleanScorer2 extends Scorer {
}
private Scorer countingDisjunctionSumScorer(final List scorers,
int minNrShouldMatch)
int minNrShouldMatch) throws IOException
// each scorer from the list counted as a single matcher
{
return new DisjunctionSumScorer(scorers, minNrShouldMatch) {
@ -286,7 +286,7 @@ class BooleanScorer2 extends Scorer {
* Uses the given required scorer and the prohibitedScorers.
* @param requiredCountingSumScorer A required scorer already built.
*/
private Scorer addProhibitedScorers(Scorer requiredCountingSumScorer)
private Scorer addProhibitedScorers(Scorer requiredCountingSumScorer) throws IOException
{
return (prohibitedScorers.size() == 0)
? requiredCountingSumScorer // no prohibited

28
src/java/org/apache/lucene/search/DisjunctionSumScorer.java
View File

@ -49,8 +49,7 @@ class DisjunctionSumScorer extends Scorer {
* <code>nrMatchers</code> is the number of matching scorers,
* and all scorers are after the matching doc, or are exhausted.
*/
private ScorerDocQueue scorerDocQueue = null;
private int queueSize = -1; // used to avoid size() method calls on scorerDocQueue
private ScorerDocQueue scorerDocQueue;
/** The document number of the current match. */
private int currentDoc = -1;
@ -70,7 +69,7 @@ class DisjunctionSumScorer extends Scorer {
* <br>When minimumNrMatchers equals the number of subScorers,
* it more efficient to use <code>ConjunctionScorer</code>.
*/
public DisjunctionSumScorer( List subScorers, int minimumNrMatchers) {
public DisjunctionSumScorer( List subScorers, int minimumNrMatchers) throws IOException {
super(null);
nrScorers = subScorers.size();
@ -84,12 +83,14 @@ class DisjunctionSumScorer extends Scorer {
this.minimumNrMatchers = minimumNrMatchers;
this.subScorers = subScorers;
initScorerDocQueue();
}
/** Construct a <code>DisjunctionScorer</code>, using one as the minimum number
* of matching subscorers.
*/
public DisjunctionSumScorer(List subScorers) {
public DisjunctionSumScorer(List subScorers) throws IOException {
this(subScorers, 1);
}
@ -99,13 +100,10 @@ class DisjunctionSumScorer extends Scorer {
private void initScorerDocQueue() throws IOException {
Iterator si = subScorers.iterator();
scorerDocQueue = new ScorerDocQueue(nrScorers);
queueSize = 0;
while (si.hasNext()) {
Scorer se = (Scorer) si.next();
if (se.next()) { // doc() method will be used in scorerDocQueue.
if (scorerDocQueue.insert(se)) {
queueSize++;
}
scorerDocQueue.insert(se);
}
}
}
@ -140,9 +138,6 @@ class DisjunctionSumScorer extends Scorer {
}
public boolean next() throws IOException {
if (scorerDocQueue == null) {
initScorerDocQueue();
}
return (scorerDocQueue.size() >= minimumNrMatchers)
&& advanceAfterCurrent();
}
@ -173,7 +168,7 @@ class DisjunctionSumScorer extends Scorer {
nrMatchers = 1;
do { // Until all subscorers are after currentDoc
if (! scorerDocQueue.topNextAndAdjustElsePop()) {
if (--queueSize == 0) {
if (scorerDocQueue.size() == 0) {
break; // nothing more to advance, check for last match.
}
}
@ -186,7 +181,7 @@ class DisjunctionSumScorer extends Scorer {
if (nrMatchers >= minimumNrMatchers) {
return true;
} else if (queueSize < minimumNrMatchers) {
} else if (scorerDocQueue.size() < minimumNrMatchers) {
return false;
}
} while (true);
@ -214,10 +209,7 @@ class DisjunctionSumScorer extends Scorer {
* @return true iff there is such a match.
*/
public boolean skipTo(int target) throws IOException {
if (scorerDocQueue == null) {
initScorerDocQueue();
}
if (queueSize < minimumNrMatchers) {
if (scorerDocQueue.size() < minimumNrMatchers) {
return false;
}
if (target <= currentDoc) {
@ -227,7 +219,7 @@ class DisjunctionSumScorer extends Scorer {
if (scorerDocQueue.topDoc() >= target) {
return advanceAfterCurrent();
} else if (! scorerDocQueue.topSkipToAndAdjustElsePop(target)) {
if (--queueSize < minimumNrMatchers) {
if (scorerDocQueue.size() < minimumNrMatchers) {
return false;
}
}