You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/03/30 11:30:21 UTC
svn commit: r1307331 - in /lucene/dev/branches/branch_3x/solr/core/src:
java/org/apache/solr/update/ test-files/solr/conf/
test/org/apache/solr/core/ test/org/apache/solr/update/
Author: janhoy
Date: Fri Mar 30 09:30:20 2012
New Revision: 1307331
URL: http://svn.apache.org/viewvc?rev=1307331&view=rev
Log:
SOLR-1052, SOLR-2983: Upgraded defunct tests to new syntax
Modified:
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/bad-mp-solrconfig.xml
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1307331&r1=1307330&r2=1307331&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Fri Mar 30 09:30:20 2012
@@ -82,14 +82,18 @@ public class SolrIndexConfig {
/**
* Constructs a SolrIndexConfig which parses the Lucene related config params in solrconfig.xml
* @param solrConfig the overall SolrConfig object
- * @param prefix the XPath prefix for which section to parse (mandatory)
+ * @param prefix the XPath prefix for which section to parse (default if null is "indexConfig")
* @param def a SolrIndexConfig instance to pick default values from (optional)
*/
public SolrIndexConfig(SolrConfig solrConfig, String prefix, SolrIndexConfig def) {
- if (prefix == null)
- throw new SolrException(ErrorCode.FORBIDDEN, "Prefix was null");
- if (def == null)
+ if (prefix == null) {
+ prefix = "indexConfig";
+ log.debug("Defaulting to prefix \""+prefix+"\" for index configuration");
+ }
+
+ if (def == null) {
def = new SolrIndexConfig(solrConfig);
+ }
luceneVersion = solrConfig.luceneMatchVersion;
Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/bad-mp-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/bad-mp-solrconfig.xml?rev=1307331&r1=1307330&r2=1307331&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/bad-mp-solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/bad-mp-solrconfig.xml Fri Mar 30 09:30:20 2012
@@ -23,27 +23,12 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <indexDefaults>
-
- <useCompoundFile>false</useCompoundFile>
- <mergeFactor>10</mergeFactor>
- <ramBufferSizeMB>32</ramBufferSizeMB>
- <maxMergeDocs>2147483647</maxMergeDocs>
- <maxFieldLength>10000</maxFieldLength>
- <writeLockTimeout>1000</writeLockTimeout>
+ <indexConfig>
<mergePolicy class="org.apache.solr.update.DummyMergePolicy"/>
-
- </indexDefaults>
-
- <mainIndex>
- <useCompoundFile>false</useCompoundFile>
<mergeFactor>8</mergeFactor>
- <maxBufferedDocs>10</maxBufferedDocs>
- <maxMergeDocs>2147483647</maxMergeDocs>
- <maxFieldLength>10000</maxFieldLength>
- <mergePolicy class="org.apache.solr.update.DummyMergePolicy"/>
+ <lockType>single</lockType>
<unlockOnStartup>true</unlockOnStartup>
- </mainIndex>
+ </indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml?rev=1307331&r1=1307330&r2=1307331&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml Fri Mar 30 09:30:20 2012
@@ -25,17 +25,16 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <indexDefaults>
- <ramBufferSizeMB>32</ramBufferSizeMB>
- <termIndexInterval>256</termIndexInterval>
+ <indexConfig>
<mergeFactor>7</mergeFactor>
- <useCompoundFile>false</useCompoundFile>
<mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
<int name="maxMergeAtOnceExplicit">19</int>
<int name="segmentsPerTier">9</int>
<double name="noCFSRatio">1.0</double>
</mergePolicy>
- </indexDefaults>
+ <lockType>single</lockType>
+ <unlockOnStartup>true</unlockOnStartup>
+ </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java?rev=1307331&r1=1307330&r2=1307331&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java Fri Mar 30 09:30:20 2012
@@ -31,7 +31,7 @@ public class TestMergePolicyConfig exten
}
public void testTieredMergePolicyConfig() throws Exception {
- IndexWriterConfig iwc = solrConfig.defaultIndexConfig.toIndexWriterConfig(h.getCore().getSchema());
+ IndexWriterConfig iwc = solrConfig.indexConfig.toIndexWriterConfig(h.getCore().getSchema());
MergePolicy mp = iwc.getMergePolicy();
assertTrue(mp instanceof TieredMergePolicy);
TieredMergePolicy tieredMP = (TieredMergePolicy) mp;
Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java?rev=1307331&r1=1307330&r2=1307331&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java Fri Mar 30 09:30:20 2012
@@ -31,7 +31,7 @@ public class SolrIndexConfigTest extends
public void testFailingSolrIndexConfigCreation() {
try {
SolrConfig solrConfig = new SolrConfig("bad-mp-solrconfig.xml");
- SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, "/", null);
+ SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, null, null);
IndexSchema indexSchema = new IndexSchema(solrConfig, "schema.xml", null);
solrIndexConfig.toIndexWriterConfig(indexSchema);
fail("a mergePolicy should have an empty constructor in order to be instantiated in Solr thus this should fail ");
@@ -43,7 +43,7 @@ public class SolrIndexConfigTest extends
@Test
public void testTieredMPSolrIndexConfigCreation() throws Exception {
SolrConfig solrConfig = new SolrConfig("solrconfig-mergepolicy.xml");
- SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, "/", null);
+ SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, null, null);
assertNotNull(solrIndexConfig);
assertEquals("org.apache.lucene.index.TieredMergePolicy", solrIndexConfig.defaultMergePolicyClassName);
IndexSchema indexSchema = new IndexSchema(solrConfig, "schema.xml", null);