Author: mduerig
Date: Wed Jul 20 20:48:43 2016
New Revision: 1753606
URL: http://svn.apache.org/viewvc?rev=1753606&view=rev
Log:
OAK-4451: Implement a proper template cache
No need to special case empty cache as LIRS cache accepts 0 size since OAK-3089
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java?rev=1753606&r1=1753605&r2=1753606&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
Wed Jul 20 20:48:43 2016
@@ -70,24 +70,13 @@ public abstract class ReaderCache<T> {
*/
protected ReaderCache(long maxWeight, int averageWeight, @Nonnull String
name) {
this.name = checkNotNull(name);
- if (maxWeight >= 0) {
- fastCache = new FastCache<>();
- cache = CacheLIRS.<CacheKey<T>, T>newBuilder()
- .module(name)
- .maximumWeight(maxWeight)
- .averageWeight(averageWeight)
- .weigher(weigher)
- .build();
- } else {
- fastCache = null;
- // dummy cache to prevent NPE on the getStats() call
- cache = CacheLIRS.<CacheKey<T>, T> newBuilder()
- .module(name)
- .maximumWeight(1)
- .averageWeight(averageWeight)
- .weigher(weigher)
- .build();
- }
+ fastCache = new FastCache<>();
+ cache = CacheLIRS.<CacheKey<T>, T>newBuilder()
+ .module(name)
+ .maximumWeight(maxWeight)
+ .averageWeight(averageWeight)
+ .weigher(weigher)
+ .build();
}
@Nonnull
