Author: tomekr
Date: Wed Nov 23 10:17:18 2016
New Revision: 1770941
URL: http://svn.apache.org/viewvc?rev=1770941&view=rev
Log:
OAK-5071: Persistent cache: use the asynchronous mode by default
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java?rev=1770941&r1=1770940&r2=1770941&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Wed Nov 23 10:17:18 2016
@@ -54,12 +54,6 @@ public class PersistentCache implements
static final Logger LOG = LoggerFactory.getLogger(PersistentCache.class);
- /**
- * Whether to use the queue to put items into cache. Default: false (cache
- * will be updated synchronously).
- */
- private static final boolean ASYNC_CACHE =
Boolean.getBoolean("oak.cache.asynchronous");
-
private static final String FILE_PREFIX = "cache-";
private static final String FILE_SUFFIX = ".data";
private static final AtomicInteger COUNTER = new AtomicInteger();
@@ -73,7 +67,7 @@ public class PersistentCache implements
private boolean cacheDocChildren;
private boolean compactOnClose;
private boolean compress = true;
- private boolean asyncCache = ASYNC_CACHE;
+ private boolean asyncCache = true;
private boolean asyncDiffCache = false;
private HashMap<CacheType, GenerationCache> caches =
new HashMap<CacheType, GenerationCache>();
@@ -148,8 +142,6 @@ public class PersistentCache implements
manualCommit = true;
} else if (p.startsWith("broadcast=")) {
broadcast = p.split("=")[1];
- } else if (p.equals("+async")) {
- asyncCache = true;
} else if (p.equals("-async")) {
asyncCache = false;
} else if (p.equals("+asyncDiff")) {
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java?rev=1770941&r1=1770940&r2=1770941&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
Wed Nov 23 10:17:18 2016
@@ -59,7 +59,7 @@ public class AsyncQueueTest {
@Before
public void setup() throws IOException {
FileUtils.deleteDirectory(new File("target/cacheTest"));
- pCache = new PersistentCache("target/cacheTest,+async");
+ pCache = new PersistentCache("target/cacheTest");
final AtomicReference<NodeCache<PathRev, StringValue>> nodeCacheRef =
new AtomicReference<NodeCache<PathRev, StringValue>>();
CacheLIRS<PathRev, StringValue> cache = new CacheLIRS.Builder<PathRev,
StringValue>().maximumSize(1).evictionCallback(new
CacheLIRS.EvictionCallback<PathRev, StringValue>() {
@Override
