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/04/22 17:02:24 UTC
svn commit: r1740533 - in
/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment:
SegmentWriter.java file/FileStore.java
Author: mduerig
Date: Fri Apr 22 15:02:23 2016
New Revision: 1740533
URL: http://svn.apache.org/viewvc?rev=1740533&view=rev
Log:
OAK-4279: Rework offline compaction
Update issue references in FIXME tags to point to point to this issue
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1740533&r1=1740532&r2=1740533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java Fri Apr 22 15:02:23 2016
@@ -876,7 +876,8 @@ public class SegmentWriter {
RecordId nodeId = null;
if (state instanceof SegmentNodeState) {
- // FIXME OAK-3348 offline compaction could remove those ids
+ // FIXME OAK-4279: Rework offline compaction
+ // Offline compaction could remove these ids
byte[] id = ((Record) state).getRecordId().toArray();
nodeId = writeBlock(id, 0, id.length);
}
Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1740533&r1=1740532&r2=1740533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Fri Apr 22 15:02:23 2016
@@ -1019,7 +1019,8 @@ public class FileStore implements Segmen
// Make the capacity and initial depth of the deduplication cache configurable
final DeduplicationCache<String> nodeCache = new DeduplicationCache<String>(1000000, 20);
- // FIXME OAK-3348 this way of compacting has not progress logging and cannot be cancelled
+ // FIXME OAK-4279: Rework offline compaction
+ // This way of compacting has not progress logging and cannot be cancelled
int gcGeneration = tracker.getGcGen() + 1;
SegmentWriter writer = new SegmentWriter(this, tracker.getSegmentVersion(),
new SegmentBufferWriter(this, tracker.getSegmentVersion(), "c", gcGeneration),