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/09 13:39:27 UTC
lucene-solr git commit: SOLR-8621:
TestMergePolicyConfig.testTieredMergePolicyConfig now randomly chooses
between solrconfig-tieredmergepolicy.xml and
solrconfig-tieredmergepolicyfactory.xml;
solrconfig-tieredmergepolicyfactory.xml fix so that TestMergeP
Repository: lucene-solr
Updated Branches:
refs/heads/master 360376095 -> e9c90037a
SOLR-8621: TestMergePolicyConfig.testTieredMergePolicyConfig now randomly chooses between solrconfig-tieredmergepolicy.xml and solrconfig-tieredmergepolicyfactory.xml; solrconfig-tieredmergepolicyfactory.xml fix so that TestMergePolicyConfig.testTieredMergePolicyConfig passes.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e9c90037
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e9c90037
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e9c90037
Branch: refs/heads/master
Commit: e9c90037aaf2f392d7f99a7837abd944a9577e9e
Parents: 3603760
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Feb 9 12:36:24 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Feb 9 12:36:24 2016 +0000
----------------------------------------------------------------------
.../solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml | 2 ++
solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9c90037/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
index ebf360d..af5d208 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
@@ -23,8 +23,10 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<indexConfig>
+ <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
<mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
<int name="maxMergeAtOnceExplicit">19</int>
+ <int name="maxMergeAtOnce">7</int>
<int name="segmentsPerTier">9</int>
<double name="noCFSRatio">0.1</double>
</mergePolicyFactory>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9c90037/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
index cea6996..5342477 100644
--- a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
@@ -91,7 +91,7 @@ public class TestMergePolicyConfig extends SolrTestCaseJ4 {
final boolean expectCFS
= Boolean.parseBoolean(System.getProperty("useCompoundFile"));
- initCore("solrconfig-tieredmergepolicy.xml","schema-minimal.xml");
+ initCore(random().nextBoolean() ? "solrconfig-tieredmergepolicy.xml" : "solrconfig-tieredmergepolicyfactory.xml","schema-minimal.xml");
IndexWriterConfig iwc = solrConfig.indexConfig.toIndexWriterConfig(h.getCore());
assertEquals(expectCFS, iwc.getUseCompoundFile());