[infinispan-commits] Infinispan SVN: r2581 - in trunk/lucene-directory/src/main/java/org/infinispan/lucene: readlocks and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Oct 22 11:00:58 EDT 2010
Author: sannegrinovero
Date: 2010-10-22 11:00:58 -0400 (Fri, 22 Oct 2010)
New Revision: 2581
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/InfinispanIndexOutput.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
Log:
[ISPN-727] (Use Flag.SKIP_CACHE_LOAD when no return value is needed in Lucene Directory) - merged from branch 4.2 to trunk
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-22 14:55:22 UTC (rev 2580)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/FileListOperations.java 2010-10-22 15:00:58 UTC (rev 2581)
@@ -71,7 +71,7 @@
Set<String> fileList = getFileList();
boolean done = fileList.remove(fileName);
if (done) {
- cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).put(fileListCacheKey, fileList);
+ cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING, Flag.SKIP_CACHE_LOAD).put(fileListCacheKey, fileList);
}
}
@@ -83,7 +83,7 @@
Set<String> fileList = getFileList();
boolean done = fileList.add(fileName);
if (done) {
- cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).put(fileListCacheKey, fileList);
+ cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD, Flag.SKIP_LOCKING).put(fileListCacheKey, fileList);
}
}
@@ -107,7 +107,7 @@
boolean doneAdd = fileList.add(toAdd);
boolean doneRemove = fileList.remove(toRemove);
if (doneAdd || doneRemove) {
- cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).put(fileListCacheKey, fileList);
+ cache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD, Flag.SKIP_LOCKING).put(fileListCacheKey, fileList);
}
}
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-22 14:55:22 UTC (rev 2580)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-10-22 15:00:58 UTC (rev 2581)
@@ -249,7 +249,7 @@
break;
}
ChunkCacheKey toChunkKey = new ChunkCacheKey(indexName, to, i);
- chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP).put(toChunkKey, ob);
+ chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD).put(toChunkKey, ob);
} while (true);
// rename metadata first
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-22 14:55:22 UTC (rev 2580)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java 2010-10-22 15:00:58 UTC (rev 2581)
@@ -163,11 +163,11 @@
// create key for the current chunk
ChunkCacheKey key = new ChunkCacheKey(fileKey.getIndexName(), fileKey.getFileName(), currentChunkNumber);
if (trace) log.trace("Storing segment chunk: " + key);
- chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).put(key, bufferToFlush);
+ chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD, Flag.SKIP_LOCKING).put(key, bufferToFlush);
}
// override existing file header with new size and updated accesstime
file.touch();
- metadataCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).put(fileKey, file);
+ metadataCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD, Flag.SKIP_LOCKING).put(fileKey, file);
registerToFileListIfNeeded();
if (microbatch) chunksCache.endBatch(true);
}
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-22 14:55:22 UTC (rev 2580)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java 2010-10-22 15:00:58 UTC (rev 2581)
@@ -152,7 +152,7 @@
// T1 fileKey exists - T2 delete file and remove readlock - T1 putIfAbsent(readlock, 2)
final FileCacheKey fileKey = new FileCacheKey(indexName, filename);
if (metadataCache.get(fileKey) == null) {
- locksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP).removeAsync(readLockKey);
+ locksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD).removeAsync(readLockKey);
return false;
}
}
@@ -182,13 +182,13 @@
for (int i = 0; i < file.getNumberOfChunks(); i++) {
ChunkCacheKey chunkKey = new ChunkCacheKey(indexName, filename, i);
if (trace) log.trace("deleting chunk: " + chunkKey);
- chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_LOCKING).removeAsync(chunkKey);
+ chunksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD, Flag.SKIP_LOCKING).removeAsync(chunkKey);
}
}
// last operation, as being set as value==0 it prevents others from using it during the
// deletion process:
if (trace) log.trace("deleting readlock: " + readLockKey);
- locksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP).removeAsync(readLockKey);
+ locksCache.withFlags(Flag.SKIP_REMOTE_LOOKUP, Flag.SKIP_CACHE_LOAD).removeAsync(readLockKey);
}
private static void verifyCacheHasnoEviction(AdvancedCache cache) {
More information about the infinispan-commits
mailing list