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/05 19:56:30 UTC
lucene-solr git commit: Remove
SolrIndexConfig.defaultMergePolicy[Factory]ClassName members in favour of
DefaultMergePolicyFactory.
Repository: lucene-solr
Updated Branches:
refs/heads/master-solr-8621 0e4f3c23f -> e481620b5
Remove SolrIndexConfig.defaultMergePolicy[Factory]ClassName members in favour of DefaultMergePolicyFactory.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e481620b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e481620b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e481620b
Branch: refs/heads/master-solr-8621
Commit: e481620b54391f55827f12b4ff4c38d26afcbf61
Parents: 0e4f3c2
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 5 18:47:59 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 5 18:47:59 2016 +0000
----------------------------------------------------------------------
.../solr/index/DefaultMergePolicyFactory.java | 3 --
.../org/apache/solr/update/SolrIndexConfig.java | 42 +++++++++-----------
2 files changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e481620b/solr/core/src/java/org/apache/solr/index/DefaultMergePolicyFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/index/DefaultMergePolicyFactory.java b/solr/core/src/java/org/apache/solr/index/DefaultMergePolicyFactory.java
index 231eac9..101204b 100644
--- a/solr/core/src/java/org/apache/solr/index/DefaultMergePolicyFactory.java
+++ b/solr/core/src/java/org/apache/solr/index/DefaultMergePolicyFactory.java
@@ -25,9 +25,6 @@ import org.apache.solr.core.SolrResourceLoader;
*/
public class DefaultMergePolicyFactory extends MergePolicyFactory {
- @Deprecated // Remove when SolrIndexConfig no longer uses it.
- public static final String defaultMergePolicyClassName = TieredMergePolicy.class.getName();
-
public DefaultMergePolicyFactory(SolrResourceLoader resourceLoader, MergePolicyFactoryArgs args) {
super(resourceLoader, args);
if (!args.keys().isEmpty()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e481620b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index 236b8c4..42a739c 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -53,8 +53,7 @@ import static org.apache.solr.core.Config.assertWarnOrFail;
public class SolrIndexConfig implements MapSerializable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- final String defaultMergePolicyClassName;
- final String defaultMergePolicyFactoryClassName;
+ private final DefaultMergePolicyFactory defaultMergePolicyFactory = new DefaultMergePolicyFactory();
public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();
public final Version luceneVersion;
@@ -91,8 +90,6 @@ public class SolrIndexConfig implements MapSerializable {
mergePolicyInfo = null;
mergePolicyFactoryInfo = null;
mergeSchedulerInfo = null;
- defaultMergePolicyClassName = DefaultMergePolicyFactory.defaultMergePolicyClassName;
- defaultMergePolicyFactoryClassName = DefaultMergePolicyFactory.class.getName();
mergedSegmentWarmerInfo = null;
}
@@ -130,8 +127,6 @@ public class SolrIndexConfig implements MapSerializable {
solrConfig.get(prefix + "/luceneAutoCommit", null) == null,
true);
- defaultMergePolicyClassName = def.defaultMergePolicyClassName;
- defaultMergePolicyFactoryClassName = def.defaultMergePolicyFactoryClassName;
effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile());
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);
@@ -254,25 +249,21 @@ public class SolrIndexConfig implements MapSerializable {
return buildMergePolicyFromInfo(schema);
}
- final String mpfClassName;
- final MergePolicyFactoryArgs mpfArgs;
-
+ final MergePolicyFactory mpf;
if (mergePolicyFactoryInfo == null) {
- mpfClassName = defaultMergePolicyFactoryClassName;
- mpfArgs = new MergePolicyFactoryArgs();
+ mpf = defaultMergePolicyFactory;
} else {
- mpfClassName = mergePolicyFactoryInfo.className;
- mpfArgs = new MergePolicyFactoryArgs(mergePolicyFactoryInfo.initArgs.clone()); // clone so that MergePolicyFactoryArgs may own and modify the args passed to it
+ final String mpfClassName = mergePolicyFactoryInfo.className;
+ final MergePolicyFactoryArgs mpfArgs = new MergePolicyFactoryArgs(mergePolicyFactoryInfo.initArgs.clone()); // clone so that MergePolicyFactoryArgs may own and modify the args passed to it
+ final SolrResourceLoader resourceLoader = schema.getResourceLoader();
+ mpf = resourceLoader.newInstance(
+ mpfClassName,
+ MergePolicyFactory.class,
+ NO_SUB_PACKAGES,
+ new Class[] { SolrResourceLoader.class, MergePolicyFactoryArgs.class },
+ new Object[] { resourceLoader, mpfArgs });
}
- final SolrResourceLoader resourceLoader = schema.getResourceLoader();
- final MergePolicyFactory mpf = resourceLoader.newInstance(
- mpfClassName,
- MergePolicyFactory.class,
- NO_SUB_PACKAGES,
- new Class[] { SolrResourceLoader.class, MergePolicyFactoryArgs.class },
- new Object[] { resourceLoader, mpfArgs });
-
return mpf.getMergePolicy();
}
@@ -286,9 +277,12 @@ public class SolrIndexConfig implements MapSerializable {
* @see #getUseCompoundFile
*/
private MergePolicy buildMergePolicyFromInfo(IndexSchema schema) {
- String mpClassName = mergePolicyInfo == null ? defaultMergePolicyClassName : mergePolicyInfo.className;
-
- MergePolicy policy = schema.getResourceLoader().newInstance(mpClassName, MergePolicy.class);
+ final MergePolicy policy;
+ if (mergePolicyInfo == null) {
+ policy = defaultMergePolicyFactory.getMergePolicy();
+ } else {
+ policy = schema.getResourceLoader().newInstance(mergePolicyInfo.className, MergePolicy.class);
+ }
if (policy instanceof LogMergePolicy) {
LogMergePolicy logMergePolicy = (LogMergePolicy) policy;