svn commit: r1804076 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: DefaultSegmentWriter.java file/FileStoreBuilder.java

[mduerig]

Author: mduerig
Date: Fri Aug  4 08:22:19 2017
New Revision: 1804076

URL: http://svn.apache.org/viewvc?rev=1804076&view=rev
Log:
OAK-6519: Properly handle tail compactions in deduplication caches
Adjust FIXME tags

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java?rev=1804076&r1=1804075&r2=1804076&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
 Fri Aug  4 08:22:19 2017
@@ -272,7 +272,7 @@ public class DefaultSegmentWriter implem
         SegmentWriteOperation with(@Nonnull SegmentBufferWriter writer) {
             checkState(this.writer == null);
             this.writer = writer;
-            // FIXME OAK-3349 Also take the tail part of the gc generation 
into account for allocating cache generations. Cache generations need to be a 
monotonically increasing, ordered sequence consisting of the full and tail part 
of the gc generation. See also 
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.EvictingWriteCacheManager.evictOldGeneration
+            // FIXME OAK-6519: Properly handle tail compactions in 
deduplication caches
             int generation = writer.getGeneration().getFull();
             this.stringCache = cacheManager.getStringCache(generation);
             this.templateCache = cacheManager.getTemplateCache(generation);

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=1804076&r1=1804075&r2=1804076&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
 Fri Aug  4 08:22:19 2017
@@ -102,7 +102,7 @@ public class FileStoreBuilder {
         public void compactionSucceeded(@Nonnull GCGeneration newGeneration) {
             compacted();
             if (cacheManager != null) {
-                // FIXME OAK-3349 also handle the tail part of the gc 
generation and flag. See also the respective todo at 
org.apache.jackrabbit.oak.segment.DefaultSegmentWriter.SegmentWriteOperation.with()
+                // FIXME OAK-6519: Properly handle tail compactions in 
deduplication caches
                 cacheManager.evictOldGeneration(newGeneration.getFull());
             }
         }
@@ -110,7 +110,7 @@ public class FileStoreBuilder {
         @Override
         public void compactionFailed(@Nonnull GCGeneration failedGeneration) {
             if (cacheManager != null) {
-                // FIXME OAK-3349 also handle the tail part of the gc 
generation and flag. See also the respective todo at 
org.apache.jackrabbit.oak.segment.DefaultSegmentWriter.SegmentWriteOperation.with()
+                // FIXME OAK-6519: Properly handle tail compactions in 
deduplication caches
                 cacheManager.evictGeneration(failedGeneration.getFull());
             }
         }