You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2017/02/27 11:03:37 UTC

svn commit: r1784531 - in /jackrabbit/oak/trunk/oak-segment-tar/src: main/java/org/apache/jackrabbit/oak/segment/RecordCache.java test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java

Author: mduerig
Date: Mon Feb 27 11:03:37 2017
New Revision: 1784531

URL: http://svn.apache.org/viewvc?rev=1784531&view=rev
Log:
OAK-5850: Weight reported by the record cache is off by one
Initialise weight to 0 instead of -1. Re-enable the failing tests.

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
    jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java?rev=1784531&r1=1784530&r2=1784531&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java Mon Feb 27 11:03:37 2017
@@ -155,7 +155,7 @@ public abstract class RecordCache<T> {
         @Nonnull
         private final Weigher<T, RecordId> weigher;
 
-        private long weight = -1;
+        private long weight = 0;
 
         static final <T> Supplier<RecordCache<T>> defaultFactory(final int size, @Nonnull final Weigher<T, RecordId> weigher) {
             return new Supplier<RecordCache<T>>() {

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java?rev=1784531&r1=1784530&r2=1784531&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheStatsTest.java Mon Feb 27 11:03:37 2017
@@ -28,7 +28,6 @@ import com.google.common.base.Supplier;
 import com.google.common.cache.CacheStats;
 import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class RecordCacheStatsTest {
@@ -148,13 +147,11 @@ public class RecordCacheStatsTest {
     }
 
     @Test
-    @Ignore
     public void estimateCurrentWeight() {
         assertEquals(KEYS, cacheStats.estimateCurrentWeight());
     }
 
     @Test
-    @Ignore
     public void resetStats() {
         cacheStats.resetStats();
         assertEquals(0, cacheStats.getRequestCount());