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

improve comments; throw UOE from BS.freq() since it's not a doc-at-a-time scorer 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1384852 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-09-14 17:16:33 +00:00
parent 71a8203a06
commit 67141af6cd
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
View File

@ -332,7 +332,14 @@ public class BooleanQuery extends Query implements Iterable<BooleanClause> {
optional.add(subScorer);
}
}
// NOTE: we could also use BooleanScorer, if we knew
// this BooleanQuery was embedded in another
// BooleanQuery that was also using BooleanScorer (ie,
// BooleanScorer can nest). But this is hard to
// detect and we never do so today... (ie, we only
// return BooleanScorer for topScorer):
// Check if we can return a BooleanScorer
if (!scoreDocsInOrder && topScorer && required.size() == 0) {
return new BooleanScorer(this, disableCoord, minNrShouldMatch, optional, prohibited, maxCoord);

9
lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
View File

@ -254,7 +254,12 @@ final class BooleanScorer extends Scorer {
// clauses
//&& (current.bits & requiredMask) == requiredMask) {
// TODO: can we remove this?
// NOTE: Lucene always passes max =
// Integer.MAX_VALUE today, because we never embed
// a BooleanScorer inside another (even though
// that should work)... but in theory an outside
// app could pass a different max so we must check
// it:
if (current.doc >= max){
tmp = current;
current = current.next;
@ -318,7 +323,7 @@ final class BooleanScorer extends Scorer {
@Override
public float freq() throws IOException {
return current.coord;
throw new UnsupportedOperationException();
}
@Override