[infinispan-commits] Infinispan SVN: r2142 - branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Aug 3 12:07:30 EDT 2010
Author: sannegrinovero
Date: 2010-08-03 12:07:29 -0400 (Tue, 03 Aug 2010)
New Revision: 2142
Modified:
branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
Log:
[ISPN-307] (Lucene Directory not supporting Lucene's ConcurrentMergeScheduler) branch 4.1
Modified: branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
===================================================================
--- branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java 2010-08-03 15:47:53 UTC (rev 2141)
+++ branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java 2010-08-03 16:07:29 UTC (rev 2142)
@@ -45,15 +45,18 @@
private static final MergeScheduler mergeScheduler = new SerialMergeScheduler();
- /**
- * Until ISPN-307 it's mandatory to set the MergeScheduler to a SerialMergeScheduler when opening an IndexWriter
- */
- public static IndexWriter openWriter(Directory directory, int maxMergeDocs) throws CorruptIndexException, LockObtainFailedException, IOException {
+ public static IndexWriter openWriter(Directory directory, int maxMergeDocs, boolean useSerialMerger) throws CorruptIndexException, LockObtainFailedException, IOException {
IndexWriter iwriter = new IndexWriter(directory, LuceneSettings.analyzer, false, MaxFieldLength.UNLIMITED);
- iwriter.setMergeScheduler(mergeScheduler);
+ if (useSerialMerger) {
+ iwriter.setMergeScheduler(mergeScheduler);
+ }
iwriter.setMaxMergeDocs(maxMergeDocs);
iwriter.setUseCompoundFile(false);
return iwriter;
}
+
+ public static IndexWriter openWriter(Directory directory, int maxMergeDocs) throws CorruptIndexException, LockObtainFailedException, IOException {
+ return openWriter(directory, maxMergeDocs, false);
+ }
}
More information about the infinispan-commits
mailing list