You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/08/06 02:38:10 UTC
svn commit: r1510830 - in /lucene/dev/trunk/solr/core/src:
test-files/solr/collection1/conf/ test/org/apache/solr/core/
test/org/apache/solr/update/
Author: hossman
Date: Tue Aug 6 00:38:10 2013
New Revision: 1510830
URL: http://svn.apache.org/r1510830
Log:
SOLR-5118: beef up assertions in SolrIndexConfigTest, this allows us to remove TestPropInject and TestPropInjectDefaults -- neither of which were testing property injection (tested elsewhere) but were doing some basic assertions on the parsing & init of merge policy and merge scheduler
Removed:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestPropInject.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestPropInjectDefaults.java
Modified:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml?rev=1510830&r1=1510829&r2=1510830&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml Tue Aug 6 00:38:10 2013
@@ -36,6 +36,10 @@
<bool name="useCompoundFile">${useCompoundFile:false}</bool>
</mergePolicy>
+ <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler">
+ <int name="maxMergeCount">987</int>
+ <int name="maxThreadCount">42</int>
+ </mergeScheduler>
</indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java?rev=1510830&r1=1510829&r2=1510830&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java Tue Aug 6 00:38:10 2013
@@ -17,6 +17,8 @@ package org.apache.solr.core;
* limitations under the License.
*/
+import org.apache.solr.update.SolrIndexConfigTest;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
@@ -25,6 +27,7 @@ import org.apache.lucene.index.SegmentIn
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.RefCounted;
import org.apache.solr.search.SolrIndexSearcher;
@@ -32,6 +35,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.junit.After;
import java.util.concurrent.atomic.AtomicInteger;
+/** @see SolrIndexConfigTest */
public class TestMergePolicyConfig extends SolrTestCaseJ4 {
private static AtomicInteger docIdCounter = new AtomicInteger(42);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java?rev=1510830&r1=1510829&r2=1510830&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java Tue Aug 6 00:38:10 2013
@@ -19,8 +19,12 @@ package org.apache.solr.update;
import java.io.File;
+import org.apache.solr.core.TestMergePolicyConfig;
+
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.SimpleMergedSegmentWarmer;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.schema.IndexSchema;
@@ -29,6 +33,8 @@ import org.junit.Test;
/**
* Testcase for {@link SolrIndexConfig}
+ *
+ * @see TestMergePolicyConfig
*/
public class SolrIndexConfigTest extends SolrTestCaseJ4 {
@@ -52,10 +58,22 @@ public class SolrIndexConfigTest extends
SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, null,
null);
assertNotNull(solrIndexConfig);
- assertEquals("org.apache.lucene.index.TieredMergePolicy",
- solrIndexConfig.defaultMergePolicyClassName);
IndexSchema indexSchema = IndexSchemaFactory.buildIndexSchema("schema.xml", solrConfig);
- solrIndexConfig.toIndexWriterConfig(indexSchema);
+
+ IndexWriterConfig iwc = solrIndexConfig.toIndexWriterConfig(indexSchema);
+
+ assertNotNull("null mp", iwc.getMergePolicy());
+ assertTrue("mp is not TMP", iwc.getMergePolicy() instanceof TieredMergePolicy);
+ TieredMergePolicy mp = (TieredMergePolicy) iwc.getMergePolicy();
+ assertEquals("mp.maxMergeAtOnceExplicit", 19, mp.getMaxMergeAtOnceExplicit());
+ assertEquals("mp.segmentsPerTier",9,(int)mp.getSegmentsPerTier());
+
+ assertNotNull("null ms", iwc.getMergeScheduler());
+ assertTrue("ms is not CMS", iwc.getMergeScheduler() instanceof ConcurrentMergeScheduler);
+ ConcurrentMergeScheduler ms = (ConcurrentMergeScheduler) iwc.getMergeScheduler();
+ assertEquals("ms.maxMergeCount", 987, ms.getMaxMergeCount());
+ assertEquals("ms.maxThreadCount", 42, ms.getMaxThreadCount());
+
}
public void testMergedSegmentWarmerIndexConfigCreation() throws Exception {