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

LUCENE-10598: Use count to record docValueCount similar to SortedNumericDocValues did (#942)

This commit is contained in:
Lu Xugang 2022-06-14 13:03:19 +08:00 committed by GitHub
parent 76d418676e
commit 7504b0a258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java
View File

@ -1560,8 +1560,8 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
return new BaseSortedSetDocValues(entry, data) {
int doc = -1;
long start;
long end;
long start, end;
long count;
@Override
public int nextDoc() throws IOException {
@ -1585,6 +1585,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
}
start = addresses.get(target);
end = addresses.get(target + 1L);
count = (end - start);
return doc = target;
}
@ -1592,6 +1593,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
public boolean advanceExact(int target) throws IOException {
start = addresses.get(target);
end = addresses.get(target + 1L);
count = (end - start);
doc = target;
return true;
}
@ -1606,7 +1608,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
@Override
public long docValueCount() {
return end - start;
return count;
}
};
} else {
@ -1624,6 +1626,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
boolean set;
long start;
long end = 0;
long count;
@Override
public int nextDoc() throws IOException {
@ -1658,6 +1661,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
final int index = disi.index();
start = addresses.get(index);
end = addresses.get(index + 1L);
count = end - start;
set = true;
return true;
}
@ -1678,7 +1682,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
@Override
public long docValueCount() {
set();
return end - start;
return count;
}
};
}

15
lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
View File

@ -3357,6 +3357,14 @@ public final class CheckIndex implements Closeable {
long ord;
int ordCount = 0;
while ((ord = dv.nextOrd()) != SortedSetDocValues.NO_MORE_ORDS) {
if (count != dv.docValueCount()) {
throw new CheckIndexException(
"value count changed from "
+ count
+ " to "
+ dv.docValueCount()
+ " during iterating over all values");
}
long ord2 = dv2.nextOrd();
if (ord != ord2) {
throw new CheckIndexException(
@ -3374,6 +3382,13 @@ public final class CheckIndex implements Closeable {
seenOrds.set(ord);
ordCount++;
}
if (dv.docValueCount() != dv2.docValueCount()) {
throw new CheckIndexException(
"dv and dv2 report different values count after iterating over all values: "
+ dv.docValueCount()
+ " != "
+ dv2.docValueCount());
}
if (ordCount == 0) {
throw new CheckIndexException(
"dv for field: " + fieldName + " returned docID=" + docID + " yet has no ordinals");