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 2016/06/03 08:37:34 UTC

svn commit: r1746687 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: SegmentReaders.java file/FileStore.java http/HttpStore.java memory/MemoryStore.java

Author: mduerig
Date: Fri Jun  3 08:37:34 2016
New Revision: 1746687

URL: http://svn.apache.org/viewvc?rev=1746687&view=rev
Log:
OAK-4373: Refactor SegmentTracker
Remove SegmentReaders static factory and inline (its few) usages

Removed:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentReaders.java
Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1746687&r1=1746686&r2=1746687&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Fri Jun  3 08:37:34 2016
@@ -89,7 +89,6 @@ import org.apache.jackrabbit.oak.segment
 import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
 import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
 import org.apache.jackrabbit.oak.segment.SegmentReader;
-import org.apache.jackrabbit.oak.segment.SegmentReaders;
 import org.apache.jackrabbit.oak.segment.SegmentStore;
 import org.apache.jackrabbit.oak.segment.SegmentTracker;
 import org.apache.jackrabbit.oak.segment.SegmentVersion;
@@ -133,7 +132,7 @@ public class FileStore implements Segmen
     private final SegmentWriter segmentWriter;
 
     @Nonnull
-    private final SegmentReader segmentReader;
+    private final CachingSegmentReader segmentReader;
 
     private final File directory;
 
@@ -438,12 +437,18 @@ public class FileStore implements Segmen
         } else {
             this.segmentCache = new SegmentCache(DEFAULT_STRING_CACHE_MB);
         }
+        Supplier<SegmentWriter> getWriter = new Supplier<SegmentWriter>() {
+            @Override
+            public SegmentWriter get() {
+                return getWriter();
+            }
+        };
         if (builder.cacheSize < 0) {
-            this.segmentReader = SegmentReaders.segmentReader(this, 0);
+            this.segmentReader = new CachingSegmentReader(getWriter, revisions, blobStore, 0);
         } else if (builder.cacheSize > 0) {
-            this.segmentReader = SegmentReaders.segmentReader(this, builder.cacheSize);
+            this.segmentReader = new CachingSegmentReader(getWriter, revisions, blobStore, (long) builder.cacheSize);
         } else {
-            this.segmentReader = SegmentReaders.segmentReader(this, DEFAULT_STRING_CACHE_MB);
+            this.segmentReader = new CachingSegmentReader(getWriter, revisions, blobStore, (long) DEFAULT_STRING_CACHE_MB);
         }
         this.segmentWriter = pooledSegmentWriter(this, version, "sys", new Supplier<Integer>() {
                     @Override
@@ -559,10 +564,9 @@ public class FileStore implements Segmen
         return segmentCache.getCacheStats();
     }
 
-    // FIXME OAK-4373 move access to the cache stats to the segment reader and avoid casting to implementation
     @Nonnull
     public CacheStats getStringCacheStats() {
-        return ((CachingSegmentReader)segmentReader).getStringCacheStats();
+        return segmentReader.getStringCacheStats();
     }
 
     public void maybeCompact(boolean cleanup) throws IOException {

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java?rev=1746687&r1=1746686&r2=1746687&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java Fri Jun  3 08:37:34 2016
@@ -33,14 +33,15 @@ import java.nio.ByteBuffer;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.oak.segment.CachingSegmentReader;
 import org.apache.jackrabbit.oak.segment.Revisions;
 import org.apache.jackrabbit.oak.segment.Segment;
 import org.apache.jackrabbit.oak.segment.SegmentId;
 import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
 import org.apache.jackrabbit.oak.segment.SegmentReader;
-import org.apache.jackrabbit.oak.segment.SegmentReaders;
 import org.apache.jackrabbit.oak.segment.SegmentStore;
 import org.apache.jackrabbit.oak.segment.SegmentTracker;
 import org.apache.jackrabbit.oak.segment.SegmentWriter;
@@ -55,7 +56,15 @@ public class HttpStore implements Segmen
     private final HttpStoreRevisions revisions = new HttpStoreRevisions(this);
 
     @Nonnull
-    private final SegmentReader segmentReader = SegmentReaders.segmentReader(this, DEFAULT_STRING_CACHE_MB);
+    private final Supplier<SegmentWriter> getWriter = new Supplier<SegmentWriter>() {
+        @Override
+        public SegmentWriter get() {
+            return getWriter();
+        }
+    };
+    @Nonnull
+    private final SegmentReader segmentReader = new CachingSegmentReader(
+            getWriter, revisions, null, DEFAULT_STRING_CACHE_MB);
 
     @Nonnull
     private final SegmentWriter segmentWriter = pooledSegmentWriter(this,

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java?rev=1746687&r1=1746686&r2=1746687&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java Fri Jun  3 08:37:34 2016
@@ -28,14 +28,15 @@ import java.util.concurrent.ConcurrentMa
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;
+import org.apache.jackrabbit.oak.segment.CachingSegmentReader;
 import org.apache.jackrabbit.oak.segment.Revisions;
 import org.apache.jackrabbit.oak.segment.Segment;
 import org.apache.jackrabbit.oak.segment.SegmentId;
 import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
 import org.apache.jackrabbit.oak.segment.SegmentReader;
-import org.apache.jackrabbit.oak.segment.SegmentReaders;
 import org.apache.jackrabbit.oak.segment.SegmentStore;
 import org.apache.jackrabbit.oak.segment.SegmentTracker;
 import org.apache.jackrabbit.oak.segment.SegmentWriter;
@@ -63,7 +64,13 @@ public class MemoryStore implements Segm
 
     public MemoryStore() throws IOException {
         this.revisions = new MemoryStoreRevisions();
-        this.segmentReader = SegmentReaders.segmentReader(this, 16);
+        Supplier<SegmentWriter> getWriter = new Supplier<SegmentWriter>() {
+            @Override
+            public SegmentWriter get() {
+                return getWriter();
+            }
+        };
+        this.segmentReader = new CachingSegmentReader(getWriter, revisions, null, 16);
         this.segmentWriter = pooledSegmentWriter(this,
                 LATEST_VERSION, "sys", Suppliers.ofInstance(0));
         revisions.bind(this);