Skip to content

Revert "Use SequentialStoredFieldsLeafReader to read Lucene changes" #68586

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
Feb 5, 2021
Merged

Revert "Use SequentialStoredFieldsLeafReader to read Lucene changes" #68586

Show file tree
Hide file tree
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
9 changes: 2 additions & 7 deletions server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.lucene.util.ArrayUtil;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.lucene.index.SequentialStoredFieldsLeafReader;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.index.fieldvisitor.FieldsVisitor;
Expand Down Expand Up @@ -219,12 +218,8 @@ private Translog.Operation readDocAsOp(int docIndex) throws IOException {
final String sourceField = parallelArray.hasRecoverySource[docIndex] ? SourceFieldMapper.RECOVERY_SOURCE_NAME :
SourceFieldMapper.NAME;
final FieldsVisitor fields = new FieldsVisitor(true, sourceField);
if (leaf.reader() instanceof SequentialStoredFieldsLeafReader) {
((SequentialStoredFieldsLeafReader) leaf.reader()).getSequentialStoredFieldsReader().visitDocument(segmentDocID, fields);
} else {
assert false : "The changes reader isn't wrapped with Lucene#wrapAllDocsLive";
throw new IllegalStateException("The changes reader isn't wrapped with Lucene#wrapAllDocsLive");
}
leaf.reader().document(segmentDocID, fields);

final Translog.Operation op;
final boolean isTombstone = parallelArray.isTombStone[docIndex];
if (isTombstone && fields.id() == null) {
Expand Down
10 changes: 2 additions & 8 deletions test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

package org.elasticsearch.test.engine;

import org.apache.lucene.codecs.StoredFieldsReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FilterLeafReader;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.PostingsEnum;
Expand All @@ -20,7 +20,6 @@
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.elasticsearch.common.lucene.index.SequentialStoredFieldsLeafReader;

import java.io.IOException;

Expand All @@ -29,7 +28,7 @@
* are called on is. This allows to test parts of the system under certain
* error conditions that would otherwise not be possible.
*/
public class ThrowingLeafReaderWrapper extends SequentialStoredFieldsLeafReader {
public class ThrowingLeafReaderWrapper extends FilterLeafReader {

private final Thrower thrower;

Expand Down Expand Up @@ -198,9 +197,4 @@ public CacheHelper getCoreCacheHelper() {
public CacheHelper getReaderCacheHelper() {
return in.getReaderCacheHelper();
}

@Override
protected StoredFieldsReader doGetSequentialStoredFieldsReader(StoredFieldsReader reader) {
return reader;
}
}