Skip to content

Remove docID check from BlockDocValuesReader #133101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnhatn merged 1 commit into from
Aug 20, 2025
Merged

Remove docID check from BlockDocValuesReader #133101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 8 additions & 64 deletions server/src/main/java/org/elasticsearch/index/mapper/BlockDocValuesReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.io.IOException;

import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.COSINE_MAGNITUDE_FIELD_SUFFIX;
import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.ElementType.BYTE;

/**
* A reader that supports reading doc-values from a Lucene segment in Block fashion.
Expand Down Expand Up @@ -139,18 +138,13 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
}
}
try (BlockLoader.LongBuilder builder = factory.longsFromDocValues(docs.count() - offset)) {
int lastDoc = -1;
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < lastDoc) {
throw new IllegalStateException("docs within same block must be in order");
}
if (numericDocValues.advanceExact(doc)) {
builder.appendLong(numericDocValues.longValue());
} else {
builder.appendNull();
}
lastDoc = doc;
}
return builder.build();
}
Expand Down Expand Up @@ -179,7 +173,6 @@ public String toString() {

static class Longs extends BlockDocValuesReader {
private final SortedNumericDocValues numericDocValues;
private int docID = -1;

Longs(SortedNumericDocValues numericDocValues) {
this.numericDocValues = numericDocValues;
Expand All @@ -190,9 +183,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.LongBuilder builder = factory.longsFromDocValues(docs.count() - offset)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < this.docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
Expand All @@ -205,7 +195,6 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build
}

private void read(int doc, LongBuilder builder) throws IOException {
this.docID = doc;
if (false == numericDocValues.advanceExact(doc)) {
builder.appendNull();
return;
Expand All @@ -224,8 +213,7 @@ private void read(int doc, LongBuilder builder) throws IOException {

@Override
public int docId() {
// There is a .docID on the numericDocValues but it is often not implemented.
return docID;
return numericDocValues.docID();
}

@Override
Expand Down Expand Up @@ -274,18 +262,13 @@ private static class SingletonInts extends BlockDocValuesReader {
@Override
public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throws IOException {
try (BlockLoader.IntBuilder builder = factory.intsFromDocValues(docs.count() - offset)) {
int lastDoc = -1;
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < lastDoc) {
throw new IllegalStateException("docs within same block must be in order");
}
if (numericDocValues.advanceExact(doc)) {
builder.appendInt(Math.toIntExact(numericDocValues.longValue()));
} else {
builder.appendNull();
}
lastDoc = doc;
}
return builder.build();
}
Expand Down Expand Up @@ -314,7 +297,6 @@ public String toString() {

private static class Ints extends BlockDocValuesReader {
private final SortedNumericDocValues numericDocValues;
private int docID = -1;

Ints(SortedNumericDocValues numericDocValues) {
this.numericDocValues = numericDocValues;
Expand All @@ -325,9 +307,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.IntBuilder builder = factory.intsFromDocValues(docs.count() - offset)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < this.docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
Expand All @@ -340,7 +319,6 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build
}

private void read(int doc, IntBuilder builder) throws IOException {
this.docID = doc;
if (false == numericDocValues.advanceExact(doc)) {
builder.appendNull();
return;
Expand All @@ -359,8 +337,7 @@ private void read(int doc, IntBuilder builder) throws IOException {

@Override
public int docId() {
// There is a .docID on the numericDocValues but it is often not implemented.
return docID;
return numericDocValues.docID();
}

@Override
Expand Down Expand Up @@ -413,7 +390,6 @@ public AllReader reader(LeafReaderContext context) throws IOException {
private static class SingletonDoubles extends BlockDocValuesReader {
private final NumericDocValues docValues;
private final ToDouble toDouble;
private int docID = -1;

SingletonDoubles(NumericDocValues docValues, ToDouble toDouble) {
this.docValues = docValues;
Expand All @@ -423,29 +399,22 @@ private static class SingletonDoubles extends BlockDocValuesReader {
@Override
public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throws IOException {
try (BlockLoader.DoubleBuilder builder = factory.doublesFromDocValues(docs.count() - offset)) {
int lastDoc = -1;
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < lastDoc) {
throw new IllegalStateException("docs within same block must be in order");
}
if (docValues.advanceExact(doc)) {
builder.appendDouble(toDouble.convert(docValues.longValue()));
} else {
builder.appendNull();
}
lastDoc = doc;
this.docID = doc;
}
return builder.build();
}
}

@Override
public void read(int docId, BlockLoader.StoredFields storedFields, Builder builder) throws IOException {
this.docID = docId;
DoubleBuilder blockBuilder = (DoubleBuilder) builder;
if (docValues.advanceExact(this.docID)) {
if (docValues.advanceExact(docId)) {
blockBuilder.appendDouble(toDouble.convert(docValues.longValue()));
} else {
blockBuilder.appendNull();
Expand All @@ -454,7 +423,7 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build

@Override
public int docId() {
return docID;
return docValues.docID();
}

@Override
Expand All @@ -466,7 +435,6 @@ public String toString() {
private static class Doubles extends BlockDocValuesReader {
private final SortedNumericDocValues docValues;
private final ToDouble toDouble;
private int docID = -1;

Doubles(SortedNumericDocValues docValues, ToDouble toDouble) {
this.docValues = docValues;
Expand All @@ -478,9 +446,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.DoubleBuilder builder = factory.doublesFromDocValues(docs.count() - offset)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < this.docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
Expand All @@ -493,7 +458,6 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build
}

private void read(int doc, DoubleBuilder builder) throws IOException {
this.docID = doc;
if (false == docValues.advanceExact(doc)) {
builder.appendNull();
return;
Expand All @@ -512,7 +476,7 @@ private void read(int doc, DoubleBuilder builder) throws IOException {

@Override
public int docId() {
return docID;
return docValues.docID();
}

@Override
Expand Down Expand Up @@ -759,9 +723,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (var builder = factory.singletonOrdinalsBuilder(ordinals, docs.count() - offset, false)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < ordinals.docID()) {
throw new IllegalStateException("docs within same block must be in order");
}
if (ordinals.advanceExact(doc)) {
builder.appendOrd(ordinals.ordValue());
} else {
Expand Down Expand Up @@ -909,8 +870,6 @@ private static class BytesRefsFromBinary extends BlockDocValuesReader {
private final ByteArrayStreamInput in = new ByteArrayStreamInput();
private final BytesRef scratch = new BytesRef();

private int docID = -1;

BytesRefsFromBinary(BinaryDocValues docValues) {
this.docValues = docValues;
}
Expand All @@ -920,9 +879,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.BytesRefBuilder builder = factory.bytesRefs(docs.count() - offset)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
Expand All @@ -935,7 +891,6 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build
}

private void read(int doc, BytesRefBuilder builder) throws IOException {
this.docID = doc;
if (false == docValues.advanceExact(doc)) {
builder.appendNull();
return;
Expand Down Expand Up @@ -964,7 +919,7 @@ private void read(int doc, BytesRefBuilder builder) throws IOException {

@Override
public int docId() {
return docID;
return docValues.docID();
}

@Override
Expand Down Expand Up @@ -1014,7 +969,6 @@ private abstract static class AbstractDenseVectorFromBinary<T> extends BlockDocV
protected final IndexVersion indexVersion;
protected final int dimensions;
protected final T scratch;
protected int docID = -1;

AbstractDenseVectorFromBinary(BinaryDocValues docValues, int dims, IndexVersion indexVersion, T scratch) {
this.docValues = docValues;
Expand All @@ -1025,7 +979,7 @@ private abstract static class AbstractDenseVectorFromBinary<T> extends BlockDocV

@Override
public int docId() {
return docID;
return docValues.docID();
}

@Override
Expand All @@ -1038,17 +992,13 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.FloatBuilder builder = factory.denseVectors(docs.count() - offset, dimensions)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
}
}

private void read(int doc, BlockLoader.FloatBuilder builder) throws IOException {
this.docID = doc;
if (docValues.advanceExact(doc) == false) {
builder.appendNull();
return;
Expand Down Expand Up @@ -1191,7 +1141,6 @@ public String toString() {

private static class Booleans extends BlockDocValuesReader {
private final SortedNumericDocValues numericDocValues;
private int docID = -1;

Booleans(SortedNumericDocValues numericDocValues) {
this.numericDocValues = numericDocValues;
Expand All @@ -1202,9 +1151,6 @@ public BlockLoader.Block read(BlockFactory factory, Docs docs, int offset) throw
try (BlockLoader.BooleanBuilder builder = factory.booleansFromDocValues(docs.count() - offset)) {
for (int i = offset; i < docs.count(); i++) {
int doc = docs.get(i);
if (doc < this.docID) {
throw new IllegalStateException("docs within same block must be in order");
}
read(doc, builder);
}
return builder.build();
Expand All @@ -1217,7 +1163,6 @@ public void read(int docId, BlockLoader.StoredFields storedFields, Builder build
}

private void read(int doc, BooleanBuilder builder) throws IOException {
this.docID = doc;
if (false == numericDocValues.advanceExact(doc)) {
builder.appendNull();
return;
Expand All @@ -1236,8 +1181,7 @@ private void read(int doc, BooleanBuilder builder) throws IOException {

@Override
public int docId() {
// There is a .docID on the numericDocValues but it is often not implemented.
return docID;
return numericDocValues.docID();
}

@Override
Expand Down