You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/11/20 15:27:47 UTC
svn commit: r1037223 - in
/lucene/dev/trunk/lucene/src/test/org/apache/lucene:
index/TestIndexWriter.java index/TestIndexWriterReader.java
search/BaseTestRangeFilter.java util/_TestUtil.java
Author: mikemccand
Date: Sat Nov 20 14:27:46 2010
New Revision: 1037223
URL: http://svn.apache.org/viewvc?rev=1037223&view=rev
Log:
factor out test method to configure IW to reduce open file count
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1037223&r1=1037222&r2=1037223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Sat Nov 20 14:27:46 2010
@@ -2365,11 +2365,7 @@ public class TestIndexWriter extends Luc
final Directory dir = newDirectory();
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
- LogMergePolicy lmp = (LogMergePolicy) w.getMergePolicy();
- if (lmp.getMergeFactor() > 5) {
- // reduce risk of too many open files
- lmp.setMergeFactor(5);
- }
+ _TestUtil.reduceOpenFiles(w);
w.commit();
final AtomicBoolean failed = new AtomicBoolean();
Thread[] threads = new Thread[NUM_THREADS];
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1037223&r1=1037222&r2=1037223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Sat Nov 20 14:27:46 2010
@@ -281,12 +281,7 @@ public class TestIndexWriterReader exten
Directory mainDir = newDirectory();
IndexWriter mainWriter = new IndexWriter(mainDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
-
- // try to keep open file count down:
- LogMergePolicy lmp = (LogMergePolicy) mainWriter.getMergePolicy();
- if (lmp.getMergeFactor() > 5) {
- lmp.setMergeFactor(5);
- }
+ _TestUtil.reduceOpenFiles(mainWriter);
mainWriter.setInfoStream(infoStream);
AddDirectoriesThreads addDirThreads = new AddDirectoriesThreads(numIter, mainWriter);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1037223&r1=1037222&r2=1037223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sat Nov 20 14:27:46 2010
@@ -25,7 +25,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -119,12 +118,7 @@ public class BaseTestRangeFilter extends
RandomIndexWriter writer = new RandomIndexWriter(random, index.index,
newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
-
- LogMergePolicy lmp = (LogMergePolicy) writer.w.getMergePolicy();
- if (lmp.getMergeFactor() > 5) {
- // reduce risk of too many open files
- lmp.setMergeFactor(5);
- }
+ _TestUtil.reduceOpenFiles(writer.w);
Document doc = new Document();
Field idField = newField(random, "id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java?rev=1037223&r1=1037222&r2=1037223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java Sat Nov 20 14:27:46 2010
@@ -17,19 +17,20 @@ package org.apache.lucene.util;
* limitations under the License.
*/
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Random;
+
+import org.apache.lucene.index.CheckIndex;
+import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.index.MergeScheduler;
-import org.apache.lucene.index.ConcurrentMergeScheduler;
-import org.apache.lucene.index.CheckIndex;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.SegmentWriteState;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Random;
public class _TestUtil {
@@ -223,4 +224,12 @@ public class _TestUtil {
return false;
}
}
+
+ // just tries to configure things to keep the open file
+ // count lowish
+ public static void reduceOpenFiles(IndexWriter w) {
+ // keep number of open files lowish
+ LogMergePolicy lmp = (LogMergePolicy) w.getMergePolicy();
+ lmp.setMergeFactor(Math.min(5, lmp.getMergeFactor()));
+ }
}