You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/02/11 18:24:06 UTC
lucene-solr git commit: SOLR-8621: factor out protected abstract
WrapperMergePolicyFactory.getMergePolicyInstance method
Repository: lucene-solr
Updated Branches:
refs/heads/master 12b8721a4 -> 360051a41
SOLR-8621: factor out protected abstract WrapperMergePolicyFactory.getMergePolicyInstance method
Here in SOLR-8621:
* UpgradeIndexMergePolicyFactory extends WrapperMergePolicyFactory
* (WrapperMergePolicyFactoryTest's) DefaultingWrapperMergePolicyFactory extends WrapperMergePolicyFactory
Elsewhere in SOLR-5730:
* SortingMergePolicyFactory will extend WrapperMergePolicyFactory
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/360051a4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/360051a4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/360051a4
Branch: refs/heads/master
Commit: 360051a414e291a7b3ffb5a0180a404fa18f3a6c
Parents: 12b8721
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Feb 11 17:05:17 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Feb 11 17:05:17 2016 +0000
----------------------------------------------------------------------
.../solr/index/UpgradeIndexMergePolicyFactory.java | 4 +---
.../apache/solr/index/WrapperMergePolicyFactory.java | 13 +++++++++++++
.../solr/index/WrapperMergePolicyFactoryTest.java | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/360051a4/solr/core/src/java/org/apache/solr/index/UpgradeIndexMergePolicyFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/index/UpgradeIndexMergePolicyFactory.java b/solr/core/src/java/org/apache/solr/index/UpgradeIndexMergePolicyFactory.java
index f4b1781..3234755 100644
--- a/solr/core/src/java/org/apache/solr/index/UpgradeIndexMergePolicyFactory.java
+++ b/solr/core/src/java/org/apache/solr/index/UpgradeIndexMergePolicyFactory.java
@@ -31,10 +31,8 @@ public class UpgradeIndexMergePolicyFactory extends WrapperMergePolicyFactory {
}
@Override
- public MergePolicy getMergePolicy() {
- final MergePolicy wrappedMP = getWrappedMergePolicy();
+ protected MergePolicy getMergePolicyInstance(MergePolicy wrappedMP) {
final MergePolicy mp = new UpgradeIndexMergePolicy(wrappedMP);
- args.invokeSetters(mp);
return mp;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/360051a4/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java b/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
index 61088a8..7e095d7 100644
--- a/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
+++ b/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
@@ -82,6 +82,19 @@ public abstract class WrapperMergePolicyFactory extends MergePolicyFactory {
return mpf.getMergePolicy();
}
+ /** Returns an instance of the wrapping {@link MergePolicy} without configuring its set parameters. */
+ protected abstract MergePolicy getMergePolicyInstance(MergePolicy wrappedMP);
+
+
+ /** Returns a wrapping {@link MergePolicy} with its set parameters configured. */
+ @Override
+ public final MergePolicy getMergePolicy() {
+ final MergePolicy wrappedMP = getWrappedMergePolicy();
+ final MergePolicy mp = getMergePolicyInstance(wrappedMP);
+ args.invokeSetters(mp);
+ return mp;
+ }
+
/**
* Returns a {@link MergePolicyFactoryArgs} for the wrapped {@link MergePolicyFactory}. This method also removes all
* args from this instance's args.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/360051a4/solr/core/src/test/org/apache/solr/index/WrapperMergePolicyFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/index/WrapperMergePolicyFactoryTest.java b/solr/core/src/test/org/apache/solr/index/WrapperMergePolicyFactoryTest.java
index e4c7b3d..d416e13 100644
--- a/solr/core/src/test/org/apache/solr/index/WrapperMergePolicyFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/index/WrapperMergePolicyFactoryTest.java
@@ -126,7 +126,7 @@ public class WrapperMergePolicyFactoryTest extends SolrTestCaseJ4 {
}
@Override
- public MergePolicy getMergePolicy() {
+ protected MergePolicy getMergePolicyInstance(MergePolicy wrappedMP) {
return getWrappedMergePolicy();
}