Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 247f96868 -> c7214a2ba
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.
(Resolved conflict for solr/CHANGES.txt file.)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/55b3614f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/55b3614f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/55b3614f
Branch: refs/heads/branch_5_5
Commit: 55b3614fd37eeb1cf6ac2d2ef6c902d18e42d135
Parents: 247f968
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 17:41:38 2016 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 10 ++++++++++
.../java/org/apache/solr/update/SolrIndexConfig.java | 12 +++++++++---
.../sample_techproducts_configs/conf/solrconfig.xml | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55b3614f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 55e995f..6539b4c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -15,6 +15,16 @@ Bug Fixes
* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
+======================= 5.5.1 =======================
+
+Bug Fixes
+----------------------
+
+* 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/55b3614f/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 4ff4991..a5d8142 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/55b3614f/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 6e688c2..eece888 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -193,7 +193,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>
[2/2] lucene-solr git commit: Merge 5.5.1 changes sections from
SOLR-8737 and SOLR-8734 tickets.
Posted by cp...@apache.org.
Merge 5.5.1 changes sections from SOLR-8737 and SOLR-8734 tickets.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c7214a2b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c7214a2b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c7214a2b
Branch: refs/heads/branch_5_5
Commit: c7214a2ba5f96492e5c4cd6a558734217afe5089
Parents: 55b3614
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 26 17:44:53 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 26 17:44:53 2016 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c7214a2b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6539b4c..be910c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -8,18 +8,13 @@ caching, replication, and a web administration interface.
See http://lucene.apache.org/solr for more information.
-================== 5.5.1 ==================
+======================= 5.5.1 =======================
Bug Fixes
----------------------
* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
-======================= 5.5.1 =======================
-
-Bug Fixes
-----------------------
-
* 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.