svn commit: r1097228 - in /lucene/dev/branches/realtime_search: ./ lucene/ lucene/contrib/lucli/build.xml lucene/src/test/org/apache/lucene/search/function/TestValueSource.java modules/ solr/

[rm...@apache.org]

Author: rmuir
Date: Wed Apr 27 20:14:30 2011
New Revision: 1097228

URL: http://svn.apache.org/viewvc?rev=1097228&view=rev
Log:
merge r1097187

Modified:
    lucene/dev/branches/realtime_search/   (props changed)
    lucene/dev/branches/realtime_search/lucene/   (props changed)
    lucene/dev/branches/realtime_search/lucene/contrib/lucli/build.xml   (props changed)
    lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
    lucene/dev/branches/realtime_search/modules/   (props changed)
    lucene/dev/branches/realtime_search/solr/   (props changed)

Modified: lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java?rev=1097228&r1=1097227&r2=1097228&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java Wed Apr 27 20:14:30 2011
@@ -30,6 +30,7 @@ public class TestValueSource extends Luc
   public void testMultiValueSource() throws Exception {
     Directory dir = newDirectory();
     IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+    ((LogMergePolicy) w.getConfig().getMergePolicy()).setMergeFactor(_TestUtil.nextInt(random, 2, 16));
     Document doc = new Document();
     Field f = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
     doc.add(f);