Skip to content

Check if merge is aborted during file integrity checksums #16281

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

Open
tlrx wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Check if merge is aborted during file integrity checksums #16281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc19e7
Check if merge is aborted during file integrity checksums
tlrx Jun 22, 2026
9bb4865
Merge branch 'main' into abort-check-in-checksum-entire-file
tlrx Jun 24, 2026
73aa8b9
checkIntegrity
tlrx Jun 24, 2026
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
9 changes: 5 additions & 4 deletions ...-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/Lucene101PostingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.store.ByteArrayDataInput;
Expand Down Expand Up @@ -1404,15 +1405,15 @@ static FreqAndNormBuffer readImpacts(ByteArrayDataInput in, FreqAndNormBuffer re
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
if (docIn != null) {
CodecUtil.checksumEntireFile(docIn);
CodecUtil.checksumEntireFile(docIn, merge);
}
if (posIn != null) {
CodecUtil.checksumEntireFile(posIn);
CodecUtil.checksumEntireFile(posIn, merge);
}
if (payIn != null) {
CodecUtil.checksumEntireFile(payIn);
CodecUtil.checksumEntireFile(payIn, merge);
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...va/org/apache/lucene/backward_codecs/lucene102/Lucene102BinaryQuantizedVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.KnnVectorValues;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.VectorEncoding;
Expand Down Expand Up @@ -211,9 +212,9 @@ public RandomVectorScorer getRandomVectorScorer(String field, byte[] target) thr
}

@Override
public void checkIntegrity() throws IOException {
rawVectorsReader.checkIntegrity();
CodecUtil.checksumEntireFile(quantizedVectorData);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
rawVectorsReader.checkIntegrity(merge);
CodecUtil.checksumEntireFile(quantizedVectorData, merge);
}

@Override
Expand Down
9 changes: 5 additions & 4 deletions ...-codecs/src/java/org/apache/lucene/backward_codecs/lucene103/Lucene103PostingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.search.DocAndFloatFeatureBuffer;
Expand Down Expand Up @@ -1449,15 +1450,15 @@ static FreqAndNormBuffer readImpacts(ByteArrayDataInput in, FreqAndNormBuffer re
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
if (docIn != null) {
CodecUtil.checksumEntireFile(docIn);
CodecUtil.checksumEntireFile(docIn, merge);
}
if (posIn != null) {
CodecUtil.checksumEntireFile(posIn);
CodecUtil.checksumEntireFile(posIn, merge);
}
if (payIn != null) {
CodecUtil.checksumEntireFile(payIn);
CodecUtil.checksumEntireFile(payIn, merge);
}
}

Expand Down
5 changes: 3 additions & 2 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
Expand Down Expand Up @@ -1683,8 +1684,8 @@ public DocValuesSkipper getSkipper(FieldInfo field) {
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(data);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(data, merge);
}

/**
Expand Down
7 changes: 4 additions & 3 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90HnswVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.internal.hppc.IntObjectHashMap;
Expand Down Expand Up @@ -218,9 +219,9 @@ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOExceptio
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(vectorData);
CodecUtil.checksumEntireFile(vectorIndex);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(vectorData, merge);
CodecUtil.checksumEntireFile(vectorIndex, merge);
}

private FieldEntry getFieldEntry(String field) {
Expand Down
9 changes: 5 additions & 4 deletions ...rd-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90PostingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SlowImpactsEnum;
Expand Down Expand Up @@ -2042,15 +2043,15 @@ public long cost() {
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
if (docIn != null) {
CodecUtil.checksumEntireFile(docIn);
CodecUtil.checksumEntireFile(docIn, merge);
}
if (posIn != null) {
CodecUtil.checksumEntireFile(posIn);
CodecUtil.checksumEntireFile(posIn, merge);
}
if (payIn != null) {
CodecUtil.checksumEntireFile(payIn);
CodecUtil.checksumEntireFile(payIn, merge);
}
}

Expand Down
9 changes: 5 additions & 4 deletions ...va/org/apache/lucene/backward_codecs/lucene90/blocktree/Lucene90BlockTreeTermsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.internal.hppc.IntCursor;
Expand Down Expand Up @@ -327,15 +328,15 @@ public int size() {
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
// terms index
CodecUtil.checksumEntireFile(indexIn);
CodecUtil.checksumEntireFile(indexIn, merge);

// term dictionary
CodecUtil.checksumEntireFile(termsIn);
CodecUtil.checksumEntireFile(termsIn, merge);

// postings
postingsReader.checkIntegrity();
postingsReader.checkIntegrity(merge);
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene91/Lucene91HnswVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.internal.hppc.IntObjectHashMap;
Expand Down Expand Up @@ -214,9 +215,9 @@ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOExceptio
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(vectorData);
CodecUtil.checksumEntireFile(vectorIndex);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(vectorData, merge);
CodecUtil.checksumEntireFile(vectorIndex, merge);
}

private FieldEntry getFieldEntry(String field) {
Expand Down
9 changes: 5 additions & 4 deletions ...-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/Lucene912PostingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SlowImpactsEnum;
Expand Down Expand Up @@ -1795,15 +1796,15 @@ static FreqAndNormBuffer readImpacts(ByteArrayDataInput in, FreqAndNormBuffer re
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
if (docIn != null) {
CodecUtil.checksumEntireFile(docIn);
CodecUtil.checksumEntireFile(docIn, merge);
}
if (posIn != null) {
CodecUtil.checksumEntireFile(posIn);
CodecUtil.checksumEntireFile(posIn, merge);
}
if (payIn != null) {
CodecUtil.checksumEntireFile(payIn);
CodecUtil.checksumEntireFile(payIn, merge);
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene92/Lucene92HnswVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.internal.hppc.IntObjectHashMap;
Expand Down Expand Up @@ -211,9 +212,9 @@ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOExceptio
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(vectorData);
CodecUtil.checksumEntireFile(vectorIndex);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(vectorData, merge);
CodecUtil.checksumEntireFile(vectorIndex, merge);
}

private FieldEntry getFieldEntry(String field) {
Expand Down
7 changes: 4 additions & 3 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene94/Lucene94HnswVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.VectorEncoding;
import org.apache.lucene.index.VectorSimilarityFunction;
Expand Down Expand Up @@ -229,9 +230,9 @@ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOExceptio
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(vectorData);
CodecUtil.checksumEntireFile(vectorIndex);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(vectorData, merge);
CodecUtil.checksumEntireFile(vectorIndex, merge);
}

private FieldEntry getFieldEntryOrThrow(String field) {
Expand Down
7 changes: 4 additions & 3 deletions ...codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.VectorEncoding;
import org.apache.lucene.index.VectorSimilarityFunction;
Expand Down Expand Up @@ -229,9 +230,9 @@ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOExceptio
}

@Override
public void checkIntegrity() throws IOException {
CodecUtil.checksumEntireFile(vectorData);
CodecUtil.checksumEntireFile(vectorIndex);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
CodecUtil.checksumEntireFile(vectorData, merge);
CodecUtil.checksumEntireFile(vectorIndex, merge);
}

private FieldEntry getFieldEntryOrThrow(String field) {
Expand Down
9 changes: 5 additions & 4 deletions ...rd-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99PostingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SlowImpactsEnum;
Expand Down Expand Up @@ -2075,15 +2076,15 @@ private void prefetchSkipData(IndexInput docIn, long docStartFP, long skipOffset
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
if (docIn != null) {
CodecUtil.checksumEntireFile(docIn);
CodecUtil.checksumEntireFile(docIn, merge);
}
if (posIn != null) {
CodecUtil.checksumEntireFile(posIn);
CodecUtil.checksumEntireFile(posIn, merge);
}
if (payIn != null) {
CodecUtil.checksumEntireFile(payIn);
CodecUtil.checksumEntireFile(payIn, merge);
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...java/org/apache/lucene/backward_codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.VectorEncoding;
Expand Down Expand Up @@ -166,9 +167,9 @@ static void validateFieldEntry(FieldInfo info, FieldEntry fieldEntry) {
}

@Override
public void checkIntegrity() throws IOException {
rawVectorsReader.checkIntegrity();
CodecUtil.checksumEntireFile(quantizedVectorData);
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
rawVectorsReader.checkIntegrity(merge);
CodecUtil.checksumEntireFile(quantizedVectorData, merge);
}

private FieldEntry getFieldEntry(String field) {
Expand Down
7 changes: 4 additions & 3 deletions lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.TermState;
Expand Down Expand Up @@ -867,11 +868,11 @@ public String toString() {
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
// verify terms
CodecUtil.checksumEntireFile(in);
CodecUtil.checksumEntireFile(in, merge);

// verify postings
postingsReader.checkIntegrity();
postingsReader.checkIntegrity(merge);
}
}
7 changes: 4 additions & 3 deletions lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.store.IndexInput;
Expand Down Expand Up @@ -226,12 +227,12 @@ public int size() {
}

@Override
public void checkIntegrity() throws IOException {
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
// term dictionary
CodecUtil.checksumEntireFile(in);
CodecUtil.checksumEntireFile(in, merge);

// postings
postingsReader.checkIntegrity();
postingsReader.checkIntegrity(merge);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.ImpactsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
Expand Down Expand Up @@ -387,8 +388,8 @@ public String toString() {
}

@Override
public void checkIntegrity() throws IOException {
delegateFieldsProducer.checkIntegrity();
public void checkIntegrity(MergePolicy.OneMerge merge) throws IOException {
delegateFieldsProducer.checkIntegrity(merge);
}

@Override
Expand Down
Loading
Loading