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

LUCENE-9566 TestApproximationSearchEquivalence.testExclusion fix (#1955)

This commit is contained in:
Mayya Sharipova 2020-10-07 07:02:46 -04:00 committed by GitHub
parent 2a8136b3fd
commit 0b08943112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lucene/core/src/java/org/apache/lucene/search/Weight.java
View File

@ -210,7 +210,7 @@ public abstract class Weight implements SegmentCacheable {
} else { } else {
if (scorerIterator.docID() != -1) { if (scorerIterator.docID() != -1) {
// Wrap ScorerIterator to start from -1 for conjunction // Wrap ScorerIterator to start from -1 for conjunction
scorerIterator = new RangeDISIWrapper(scorerIterator, max); scorerIterator = new StartDISIWrapper(scorerIterator);
} }
// filter scorerIterator to keep only competitive docs as defined by collector // filter scorerIterator to keep only competitive docs as defined by collector
filteredIterator = ConjunctionDISI.intersectIterators(Arrays.asList(scorerIterator, collectorIterator)); filteredIterator = ConjunctionDISI.intersectIterators(Arrays.asList(scorerIterator, collectorIterator));
@ -277,16 +277,14 @@ public abstract class Weight implements SegmentCacheable {
/** /**
* Wraps an internal docIdSetIterator for it to start with docID = -1 * Wraps an internal docIdSetIterator for it to start with docID = -1
*/ */
protected static class RangeDISIWrapper extends DocIdSetIterator { protected static class StartDISIWrapper extends DocIdSetIterator {
private final DocIdSetIterator in; private final DocIdSetIterator in;
private final int min; private final int min;
private final int max;
private int docID = -1; private int docID = -1;
public RangeDISIWrapper(DocIdSetIterator in, int max) { public StartDISIWrapper(DocIdSetIterator in) {
this.in = in; this.in = in;
this.min = in.docID(); this.min = in.docID();
this.max = max;
} }
@Override @Override
@ -301,16 +299,15 @@ public abstract class Weight implements SegmentCacheable {
@Override @Override
public int advance(int target) throws IOException { public int advance(int target) throws IOException {
target = Math.max(min, target); if (target <= min) {
if (target >= max) { return docID = min;
return docID = NO_MORE_DOCS;
} }
return docID = in.advance(target); return docID = in.advance(target);
} }
@Override @Override
public long cost() { public long cost() {
return Math.min(max - min, in.cost()); return in.cost();
} }
} }

1
lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java
View File

@ -196,7 +196,6 @@ public class TestApproximationSearchEquivalence extends SearchEquivalenceTestBas
assertSameScores(bq1.build(), bq2.build()); assertSameScores(bq1.build(), bq2.build());
} }
@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-9566")
public void testExclusion() throws Exception { public void testExclusion() throws Exception {
Term t1 = randomTerm(); Term t1 = randomTerm();
Term t2 = randomTerm(); Term t2 = randomTerm();