lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject 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
Date Tue, 09 Feb 2016 12:55:44 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5x b052a8f93 -> 39fd94251


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/39fd9425
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/39fd9425
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/39fd9425

Branch: refs/heads/branch_5x
Commit: 39fd942514a5474d81a285a3a69f4d2c1dca33c7
Parents: b052a8f
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Tue Feb 9 12:36:24 2016 +0000
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Tue Feb 9 12:55:22 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/39fd9425/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/39fd9425/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());
 


Mime
View raw message