svn commit: r1800076 - in /jackrabbit/oak/trunk/oak-segment-tar/src: main/java/org/apache/jackrabbit/oak/segment/OnlineCompactor.java test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java

[mduerig]

Author: mduerig
Date: Tue Jun 27 16:21:02 2017
New Revision: 1800076

URL: http://svn.apache.org/viewvc?rev=1800076&view=rev
Log:
OAK-6399: Re-establish full offline compaction functionality
Fixme tags

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

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/OnlineCompactor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/OnlineCompactor.java?rev=1800076&r1=1800075&r2=1800076&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/OnlineCompactor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/OnlineCompactor.java
 Tue Jun 27 16:21:02 2017
@@ -44,6 +44,7 @@ import org.apache.jackrabbit.oak.spi.blo
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
 
+// FIXME OAK-6399 unify with Compactor (progress tracker? eager-flush, content 
based binary deduplication, unit tests, etc...)
 /**
  * Instances of this class can be used to compact a node state. I.e. to create 
a clone
  * of a given node state without value sharing except for binaries. Binaries 
that are

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java?rev=1800076&r1=1800075&r2=1800076&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
 Tue Jun 27 16:21:02 2017
@@ -368,7 +368,7 @@ public class CompactionAndCleanupIT {
     }
 
     @Test
-    @Ignore
+    @Ignore("OAK-6399") // FIXME OAK-6399: this test fails because the content 
based binary deduplication feature is missing in OnlineCompactor
     public void offlineCompactionBinC1() throws Exception {
         SegmentGCOptions gcOptions = defaultGCOptions().setOffline()
                 .withBinaryDeduplication();