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

Avoid allocating liveDocs for no soft-deletes (#13895) (#13903) 

Backport of #13895 to 10x

This is a continuation of #13588, where we avoided allocating liveDocs 
for segments that have the __soft_deletes field but no values in it.
However, that PR only addressed the reading side. This change fixes the
writing scenario with IndexWriter.

Relates #13588
This commit is contained in:
Nhat Nguyen 2024-10-14 07:39:31 -07:00 committed by GitHub
parent 97bfd8b673
commit 518c76b51a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lucene/core/src/java/org/apache/lucene/index/PendingSoftDeletes.java
View File

@ -76,15 +76,14 @@ final class PendingSoftDeletes extends PendingDeletes {
hardDeletes.onNewReader(reader, info); hardDeletes.onNewReader(reader, info);
// only re-calculate this if we haven't seen this generation // only re-calculate this if we haven't seen this generation
if (dvGeneration < info.getDocValuesGen()) { if (dvGeneration < info.getDocValuesGen()) {
final DocIdSetIterator iterator = final int newDelCount;
FieldExistsQuery.getDocValuesDocIdSetIterator(field, reader); var iterator = FieldExistsQuery.getDocValuesDocIdSetIterator(field, reader);
int newDelCount; if (iterator != null && iterator.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
if (iterator iterator = FieldExistsQuery.getDocValuesDocIdSetIterator(field, reader);
!= null) { // nothing is deleted we don't have a soft deletes field in this segment
assert info.info.maxDoc() > 0 : "maxDoc is 0";
newDelCount = applySoftDeletes(iterator, getMutableBits()); newDelCount = applySoftDeletes(iterator, getMutableBits());
assert newDelCount >= 0 : " illegal pending delete count: " + newDelCount; assert newDelCount >= 0 : " illegal pending delete count: " + newDelCount;
} else { } else {
// nothing is deleted we don't have a soft deletes field in this segment
newDelCount = 0; newDelCount = 0;
} }
assert info.getSoftDelCount() == newDelCount assert info.getSoftDelCount() == newDelCount

6
lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesDirectoryReaderWrapper.java
View File

@ -306,6 +306,12 @@ public class TestSoftDeletesDirectoryReaderWrapper extends LuceneTestCase {
softDeletesField, MatchNoDocsQuery::new, mergePolicy)); softDeletesField, MatchNoDocsQuery::new, mergePolicy));
writer.forceMerge(1); writer.forceMerge(1);
try (DirectoryReader reader = DirectoryReader.open(writer)) { try (DirectoryReader reader = DirectoryReader.open(writer)) {
for (LeafReaderContext leafContext : reader.leaves()) {
assertThat(leafContext.reader(), instanceOf(SegmentReader.class));
SegmentReader segmentReader = (SegmentReader) leafContext.reader();
assertNull(segmentReader.getLiveDocs());
assertNull(segmentReader.getHardLiveDocs());
}
SoftDeletesDirectoryReaderWrapper wrapped = SoftDeletesDirectoryReaderWrapper wrapped =
new SoftDeletesDirectoryReaderWrapper(reader, softDeletesField); new SoftDeletesDirectoryReaderWrapper(reader, softDeletesField);
assertEquals(numDocs, wrapped.numDocs()); assertEquals(numDocs, wrapped.numDocs());