Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Christine Poerschke 2016-02-26 15:15:28 +00:00
parent 509c6a0acb
commit 0ed625b107
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -331,6 +331,11 @@ Bug Fixes
* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy) * 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 ======================= ======================= 5.5.0 =======================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

12
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
View File

@ -143,17 +143,23 @@ public class SolrIndexConfig implements MapSerializable {
mergeSchedulerInfo = getPluginInfo(prefix + "/mergeScheduler", solrConfig, def.mergeSchedulerInfo); mergeSchedulerInfo = getPluginInfo(prefix + "/mergeScheduler", solrConfig, def.mergeSchedulerInfo);
mergePolicyInfo = getPluginInfo(prefix + "/mergePolicy", solrConfig, def.mergePolicyInfo); 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) { if (mergePolicyInfo != null && mergePolicyFactoryInfo != null) {
throw new IllegalArgumentException("<mergePolicy> and <mergePolicyFactory> are mutually exclusive."); 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.", assertWarnOrFail("Beginning with Solr 5.5, <mergePolicy> is deprecated, use <mergePolicyFactory> instead.",
(mergePolicyInfo == null), false); (mergePolicyInfo == null), false);
assertWarnOrFail("Beginning with Solr 5.5, <maxMergeDocs> is deprecated, configure it on the relevant <mergePolicyFactory> instead.", 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.", 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); String val = solrConfig.get(prefix + "/termIndexInterval", null);
if (val != null) { if (val != null) {

2
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
View File

@ -171,7 +171,7 @@
Even older versions of Lucene used LogDocMergePolicy. 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="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int> <int name="segmentsPerTier">10</int>
<double name="noCFSRatio">0.1</double> <double name="noCFSRatio">0.1</double>