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

LUCENE-7529: Fix argument checks of MultiDocValues' advanceExact impls.

This commit is contained in:
Adrien Grand 2016-10-31 10:34:48 +01:00
parent 2ad2fca416
commit 325b74e0e3
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
View File

@ -140,7 +140,7 @@ public class MultiDocValues {
@Override
public boolean advanceExact(int targetDocID) throws IOException {
if (targetDocID <= docID) {
if (targetDocID < docID) {
throw new IllegalArgumentException("can only advance beyond current document: on docID=" + docID + " but targetDocID=" + targetDocID);
}
int readerIndex = ReaderUtil.subIndex(targetDocID, leaves);
@ -266,7 +266,7 @@ public class MultiDocValues {
@Override
public boolean advanceExact(int targetDocID) throws IOException {
if (targetDocID <= docID) {
if (targetDocID < docID) {
throw new IllegalArgumentException("can only advance beyond current document: on docID=" + docID + " but targetDocID=" + targetDocID);
}
int readerIndex = ReaderUtil.subIndex(targetDocID, leaves);
@ -390,7 +390,7 @@ public class MultiDocValues {
@Override
public boolean advanceExact(int targetDocID) throws IOException {
if (targetDocID <= docID) {
if (targetDocID < docID) {
throw new IllegalArgumentException("can only advance beyond current document: on docID=" + docID + " but targetDocID=" + targetDocID);
}
int readerIndex = ReaderUtil.subIndex(targetDocID, leaves);
@ -525,7 +525,7 @@ public class MultiDocValues {
@Override
public boolean advanceExact(int targetDocID) throws IOException {
if (targetDocID <= docID) {
if (targetDocID < docID) {
throw new IllegalArgumentException("can only advance beyond current document: on docID=" + docID + " but targetDocID=" + targetDocID);
}
int readerIndex = ReaderUtil.subIndex(targetDocID, leaves);
@ -1007,7 +1007,7 @@ public class MultiDocValues {
@Override
public boolean advanceExact(int targetDocID) throws IOException {
if (targetDocID <= docID) {
if (targetDocID < docID) {
throw new IllegalArgumentException("can only advance beyond current document: on docID=" + docID + " but targetDocID=" + targetDocID);
}
int readerIndex = ReaderUtil.subIndex(targetDocID, docStarts);

19
lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
View File

@ -71,7 +71,8 @@ public class TestMultiDocValues extends LuceneTestCase {
assertEquals(single.longValue(), multi.longValue());
}
testRandomAdvance(merged.getNumericDocValues("numbers"), MultiDocValues.getNumericValues(ir, "numbers"));
testRandomAdvanceExact(merged.getNumericDocValues("numbers"), MultiDocValues.getNumericValues(ir, "numbers"), merged.maxDoc());
ir.close();
ir2.close();
dir.close();
@ -113,6 +114,7 @@ public class TestMultiDocValues extends LuceneTestCase {
assertEquals(expected, actual);
}
testRandomAdvance(merged.getBinaryDocValues("bytes"), MultiDocValues.getBinaryValues(ir, "bytes"));
testRandomAdvanceExact(merged.getBinaryDocValues("bytes"), MultiDocValues.getBinaryValues(ir, "bytes"), merged.maxDoc());
ir.close();
ir2.close();
@ -164,6 +166,7 @@ public class TestMultiDocValues extends LuceneTestCase {
assertEquals(single.ordValue(), multi.ordValue());
}
testRandomAdvance(merged.getSortedDocValues("bytes"), MultiDocValues.getSortedValues(ir, "bytes"));
testRandomAdvanceExact(merged.getSortedDocValues("bytes"), MultiDocValues.getSortedValues(ir, "bytes"), merged.maxDoc());
ir.close();
ir2.close();
dir.close();
@ -209,6 +212,7 @@ public class TestMultiDocValues extends LuceneTestCase {
assertEquals(expected, actual);
}
testRandomAdvance(merged.getSortedDocValues("bytes"), MultiDocValues.getSortedValues(ir, "bytes"));
testRandomAdvanceExact(merged.getSortedDocValues("bytes"), MultiDocValues.getSortedValues(ir, "bytes"), merged.maxDoc());
ir.close();
ir2.close();
@ -275,6 +279,7 @@ public class TestMultiDocValues extends LuceneTestCase {
}
}
testRandomAdvance(merged.getSortedSetDocValues("bytes"), MultiDocValues.getSortedSetValues(ir, "bytes"));
testRandomAdvanceExact(merged.getSortedSetDocValues("bytes"), MultiDocValues.getSortedSetValues(ir, "bytes"), merged.maxDoc());
ir.close();
ir2.close();
@ -341,7 +346,8 @@ public class TestMultiDocValues extends LuceneTestCase {
}
}
testRandomAdvance(merged.getSortedSetDocValues("bytes"), MultiDocValues.getSortedSetValues(ir, "bytes"));
testRandomAdvanceExact(merged.getSortedSetDocValues("bytes"), MultiDocValues.getSortedSetValues(ir, "bytes"), merged.maxDoc());
ir.close();
ir2.close();
dir.close();
@ -391,6 +397,7 @@ public class TestMultiDocValues extends LuceneTestCase {
}
}
testRandomAdvance(merged.getSortedNumericDocValues("nums"), MultiDocValues.getSortedNumericValues(ir, "nums"));
testRandomAdvanceExact(merged.getSortedNumericDocValues("nums"), MultiDocValues.getSortedNumericValues(ir, "nums"), merged.maxDoc());
ir.close();
ir2.close();
@ -410,4 +417,12 @@ public class TestMultiDocValues extends LuceneTestCase {
}
}
}
private void testRandomAdvanceExact(DocValuesIterator iter1, DocValuesIterator iter2, int maxDoc) throws IOException {
for (int target = random().nextInt(Math.min(maxDoc, 10)); target < maxDoc; target += random().nextInt(10)) {
final boolean exists1 = iter1.advanceExact(target);
final boolean exists2 = iter2.advanceExact(target);
assertEquals(exists1, exists2);
}
}
}