Author: mreutegg
Date: Thu Nov 16 14:56:34 2017
New Revision: 1815466
URL: http://svn.apache.org/viewvc?rev=1815466&view=rev
Log:
OAK-6953: CacheLIRS cannot be disabled
Use Guava Cache when set to zero
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1815466&r1=1815465&r2=1815466&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Thu Nov 16 14:56:34 2017
@@ -1336,7 +1336,8 @@ public class DocumentMK {
if (LIRS_CACHE != null) {
useLirs = LIRS_CACHE;
}
- if (useLirs) {
+ // do not use LIRS cache when maxWeight is zero (OAK-6953)
+ if (useLirs && maxWeight > 0) {
return CacheLIRS.<K, V>newBuilder().
module(module).
weigher(new Weigher<K, V>() {
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java?rev=1815466&r1=1815465&r2=1815466&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
Thu Nov 16 14:56:34 2017
@@ -20,7 +20,6 @@ import java.io.File;
import com.google.common.cache.Cache;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -30,7 +29,6 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder.DEFAULT_PREV_DOC_CACHE_PERCENTAGE;
import static org.junit.Assert.assertEquals;
-@Ignore
public class DisableCacheTest {
@Rule
