Skip to content

Commit 0ae627f

Browse files
authored
ElasticsearchMergePolicy extend from MergePolicyWrapper (elastic#29476)
The skeleton of ElasticsearchMergePolicy is quite similar to MergePolicyWrapper. This commit therefore makes ElasticsearchMergePolicy inherited from MergePolicyWrapper instead of MergePolicy.
1 parent 4e6a890 commit 0ae627f

File tree

1 file changed

+4
-29
lines changed

1 file changed

+4
-29
lines changed

server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.logging.log4j.Logger;
2323
import org.apache.lucene.index.IndexWriter;
2424
import org.apache.lucene.index.MergePolicy;
25-
import org.apache.lucene.index.MergeTrigger;
25+
import org.apache.lucene.index.MergePolicyWrapper;
2626
import org.apache.lucene.index.SegmentCommitInfo;
2727
import org.apache.lucene.index.SegmentInfos;
2828
import org.elasticsearch.Version;
@@ -44,12 +44,10 @@
4444
* For now, this {@link MergePolicy} takes care of moving versions that used to
4545
* be stored as payloads to numeric doc values.
4646
*/
47-
public final class ElasticsearchMergePolicy extends MergePolicy {
47+
public final class ElasticsearchMergePolicy extends MergePolicyWrapper {
4848

4949
private static Logger logger = Loggers.getLogger(ElasticsearchMergePolicy.class);
5050

51-
private final MergePolicy delegate;
52-
5351
// True if the next merge request should do segment upgrades:
5452
private volatile boolean upgradeInProgress;
5553

@@ -60,13 +58,7 @@ public final class ElasticsearchMergePolicy extends MergePolicy {
6058

6159
/** @param delegate the merge policy to wrap */
6260
public ElasticsearchMergePolicy(MergePolicy delegate) {
63-
this.delegate = delegate;
64-
}
65-
66-
@Override
67-
public MergeSpecification findMerges(MergeTrigger mergeTrigger,
68-
SegmentInfos segmentInfos, IndexWriter writer) throws IOException {
69-
return delegate.findMerges(mergeTrigger, segmentInfos, writer);
61+
super(delegate);
7062
}
7163

7264
private boolean shouldUpgrade(SegmentCommitInfo info) {
@@ -130,18 +122,7 @@ public MergeSpecification findForcedMerges(SegmentInfos segmentInfos,
130122
// has a chance to decide what to do (e.g. collapse the segments to satisfy maxSegmentCount)
131123
}
132124

133-
return delegate.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer);
134-
}
135-
136-
@Override
137-
public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer)
138-
throws IOException {
139-
return delegate.findForcedDeletesMerges(segmentInfos, writer);
140-
}
141-
142-
@Override
143-
public boolean useCompoundFile(SegmentInfos segments, SegmentCommitInfo newSegment, IndexWriter writer) throws IOException {
144-
return delegate.useCompoundFile(segments, newSegment, writer);
125+
return super.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer);
145126
}
146127

147128
/**
@@ -154,10 +135,4 @@ public void setUpgradeInProgress(boolean upgrade, boolean onlyAncientSegments) {
154135
this.upgradeInProgress = upgrade;
155136
this.upgradeOnlyAncientSegments = onlyAncientSegments;
156137
}
157-
158-
@Override
159-
public String toString() {
160-
return getClass().getSimpleName() + "(" + delegate + ")";
161-
}
162-
163138
}

0 commit comments

Comments
 (0)