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 2017/05/11 15:04:18 UTC
svn commit: r1794844 - in /jackrabbit/oak/trunk: oak-doc/src/site/markdown/
oak-run/src/main/java/org/apache/jackrabbit/oak/run/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/
Author: mduerig
Date: Thu May 11 15:04:18 2017
New Revision: 1794844
URL: http://svn.apache.org/viewvc?rev=1794844&view=rev
Log:
OAK-6213: Remove force flag from oak-run compact
Removed the force flag form the list of command line options
Modified:
jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md?rev=1794844&r1=1794843&r2=1794844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md Thu May 11 15:04:18 2017
@@ -44,7 +44,7 @@ that contains the segment (data*.tar) f
The oak-run compact operation may be used to perform an offline compaction:
- java -mx4g -jar oak-run-*.jar compact <repository> [--force]
+ java -mx4g -jar oak-run-*.jar compact <repository>
It makes sense to find and remove the old checkpoints, using the `checkpoint`
command described above.
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java?rev=1794844&r1=1794843&r2=1794844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java Thu May 11 15:04:18 2017
@@ -41,8 +41,6 @@ class CompactCommand implements Command
OptionParser parser = new OptionParser();
OptionSpec<String> directoryArg = parser.nonOptions(
"Path to segment store (required)").ofType(String.class);
- OptionSpec<Void> forceFlag = parser.accepts(
- "force", "Force compaction and ignore non matching segment version");
OptionSet options = parser.parse(args);
String path = directoryArg.value(options);
@@ -53,7 +51,6 @@ class CompactCommand implements Command
}
File directory = new File(path);
- boolean force = options.has(forceFlag);
boolean success = false;
Set<String> beforeLs = newHashSet();
@@ -70,7 +67,7 @@ class CompactCommand implements Command
System.out.println(" -> compacting");
try {
- SegmentTarUtils.compact(directory, force);
+ SegmentTarUtils.compact(directory);
success = true;
} catch (Throwable e) {
System.out.println("Compaction failure stack trace:");
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java?rev=1794844&r1=1794843&r2=1794844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java Thu May 11 15:04:18 2017
@@ -202,10 +202,9 @@ final class SegmentTarUtils {
.run();
}
- static void compact(File directory, boolean force) {
+ static void compact(File directory) {
Compact.builder()
.withPath(directory)
- .withForce(force)
.build()
.run();
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java?rev=1794844&r1=1794843&r2=1794844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java Thu May 11 15:04:18 2017
@@ -50,8 +50,6 @@ public class Compact implements Runnable
private File path;
- private boolean force;
-
private Builder() {
// Prevent external instantiation.
}
@@ -67,21 +65,6 @@ public class Compact implements Runnable
return this;
}
- /**
- * Set whether or not to force compact concurrent commits on top of
- * already compacted commits after the maximum number of retries has
- * been reached. Force committing tries to exclusively write lock the
- * node store.
- *
- * @param force {@code true} to force an exclusive commit of the
- * compacted state, {@code false} otherwise.
- * @return this builder.
- */
- public Builder withForce(boolean force) {
- this.force = force;
- return this;
- }
-
/**
* Create an executable version of the {@link Compact} command.
*