You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/07/28 04:49:54 UTC
[31/50] [abbrv] lucene-solr:jira/solr-11990: LUCENE-8427: Fix bug in
BlockMaxConjunctionScorer.
LUCENE-8427: Fix bug in BlockMaxConjunctionScorer.
In case a scorer would return information about a block that doesn't contain
any matches, BlockMaxConjunctionScorer could use invalid score bounds. This
would never occur when building a conjunction of term queries but possibly when
building a conjunction of phrase queries for instance.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/65f6e6c1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/65f6e6c1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/65f6e6c1
Branch: refs/heads/jira/solr-11990
Commit: 65f6e6c1501b3fd075ca586dd9bd49850514d234
Parents: 35fa0b4
Author: Adrien Grand <jp...@gmail.com>
Authored: Wed Jul 25 10:57:11 2018 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Wed Jul 25 10:57:11 2018 +0200
----------------------------------------------------------------------
.../lucene/search/BlockMaxConjunctionScorer.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/65f6e6c1/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionScorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionScorer.java b/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionScorer.java
index bb5d99c..cbfcd2e 100644
--- a/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/BlockMaxConjunctionScorer.java
@@ -145,6 +145,20 @@ final class BlockMaxConjunctionScorer extends Scorer {
return NO_MORE_DOCS;
}
+ if (doc > upTo) {
+ // This check is useful when scorers return information about blocks
+ // that do not actually have any matches. Otherwise `doc` will always
+ // be in the current block already since it is always the result of
+ // lead.advance(advanceTarget(some_doc_id))
+ final int nextTarget = advanceTarget(doc);
+ if (nextTarget != doc) {
+ doc = lead.advance(nextTarget);
+ continue;
+ }
+ }
+
+ assert doc <= upTo;
+
if (minScore > 0) {
score = leadScorer.score();
if (score < minScores[0]) {