[infinispan-commits] Infinispan SVN: r2493 - in trunk/lucene-directory/src: main/java/org/infinispan/lucene/locking and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Oct 4 16:22:42 EDT 2010
Author: sannegrinovero
Date: 2010-10-04 16:22:41 -0400 (Mon, 04 Oct 2010)
New Revision: 2493
Modified:
trunk/lucene-directory/src/main/java/org/infinispan/lucene/FileListOperations.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexInput.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
Log:
reducing warnings in lucene directory - merged from branch 4.2
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/FileListOperations.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/FileListOperations.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/FileListOperations.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -35,6 +35,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
class FileListOperations {
private final FileListCacheKey fileListCacheKey;
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -71,6 +71,7 @@
* @see org.infinispan.lucene.locking.BaseLockFactory
* @see org.infinispan.lucene.locking.TransactionalLockFactory
*/
+ at SuppressWarnings("unchecked")
public class InfinispanDirectory extends Directory {
/**
@@ -131,9 +132,8 @@
this(cache, indexName, lf, chunkSize, makeDefaultSegmentReadLocker(cache, cache, cache, indexName));
}
- @Deprecated//too many constructors, this will be removed
public InfinispanDirectory(Cache cache, String indexName, int chunkSize, SegmentReadLocker readLocker) {
- this(cache, indexName, makeDefaultLockFactory(cache, indexName), chunkSize, readLocker);
+ this(cache, cache, indexName, makeDefaultLockFactory(cache, indexName), chunkSize, readLocker);
}
/**
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexInput.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexInput.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexInput.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -40,6 +40,7 @@
* @see org.apache.lucene.store.Directory
* @see org.apache.lucene.store.IndexInput
*/
+ at SuppressWarnings("unchecked")
public class InfinispanIndexInput extends IndexInput {
private static final Log log = LogFactory.getLog(InfinispanIndexInput.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -39,6 +39,7 @@
* @see org.apache.lucene.store.Directory
* @see org.apache.lucene.store.IndexInput
*/
+ at SuppressWarnings("unchecked")
public class InfinispanIndexOutput extends IndexOutput {
private static final Log log = LogFactory.getLog(InfinispanIndexOutput.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -35,6 +35,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
public class LuceneKey2StringMapper implements TwoWayKey2StringMapper {
/**
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -38,6 +38,7 @@
* @author Sanne Grinovero
* @since 4.0
*/
+ at SuppressWarnings("unchecked")
public class SingleChunkIndexInput extends IndexInput {
private final byte[] buffer;
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -38,6 +38,7 @@
* @see org.infinispan.lucene.InfinispanDirectory
* @see org.infinispan.lucene.locking.BaseLuceneLock
*/
+ at SuppressWarnings("unchecked")
public class BaseLockFactory extends LockFactory {
private static final Log log = LogFactory.getLog(BaseLockFactory.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -40,6 +40,7 @@
* @author Sanne Grinovero
* @see org.apache.lucene.store.Lock
*/
+ at SuppressWarnings("unchecked")
class BaseLuceneLock extends Lock {
private static final Log log = LogFactory.getLog(BaseLuceneLock.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -52,6 +52,7 @@
* @see org.infinispan.lucene.locking.TransactionalSharedLuceneLock
* @see org.apache.lucene.index.SerialMergeScheduler
*/
+ at SuppressWarnings("unchecked")
public class TransactionalLockFactory extends LockFactory {
private static final Log log = LogFactory.getLog(TransactionalLockFactory.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -45,6 +45,7 @@
* @see org.infinispan.lucene.locking.TransactionalLockFactory
* @see org.apache.lucene.store.Lock
*/
+ at SuppressWarnings("unchecked")
class TransactionalSharedLuceneLock extends Lock {
private static final Log log = LogFactory.getLog(TransactionalSharedLuceneLock.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -45,6 +45,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
public class DistributedSegmentReadLocker implements SegmentReadLocker {
private static final Log log = LogFactory.getLog(DistributedSegmentReadLocker.class);
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -35,6 +35,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
public class LocalLockMergingSegmentReadLocker implements SegmentReadLocker {
private final ConcurrentHashMap<String, LocalReadLock> localLocks = new ConcurrentHashMap<String, LocalReadLock>();
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -51,6 +51,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.DatabaseStoredIndexTest")
public class DatabaseStoredIndexTest extends SingleCacheManagerTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -37,6 +37,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
public class DirectoryIntegrityCheck {
/**
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -42,6 +42,7 @@
*
* @author Sanne Grinovero
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.DirectoryOnMultipleCachesTest")
public class DirectoryOnMultipleCachesTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -74,9 +74,9 @@
@Test
public void testReadingFromDifferentlySizedBuffers() throws IOException {
cache = cacheManager.getCache();
- Directory dirA = new InfinispanDirectory(cache, "indexName", 7);
+ Directory dirA = new InfinispanDirectory(cache, cache, cache, "indexName", 7);
writeTextToIndex(dirA, 0, "hi from node A");
- Directory dirB = new InfinispanDirectory(cache, "indexName", 8);
+ Directory dirB = new InfinispanDirectory(cache, cache, cache, "indexName", 8);
assertTextIsFoundInIds(dirB, "hi", 0);
writeTextToIndex(dirB, 1, "index B is sharing the same index but using a differently sized chunk size");
assertTextIsFoundInIds(dirA, "size", 1);
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -30,7 +30,6 @@
import java.util.Set;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.RAMDirectory;
@@ -49,6 +48,7 @@
* @author Davide Di Somma
* @author Sanne Grinovero
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.InfinispanDirectoryIOTest", sequential = true)
public class InfinispanDirectoryIOTest {
@@ -79,7 +79,7 @@
final int BUFFER_SIZE = 64;
Cache cache = cacheManager.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, BUFFER_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, BUFFER_SIZE);
String fileName = "SomeText.txt";
IndexOutput io = dir.createOutput(fileName);
@@ -146,7 +146,7 @@
final int BUFFER_SIZE = 64;
Cache cache = cacheManager.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, BUFFER_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, BUFFER_SIZE);
verifyOnBuffer("SingleChunk.txt", 61, BUFFER_SIZE, cache, dir, 15);
@@ -193,7 +193,7 @@
final int BUFFER_SIZE = 64;
Cache cache = cacheManager.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, BUFFER_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, BUFFER_SIZE);
final int FILE_SIZE = 1000;
assert BUFFER_SIZE < FILE_SIZE;
@@ -328,7 +328,7 @@
final int BUFFER_SIZE = 64;
Cache cache = cacheManager.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, BUFFER_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, BUFFER_SIZE);
// create file headers
FileMetadata file1 = new FileMetadata();
@@ -474,7 +474,7 @@
final int BUFFER_SIZE = 64;
Cache cache = cacheManager.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, BUFFER_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, BUFFER_SIZE);
IndexOutput io = dir.createOutput("MyNewFile.txt");
@@ -555,7 +555,7 @@
public void testChunkBordersOnInfinispan() throws IOException {
Cache cache = cacheManager.getCache();
cache.clear();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, 13);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, 13);
testChunkBorders(dir, cache);
cache.clear();
}
@@ -641,7 +641,7 @@
final int bufferSize = 300;
Cache cache = cacheManager.getCache();
cache.clear();
- InfinispanDirectory dir = new InfinispanDirectory(cache, INDEXNAME, 13);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, INDEXNAME, 13);
byte[] manyBytes = fillBytes(bufferSize);
IndexOutput indexOutput = dir.createOutput(filename);
for (int i = 0; i < 10; i++) {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -46,6 +46,7 @@
* @author Sanne Grinovero
*/
@Test(groups = "profiling", testName = "lucene.InfinispanDirectoryStressTest")
+ at SuppressWarnings("unchecked")
public class InfinispanDirectoryStressTest {
private static final Log log = LogFactory.getLog(InfinispanDirectoryStressTest.class);
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -30,7 +30,6 @@
import org.apache.lucene.store.Directory;
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.lucene.readlocks.DistributedSegmentReadLocker;
import org.infinispan.test.MultipleCacheManagersTest;
import org.testng.annotations.Test;
@@ -43,6 +42,7 @@
* @since 4.0
*/
@Test(groups = "functional", testName = "lucene.SimpleLuceneTest")
+ at SuppressWarnings("unchecked")
public class SimpleLuceneTest extends MultipleCacheManagersTest {
@Override
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -38,6 +38,7 @@
* @author Sanne Grinovero
* @since 4.0
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.locking.LockManagerFunctionalTest", enabled = true)
public class LockManagerFunctionalTest extends MultipleCacheManagersTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -31,6 +31,7 @@
* @author Sanne Grinovero
* @since 4.0
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.locking.TransactionalLockManagerFunctionalTest", enabled = true)
public class TransactionalLockManagerFunctionalTest extends LockManagerFunctionalTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -64,6 +64,7 @@
* @author Sanne Grinovero
* @since 4.0
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "profiling", testName = "lucene.profiling.IndexReadingStressTest", sequential = true)
public class IndexReadingStressTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -56,6 +56,7 @@
* @author Sanne Grinovero
* @since 4.0
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "profiling", testName = "lucene.profiling.PerformanceCompareStressTest", sequential = true)
public class PerformanceCompareStressTest {
@@ -97,7 +98,7 @@
@Test
public void profileTestInfinispanDirectoryWithNetworkDelayZero() throws Exception {
// TestingUtil.setDelayForCache(cache, 0, 0);
- InfinispanDirectory dir = new InfinispanDirectory(cache, indexName, CHUNK_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, indexName, CHUNK_SIZE);
stressTestDirectory(dir, "InfinispanClustered-delayedIO:0");
verifyDirectoryState();
}
@@ -105,7 +106,7 @@
@Test
public void profileTestInfinispanDirectoryWithNetworkDelay4() throws Exception {
TestingUtil.setDelayForCache(cache, 4, 4);
- InfinispanDirectory dir = new InfinispanDirectory(cache, indexName, CHUNK_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, indexName, CHUNK_SIZE);
stressTestDirectory(dir, "InfinispanClustered-delayedIO:4");
verifyDirectoryState();
}
@@ -113,7 +114,7 @@
@Test
public void profileTestInfinispanDirectoryWithHighNetworkDelay40() throws Exception {
TestingUtil.setDelayForCache(cache, 40, 40);
- InfinispanDirectory dir = new InfinispanDirectory(cache, indexName, CHUNK_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, indexName, CHUNK_SIZE);
stressTestDirectory(dir, "InfinispanClustered-delayedIO:40");
verifyDirectoryState();
}
@@ -123,7 +124,7 @@
CacheContainer cacheContainer = CacheTestSupport.createLocalCacheManager();
try {
cache = cacheContainer.getCache();
- InfinispanDirectory dir = new InfinispanDirectory(cache, indexName, CHUNK_SIZE);
+ InfinispanDirectory dir = new InfinispanDirectory(cache, cache, cache, indexName, CHUNK_SIZE);
stressTestDirectory(dir, "InfinispanLocal");
verifyDirectoryState();
} finally {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -42,6 +42,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.readlocks.DistributedSegmentReadLockerTest")
public class DistributedSegmentReadLockerTest extends MultipleCacheManagersTest {
@@ -75,7 +76,6 @@
}
@Test
- @SuppressWarnings("unchecked")
public void testIndexWritingAndFinding() throws IOException, InterruptedException {
verifyBoth(cache0,cache1);
IndexOutput indexOutput = dirA.createOutput(filename);
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -37,6 +37,7 @@
* @author Sanne Grinovero
* @since 4.1
*/
+ at SuppressWarnings("unchecked")
@Test(groups = "functional", testName = "lucene.readlocks.LocalLockMergingSegmentReadLockerTest")
public class LocalLockMergingSegmentReadLockerTest extends DistributedSegmentReadLockerTest {
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java 2010-10-04 20:16:13 UTC (rev 2492)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java 2010-10-04 20:22:41 UTC (rev 2493)
@@ -44,6 +44,7 @@
* @since 4.0
*/
@ThreadSafe
+ at SuppressWarnings("unchecked")
public class ClusteredCacheFactory {
private final BlockingQueue<Configuration> requests = new SynchronousQueue<Configuration>();
More information about the infinispan-commits
mailing list