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

SOLR-8621: solrconfig.xml in solr/server/solr/configsets and test-files/solr/configsets/bad-mergepolicy now also use <mergePolicyFactory> instead of <mergePolicy>

This commit is contained in:
Christine Poerschke 2016-02-11 20:41:35 +00:00
parent 4d094975d9
commit 159ace1b7c
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
View File

@ -24,8 +24,9 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig> <indexConfig>
<mergePolicy class="org.apache.solr.update.DummyMergePolicy"/> <mergePolicyFactory class="org.apache.solr.update.DummyMergePolicyFactory">
<mergeFactor>8</mergeFactor> <int name="mergeFactor">8</int>
</mergePolicyFactory>
</indexConfig> </indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>

16
solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
View File

@ -169,23 +169,11 @@
Even older versions of Lucene used LogDocMergePolicy. 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="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>
</mergePolicy> </mergePolicyFactory>
-->
<!-- 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>
--> -->
<!-- Expert: Merge Scheduler <!-- Expert: Merge Scheduler

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

@ -171,23 +171,11 @@
Even older versions of Lucene used LogDocMergePolicy. 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="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>
</mergePolicy> </mergePolicyFactory>
-->
<!-- 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>
--> -->
<!-- Expert: Merge Scheduler <!-- Expert: Merge Scheduler