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

LUCENE-7495: Fix doc values iterators' assertions in advance().

This commit is contained in:
Adrien Grand 2016-10-14 14:37:46 +02:00
parent 4744673388
commit ea1212232d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java
View File

@ -162,7 +162,9 @@ public class BlockJoinSelector {
return nextDoc();
}
int prevParentDocID = parents.prevSetBit(target-1);
values.advance(prevParentDocID+1);
if (values.docID() <= prevParentDocID) {
values.advance(prevParentDocID+1);
}
return nextDoc();
}

10
lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
View File

@ -423,7 +423,7 @@ public class AssertingLeafReader extends FilterLeafReader {
public int advance(int target) throws IOException {
assertThread("Numeric doc values", creationThread);
assert target >= 0;
assert target >= in.docID();
assert target > in.docID();
int docID = in.advance(target);
assert docID >= target;
assert docID == NO_MORE_DOCS || docID < maxDoc;
@ -488,7 +488,7 @@ public class AssertingLeafReader extends FilterLeafReader {
public int advance(int target) throws IOException {
assertThread("Binary doc values", creationThread);
assert target >= 0;
assert target >= in.docID();
assert target > in.docID();
int docID = in.advance(target);
assert docID >= target;
assert docID == NO_MORE_DOCS || docID < maxDoc;
@ -554,7 +554,7 @@ public class AssertingLeafReader extends FilterLeafReader {
public int advance(int target) throws IOException {
assertThread("Sorted doc values", creationThread);
assert target >= 0;
assert target >= in.docID();
assert target > in.docID();
int docID = in.advance(target);
assert docID >= target;
assert docID == NO_MORE_DOCS || docID < maxDoc;
@ -648,7 +648,7 @@ public class AssertingLeafReader extends FilterLeafReader {
public int advance(int target) throws IOException {
assertThread("Sorted numeric doc values", creationThread);
assert target >= 0;
assert target >= in.docID();
assert target > in.docID();
int docID = in.advance(target);
assert docID == in.docID();
assert docID >= target;
@ -720,7 +720,7 @@ public class AssertingLeafReader extends FilterLeafReader {
public int advance(int target) throws IOException {
assertThread("Sorted set doc values", creationThread);
assert target >= 0;
assert target >= in.docID();
assert target > in.docID();
int docID = in.advance(target);
assert docID == in.docID();
assert docID >= target;