honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ElasticsearchMergePolicy extend from MergePolicyWrapper (#29476) 

The skeleton of ElasticsearchMergePolicy is quite similar to
MergePolicyWrapper. This commit therefore makes ElasticsearchMergePolicy
inherited from MergePolicyWrapper instead of MergePolicy.
This commit is contained in:
Nhat Nguyen 2018-04-11 11:32:19 -04:00 committed by GitHub
parent 4e6a8900a3
commit 0ae627fc79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.index.shard;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.MergeTrigger; import org.apache.lucene.index.MergePolicyWrapper;
import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentCommitInfo;
import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.index.SegmentInfos;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -44,12 +44,10 @@ import java.util.Map;
* For now, this {@link MergePolicy} takes care of moving versions that used to * For now, this {@link MergePolicy} takes care of moving versions that used to
* be stored as payloads to numeric doc values. * be stored as payloads to numeric doc values.
*/ */
public final class ElasticsearchMergePolicy extends MergePolicy { public final class ElasticsearchMergePolicy extends MergePolicyWrapper {
private static Logger logger = Loggers.getLogger(ElasticsearchMergePolicy.class); private static Logger logger = Loggers.getLogger(ElasticsearchMergePolicy.class);
private final MergePolicy delegate;
// True if the next merge request should do segment upgrades: // True if the next merge request should do segment upgrades:
private volatile boolean upgradeInProgress; private volatile boolean upgradeInProgress;
@ -60,13 +58,7 @@ public final class ElasticsearchMergePolicy extends MergePolicy {
/** @param delegate the merge policy to wrap */ /** @param delegate the merge policy to wrap */
public ElasticsearchMergePolicy(MergePolicy delegate) { public ElasticsearchMergePolicy(MergePolicy delegate) {
this.delegate = delegate; super(delegate);
}
@Override
public MergeSpecification findMerges(MergeTrigger mergeTrigger,
SegmentInfos segmentInfos, IndexWriter writer) throws IOException {
return delegate.findMerges(mergeTrigger, segmentInfos, writer);
} }
private boolean shouldUpgrade(SegmentCommitInfo info) { private boolean shouldUpgrade(SegmentCommitInfo info) {
@ -130,18 +122,7 @@ public final class ElasticsearchMergePolicy extends MergePolicy {
// has a chance to decide what to do (e.g. collapse the segments to satisfy maxSegmentCount) // has a chance to decide what to do (e.g. collapse the segments to satisfy maxSegmentCount)
} }
return delegate.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer); return super.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer);
}
@Override
public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer)
throws IOException {
return delegate.findForcedDeletesMerges(segmentInfos, writer);
}
@Override
public boolean useCompoundFile(SegmentInfos segments, SegmentCommitInfo newSegment, IndexWriter writer) throws IOException {
return delegate.useCompoundFile(segments, newSegment, writer);
} }
/** /**
@ -154,10 +135,4 @@ public final class ElasticsearchMergePolicy extends MergePolicy {
this.upgradeInProgress = upgrade; this.upgradeInProgress = upgrade;
this.upgradeOnlyAncientSegments = onlyAncientSegments; this.upgradeOnlyAncientSegments = onlyAncientSegments;
} }
@Override
public String toString() {
return getClass().getSimpleName() + "(" + delegate + ")";
}
} }