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/08 16:23:18 UTC
svn commit: r1747416 - in /jackrabbit/oak/trunk:
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/
oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/
Author: mduerig
Date: Wed Jun 8 16:23:18 2016
New Revision: 1747416
URL: http://svn.apache.org/viewvc?rev=1747416&view=rev
Log:
@Trivial: FIXMEs
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
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/file/FileStoreBuilder.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java?rev=1747416&r1=1747415&r2=1747416&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java Wed Jun 8 16:23:18 2016
@@ -31,6 +31,8 @@ import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+// FIXME OAK-4451: Implement a proper template cache
+// - move the template cache into this class, implement monitoring, management, logging, tests
public class CachingSegmentReader implements SegmentReader {
public static final int DEFAULT_STRING_CACHE_MB = 256;
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=1747416&r1=1747415&r2=1747416&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 Wed Jun 8 16:23:18 2016
@@ -226,12 +226,15 @@ public class FileStore implements Segmen
};
+ // FIXME OAK-4450: Properly split the FileStore into read-only and r/w variants
FileStore(FileStoreBuilder builder, boolean readOnly) throws IOException {
this.tracker = new SegmentTracker();
this.revisions = builder.getRevisions();
this.blobStore = builder.getBlobStore();
// FIXME OAK-4373 refactor cache size configurations
+ // FIXME OAK-4277: Finalise de-duplication caches: inject caches
+ // from the outside so we can get rid of the cache stat accessors
if (builder.getCacheSize() < 0) {
this.segmentCache = new SegmentCache(0);
} else if (builder.getCacheSize() > 0) {
@@ -245,6 +248,10 @@ public class FileStore implements Segmen
return getWriter();
}
};
+
+ // FIXME OAK-4373 refactor cache size configurations
+ // FIXME OAK-4451: Implement a proper template cache: inject caches
+ // from the outside so we can get rid of the cache stat accessors
if (builder.getCacheSize() < 0) {
this.segmentReader = new CachingSegmentReader(getWriter, revisions, blobStore, 0);
} else if (builder.getCacheSize() > 0) {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1747416&r1=1747415&r2=1747416&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java Wed Jun 8 16:23:18 2016
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
/**
* Builder for creating {@link FileStore} instances.
*/
+// FIXME OAK-4449: SegmentNodeStore and SegmentStore builders should log their parameters on build()
public class FileStoreBuilder {
private static final Logger LOG = LoggerFactory.getLogger(FileStore.class);
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1747416&r1=1747415&r2=1747416&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Wed Jun 8 16:23:18 2016
@@ -72,6 +72,7 @@ import org.slf4j.LoggerFactory;
*/
public class SegmentNodeStore implements NodeStore, Observable {
+ // FIXME OAK-4449: SegmentNodeStore and SegmentStore builders should log their parameters on build()
public static class SegmentNodeStoreBuilder {
private final SegmentStore store;