svn commit: r1753969 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

[mduerig]

Author: mduerig
Date: Mon Jul 25 09:23:50 2016
New Revision: 1753969

URL: http://svn.apache.org/viewvc?rev=1753969&view=rev
Log:
OAK-4277: Finalise de-duplication caches: inject caches
OAK-4451: Implement a proper template cache: inject caches
Remove FIXME, cleanup code slightly

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.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=1753969&r1=1753968&r2=1753969&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
 Mon Jul 25 09:23:50 2016
@@ -235,35 +235,19 @@ public class FileStore implements Segmen
         this.tracker = new SegmentTracker();
         this.revisions = builder.getRevisions();
         this.blobStore = builder.getBlobStore();
-
-        // FIXME OAK-4277: Finalise de-duplication caches: inject caches
-        // from the outside so we can get rid of the cache stat accessors
         this.segmentCache = new SegmentCache(builder.getSegmentCacheSize());
-        Supplier<SegmentWriter> getWriter = new Supplier<SegmentWriter>() {
+        this.segmentReader = new CachingSegmentReader(new 
Supplier<SegmentWriter>() {
             @Override
             public SegmentWriter get() {
-                return getWriter();
-            }
-        };
-
-        // FIXME OAK-4451: Implement a proper template cache: inject caches
-        // from the outside so we can get rid of the cache stat accessors
-        this.segmentReader = new CachingSegmentReader(getWriter, blobStore,
-                builder.getStringCacheSize(), builder.getTemplateCacheSize());
-
-        Supplier<Integer> getGeneration = new Supplier<Integer>() {
-            @Override
-            public Integer get() {
-                return getGcGeneration();
+                return segmentWriter;
             }
-        };
+        }, blobStore, builder.getStringCacheSize(), 
builder.getTemplateCacheSize());
 
-        binaryReferenceConsumer = new BinaryReferenceConsumer() {
+        this.binaryReferenceConsumer = new BinaryReferenceConsumer() {
 
             @Override
             public void consume(int generation, String binaryReference) {
                 fileStoreLock.writeLock().lock();
-
                 try {
                     tarWriter.addBinaryReference(generation, binaryReference);
                 } finally {
@@ -274,7 +258,12 @@ public class FileStore implements Segmen
         };
 
         this.segmentWriter = segmentWriterBuilder("sys")
-                .withGeneration(getGeneration)
+                .withGeneration(new Supplier<Integer>() {
+                    @Override
+                    public Integer get() {
+                        return getGcGeneration();
+                    }
+                })
                 .withWriterPool()
                 .with(builder.getCacheManager())
                 .build(this);