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 21:42:00 UTC
lucene-solr git commit: SOLR-8621: solrconfig.xml in
solr/server/solr/configsets and test-files/solr/configsets/bad-mergepolicy
now also use instead of
Repository: lucene-solr
Updated Branches:
refs/heads/master 4d094975d -> 159ace1b7
SOLR-8621: solrconfig.xml in solr/server/solr/configsets and test-files/solr/configsets/bad-mergepolicy now also use <mergePolicyFactory> instead of <mergePolicy>
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/159ace1b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/159ace1b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/159ace1b
Branch: refs/heads/master
Commit: 159ace1b7c6d002dd30e3fd17f497f3093944039
Parents: 4d09497
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Feb 11 20:41:35 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Feb 11 20:41:35 2016 +0000
----------------------------------------------------------------------
.../configsets/bad-mergepolicy/conf/solrconfig.xml | 5 +++--
.../data_driven_schema_configs/conf/solrconfig.xml | 16 ++--------------
.../sample_techproducts_configs/conf/solrconfig.xml | 16 ++--------------
3 files changed, 7 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/159ace1b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
index 4dfa3cc..49bbf58 100644
--- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
@@ -24,8 +24,9 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
- <mergePolicy class="org.apache.solr.update.DummyMergePolicy"/>
- <mergeFactor>8</mergeFactor>
+ <mergePolicyFactory class="org.apache.solr.update.DummyMergePolicyFactory">
+ <int name="mergeFactor">8</int>
+ </mergePolicyFactory>
</indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/159ace1b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 95aa1a3..45d5ff0 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -169,23 +169,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.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>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
+ </mergePolicyFactory>
-->
<!-- Expert: Merge Scheduler
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/159ace1b/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 4eab458..d061453 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -171,23 +171,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicy">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
<double name="noCFSRatio">0.1</double>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
+ </mergePolicyFactory>
-->
<!-- Expert: Merge Scheduler