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/26 18:10:52 UTC
lucene-solr git commit: SOLR-8734: fix (maxMergeDocs|mergeFactor)
deprecation warnings: in solrconfig.xml may not be
combined with and on their
own or combined with
Repository: lucene-solr
Updated Branches:
refs/heads/master 509c6a0ac -> 0ed625b10
SOLR-8734: fix (maxMergeDocs|mergeFactor) deprecation warnings: in solrconfig.xml <maxMergeDocs|mergeFactor> may not be combined with <mergePolicyFactory> and <maxMergeDocs|mergeFactor> on their own or combined with <mergePolicy> is a warning.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0ed625b1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0ed625b1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0ed625b1
Branch: refs/heads/master
Commit: 0ed625b107264f2ed079b9e07e4f885b7398a6c4
Parents: 509c6a0
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 26 15:15:28 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 26 15:51:46 2016 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 5 +++++
.../java/org/apache/solr/update/SolrIndexConfig.java | 12 +++++++++---
.../sample_techproducts_configs/conf/solrconfig.xml | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ed625b1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5e814d0..4cf1c3f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -331,6 +331,11 @@ Bug Fixes
* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
+* SOLR-8734: fix (maxMergeDocs|mergeFactor) deprecation warnings: in solrconfig.xml
+ <maxMergeDocs|mergeFactor> may not be combined with <mergePolicyFactory> and
+ <maxMergeDocs|mergeFactor> on their own or combined with <mergePolicy> is a warning.
+ (Christine Poerschke, Shai Erera)
+
======================= 5.5.0 =======================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ed625b1/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 110aae2..bc2d654 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -143,17 +143,23 @@ public class SolrIndexConfig implements MapSerializable {
mergeSchedulerInfo = getPluginInfo(prefix + "/mergeScheduler", solrConfig, def.mergeSchedulerInfo);
mergePolicyInfo = getPluginInfo(prefix + "/mergePolicy", solrConfig, def.mergePolicyInfo);
- mergePolicyFactoryInfo = getPluginInfo(prefix + "/mergePolicyFactory", solrConfig, def.mergePolicyInfo);
+ mergePolicyFactoryInfo = getPluginInfo(prefix + "/mergePolicyFactory", solrConfig, def.mergePolicyFactoryInfo);
if (mergePolicyInfo != null && mergePolicyFactoryInfo != null) {
throw new IllegalArgumentException("<mergePolicy> and <mergePolicyFactory> are mutually exclusive.");
}
+ if (maxMergeDocs != def.maxMergeDocs && mergePolicyFactoryInfo != null) {
+ throw new IllegalArgumentException("<maxMergeDocs> and <mergePolicyFactory> are mutually exclusive.");
+ }
+ if (mergeFactor != def.mergeFactor && mergePolicyFactoryInfo != null) {
+ throw new IllegalArgumentException("<mergeFactor> and <mergePolicyFactory> are mutually exclusive.");
+ }
assertWarnOrFail("Beginning with Solr 5.5, <mergePolicy> is deprecated, use <mergePolicyFactory> instead.",
(mergePolicyInfo == null), false);
assertWarnOrFail("Beginning with Solr 5.5, <maxMergeDocs> is deprecated, configure it on the relevant <mergePolicyFactory> instead.",
- (mergePolicyFactoryInfo != null && maxMergeDocs == def.maxMergeDocs), false);
+ (maxMergeDocs == def.maxMergeDocs), false);
assertWarnOrFail("Beginning with Solr 5.5, <mergeFactor> is deprecated, configure it on the relevant <mergePolicyFactory> instead.",
- (mergePolicyFactoryInfo != null && mergeFactor == def.mergeFactor), false);
+ (mergeFactor == def.mergeFactor), false);
String val = solrConfig.get(prefix + "/termIndexInterval", null);
if (val != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ed625b1/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index d061453..d5bdeff 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -171,7 +171,7 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicy">
+ <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
<double name="noCFSRatio">0.1</double>