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

fix test to use a valid thread count 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@923033 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2010-03-15 02:23:10 +00:00
parent 8529cabc7c
commit 21a1b9f005
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/solr/util/SolrPluginUtils.java
View File

@ -988,9 +988,9 @@ public class SolrPluginUtils {
Object val = entry.getValue(); Object val = entry.getValue();
method.invoke(bean, val); method.invoke(bean, val);
} catch (InvocationTargetException e1) { } catch (InvocationTargetException e1) {
throw new RuntimeException("Error invoking setter " + setterName + "on class : " + clazz.getName(), e1); throw new RuntimeException("Error invoking setter " + setterName + " on class : " + clazz.getName(), e1);
} catch (IllegalAccessException e1) { } catch (IllegalAccessException e1) {
throw new RuntimeException("Error invoking setter " + setterName + "on class : " + clazz.getName(), e1); throw new RuntimeException("Error invoking setter " + setterName + " on class : " + clazz.getName(), e1);
} }
} }
} }

2
src/test/org/apache/solr/core/TestPropInject.java
View File

@ -52,6 +52,6 @@ public class TestPropInject extends AbstractSolrTestCase {
public void testPropsDefaults() throws Exception { public void testPropsDefaults() throws Exception {
IndexWriter writer = new ExposeWriterHandler().getWriter(); IndexWriter writer = new ExposeWriterHandler().getWriter();
ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler(); ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler();
assertEquals(10, cms.getMaxThreadCount()); assertEquals(4, cms.getMaxThreadCount());
} }
} }

2
src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
View File

@ -94,7 +94,7 @@
can perform merges in the background using separate threads. The SerialMergeScheduler (Lucene 2.2 default) does not. can perform merges in the background using separate threads. The SerialMergeScheduler (Lucene 2.2 default) does not.
--> -->
<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"> <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler">
<int name="maxThreadCount">10</int> <int name="maxThreadCount">4</int>
</mergeScheduler> </mergeScheduler>
<!-- these are global... can't currently override per index --> <!-- these are global... can't currently override per index -->
<writeLockTimeout>1000</writeLockTimeout> <writeLockTimeout>1000</writeLockTimeout>