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 16:12:22 UTC
svn commit: r1740528 - in
/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment:
compaction/CompactionStrategy.java file/TarWriter.java
Author: mduerig
Date: Fri Apr 22 14:12:22 2016
New Revision: 1740528
URL: http://svn.apache.org/viewvc?rev=1740528&view=rev
Log:
FIXME OAK-4276: Refactor / rework compaction strategies
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/compaction/CompactionStrategy.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarWriter.java
Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/compaction/CompactionStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/compaction/CompactionStrategy.java?rev=1740528&r1=1740527&r2=1740528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/compaction/CompactionStrategy.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/compaction/CompactionStrategy.java Fri Apr 22 14:12:22 2016
@@ -29,7 +29,8 @@ import org.apache.jackrabbit.oak.segment
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-// FIXME OAK-3348 Refactor this into a proper AST. Identify and remove "legacy" parts
+// FIXME OAK-4276: Refactor / rework compaction strategies
+// Refactor this into a proper AST. Identify and remove "legacy" parts
public class CompactionStrategy {
private static final Logger LOG = LoggerFactory.getLogger(CompactionStrategy.class);
@@ -116,7 +117,8 @@ public class CompactionStrategy {
private boolean forceAfterFail = FORCE_AFTER_FAIL_DEFAULT;
- // FIXME OAK-3348 Make the lock wait time configurable
+ // FIXME OAK-4276: Refactor / rework compaction strategies
+ // Make the lock wait time configurable
private int lockWaitTime = 60;
private long compactionStart = currentTimeMillis();
Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarWriter.java?rev=1740528&r1=1740527&r2=1740528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarWriter.java Fri Apr 22 14:12:22 2016
@@ -477,7 +477,8 @@ class TarWriter implements Closeable {
return header;
}
- // FIXME OAK-3348 this method is not used anymore. Remove unless we decide
+ // FIXME OAK-4276: Refactor / rework compaction strategies
+ // This method is not used anymore. Remove unless we decide
// to offer an alternative cleanup strategy based on reachability, in which
// case it will still be needed
/**