[infinispan-commits] Infinispan SVN: r1927 - in branches/4.1.x/lucene-directory/src: test/java/org/infinispan/lucene and 3 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jun 21 12:30:17 EDT 2010
Author: sannegrinovero
Date: 2010-06-21 12:30:16 -0400 (Mon, 21 Jun 2010)
New Revision: 1927
Added:
branches/4.1.x/lucene-directory/src/test/resources/log4j.xml
Modified:
branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
Log:
[ISPN-499] (tests cleanup for Lucene Directory) - branch 4.1.x
Modified: branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
===================================================================
--- branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-06-21 16:28:25 UTC (rev 1926)
+++ branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-06-21 16:30:16 UTC (rev 1927)
@@ -23,7 +23,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Set;
import org.apache.lucene.store.AlreadyClosedException;
Modified: branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
===================================================================
--- branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java 2010-06-21 16:28:25 UTC (rev 1926)
+++ branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java 2010-06-21 16:30:16 UTC (rev 1927)
@@ -96,7 +96,7 @@
// this is a write
IndexWriter writer = null;
try {
- writer = LuceneSettings.openWriter(d);
+ writer = LuceneSettings.openWriter(d, 2000);
log.info("IndexWriter was constructed");
Document doc = new Document();
@@ -146,6 +146,7 @@
public static void initializeDirectory(Directory directory) throws IOException {
IndexWriter iwriter = new IndexWriter(directory, LuceneSettings.analyzer, true, MaxFieldLength.UNLIMITED);
+ iwriter.setUseCompoundFile(false);
iwriter.commit();
iwriter.close();
//reopen to check for index
Modified: branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
===================================================================
--- branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java 2010-06-21 16:28:25 UTC (rev 1926)
+++ branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java 2010-06-21 16:30:16 UTC (rev 1927)
@@ -52,7 +52,7 @@
protected void testLoop() throws IOException {
Set<String> strings = new HashSet<String>();
int numElements = state.stringsOutOfIndex.drainTo(strings, 5);
- IndexWriter iwriter = LuceneSettings.openWriter(directory);
+ IndexWriter iwriter = LuceneSettings.openWriter(directory, 5000);
for (String term : strings) {
Document doc = new Document();
doc.add(new Field("main", term, Store.NO, Index.NOT_ANALYZED));
Modified: branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
===================================================================
--- branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java 2010-06-21 16:28:25 UTC (rev 1926)
+++ branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java 2010-06-21 16:30:16 UTC (rev 1927)
@@ -21,12 +21,14 @@
*/
package org.infinispan.lucene.profiling;
+import java.io.File;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
import org.infinispan.Cache;
import org.infinispan.lucene.CacheKey;
@@ -40,7 +42,7 @@
/**
* PerformanceCompareStressTest is useful to get an idea on relative performance between Infinispan
- * in local or clustered mode against a RAMDirectory.
+ * in local or clustered mode against a RAMDirectory or FSDirectory.
* To be reliable set a long DURATION_MS.
* This is not meant as a benchmark but used to detect regressions.
*
@@ -53,9 +55,9 @@
public class PerformanceCompareStressTest {
/** Concurrent Threads in tests */
- private static final int THREADS = 10;
+ private static final int THREADS = 8;
- private static final long DURATION_MS = 10000;
+ private static final long DURATION_MS = 100000;
private static final ClusteredCacheFactory cacheFactory = new ClusteredCacheFactory(CacheTestSupport.createTestConfiguration());
@@ -65,6 +67,14 @@
testDirectory(dir, "RAMDirectory");
}
+ @Test(enabled = false)
+ public void profileTestFSDirectory() throws InterruptedException, IOException {
+ File indexDir = new File(new File("."), "tempindex");
+ indexDir.mkdirs();
+ FSDirectory dir = FSDirectory.open(indexDir);
+ testDirectory(dir, "FSDirectory");
+ }
+
@Test
public void profileTestInfinispanDirectory() throws InterruptedException, IOException {
//these default are not for performance settings but meant for problem detection:
@@ -86,7 +96,7 @@
}
private void testDirectory(Directory dir, String testLabel) throws InterruptedException, IOException {
- SharedState state = new SharedState(1000);
+ SharedState state = new SharedState(200000);
CacheTestSupport.initializeDirectory(dir);
ExecutorService e = Executors.newFixedThreadPool(THREADS+1);
for (int i=0; i<THREADS; i++) {
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-06-21 16:28:25 UTC (rev 1926)
+++ branches/4.1.x/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java 2010-06-21 16:30:16 UTC (rev 1927)
@@ -48,9 +48,10 @@
/**
* Until ISPN-307 it's mandatory to set the MergeScheduler to a SerialMergeScheduler when opening an IndexWriter
*/
- public static IndexWriter openWriter(Directory directory) throws CorruptIndexException, LockObtainFailedException, IOException {
+ public static IndexWriter openWriter(Directory directory, int maxMergeDocs) throws CorruptIndexException, LockObtainFailedException, IOException {
IndexWriter iwriter = new IndexWriter(directory, LuceneSettings.analyzer, false, MaxFieldLength.UNLIMITED);
- iwriter.setMergeScheduler( mergeScheduler );
+ iwriter.setMergeScheduler(mergeScheduler);
+ iwriter.setMaxMergeDocs(maxMergeDocs);
return iwriter;
}
Added: branches/4.1.x/lucene-directory/src/test/resources/log4j.xml
===================================================================
--- branches/4.1.x/lucene-directory/src/test/resources/log4j.xml (rev 0)
+++ branches/4.1.x/lucene-directory/src/test/resources/log4j.xml 2010-06-21 16:30:16 UTC (rev 1927)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!--
+ For more configuration information and examples see the Apache Log4j website: http://logging.apache.org/log4j/
+ -->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="infinispan.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <param name="Threshold" value="TRACE"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="TRACE"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c{1}] (%t) %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.infinispan">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.infinispan.lucene">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.infinispan.factories">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <priority value="WARN"/>
+ <!--<appender-ref ref="CONSOLE"/>-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
More information about the infinispan-commits
mailing list