Author: frm
Date: Tue Aug 30 11:38:12 2016
New Revision: 1758368
URL: http://svn.apache.org/viewvc?rev=1758368&view=rev
Log:
OAK-4721 - Switch to oak-segment-tar by default when using CLI tools
Remove the --segment-tar command line flag. Use oak-segment-tar by default and
add a --segment command line flag to use the old oak-segment when needed.
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
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/DataStoreCheckCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
Tue Aug 30 11:38:12 2016
@@ -56,7 +56,7 @@ public class Console {
OptionSpec shell = parser.accepts("shell", "run the shell after
executing files");
OptionSpec readWrite = parser.accepts("read-write", "connect to
repository in read-write mode");
OptionSpec<String> fdsPathSpec = parser.accepts("fds-path", "Path to
FDS store").withOptionalArg().defaultsTo("");
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSpec help = parser.acceptsAll(asList("h", "?", "help"), "show
help").forHelp();
// RDB specific options
@@ -123,9 +123,7 @@ public class Console {
}
DocumentNodeStore store = builder.getNodeStore();
fixture = new MongoFixture(store);
- } else if (options.has(segmentTar)) {
- fixture = SegmentTarFixture.create(new File(nonOptions.get(0)),
readOnly, blobStore);
- } else {
+ } else if (options.has(segment)) {
FileStore.Builder fsBuilder = FileStore.builder(new
File(nonOptions.get(0))).withMaxFileSize(256);
if (blobStore != null) {
fsBuilder.withBlobStore(blobStore);
@@ -137,6 +135,8 @@ public class Console {
store = fsBuilder.build();
}
fixture = new SegmentFixture(store);
+ } else {
+ fixture = SegmentTarFixture.create(new File(nonOptions.get(0)),
readOnly, blobStore);
}
List<String> scriptArgs = nonOptions.size() > 1 ?
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java
Tue Aug 30 11:38:12 2016
@@ -59,7 +59,7 @@ public class Explorer {
public static void main(String[] args) throws IOException {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSpec skipSizeCheck = parser.accepts("skip-size-check", "Don't
compute the size of the records");
OptionSpec<File> nonOptions = parser.nonOptions().ofType(File.class);
OptionSet options = parser.parse(args);
@@ -73,10 +73,10 @@ public class Explorer {
ExplorerBackend backend;
- if (options.has(segmentTar)) {
- backend = new SegmentTarExplorerBackend(path);
- } else {
+ if (options.has(segment)) {
backend = new SegmentExplorerBackend(path);
+ } else {
+ backend = new SegmentTarExplorerBackend(path);
}
new Explorer(path, backend, options.has(skipSizeCheck));
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
Tue Aug 30 11:38:12 2016
@@ -78,8 +78,7 @@ public class TextExtractorMain {
.withRequiredArg()
.ofType(String.class);
- OptionSpec segmentTar = parser
- .accepts("segment-tar", "Use oak-segment-tar instead of
oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSpec<String> pathSpec = parser
.accepts("path", "Path in repository under which the
binaries would be searched")
@@ -217,7 +216,7 @@ public class TextExtractorMain {
checkNotNull(blobStore, "BlobStore found to be null.
FileDataStore directory " +
"must be specified via %s", fdsDirSpec.options());
checkNotNull(dataFile, "Data file path not provided");
- NodeStore nodeStore = bootStrapNodeStore(src,
options.has(segmentTar), blobStore, closer);
+ NodeStore nodeStore = bootStrapNodeStore(src,
options.has(segment), blobStore, closer);
BinaryResourceProvider brp = new
NodeStoreBinaryResourceProvider(nodeStore, blobStore);
CSVFileGenerator generator = new CSVFileGenerator(dataFile);
generator.generate(brp.getBinaries(path));
@@ -287,7 +286,7 @@ public class TextExtractorMain {
return props;
}
- private static NodeStore bootStrapNodeStore(String src, boolean
segmentTar, BlobStore blobStore, Closer closer) throws IOException,
InvalidFileStoreVersionException {
+ private static NodeStore bootStrapNodeStore(String src, boolean segment,
BlobStore blobStore, Closer closer) throws IOException,
InvalidFileStoreVersionException {
if (src.startsWith(MongoURI.MONGODB_PREFIX)) {
MongoClientURI uri = new MongoClientURI(src);
if (uri.getDatabase() == null) {
@@ -304,11 +303,11 @@ public class TextExtractorMain {
return store;
}
- if (segmentTar) {
- return SegmentTarUtils.bootstrap(src, blobStore, closer);
+ if (segment) {
+ return SegmentUtils.bootstrap(src, blobStore, closer);
}
- return SegmentUtils.bootstrap(src, blobStore, closer);
+ return SegmentTarUtils.bootstrap(src, blobStore, closer);
}
private static Closeable asCloseable(final FileStore fs) {
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
Tue Aug 30 11:38:12 2016
@@ -28,7 +28,7 @@ class BackupCommand implements Command {
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
if (options.nonOptionArguments().size() < 2) {
@@ -39,10 +39,11 @@ class BackupCommand implements Command {
File source = new File(options.nonOptionArguments().get(0).toString());
File target = new File(options.nonOptionArguments().get(1).toString());
- if (options.has(segmentTar)) {
- SegmentTarUtils.backup(source, target);
- } else {
+ if (options.has(segment)) {
SegmentUtils.backup(source, target);
+ } else {
+ SegmentTarUtils.backup(source, target);
+
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
Tue Aug 30 11:38:12 2016
@@ -44,7 +44,7 @@ class CheckCommand implements Command {
ArgumentAcceptingOptionSpec<Long> bin = parser.accepts(
"bin", "read the n first bytes from binary properties. -1 for
all bytes.")
.withOptionalArg().ofType(Long.class).defaultsTo(0L);
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
@@ -60,10 +60,10 @@ class CheckCommand implements Command {
long debugLevel = deep.value(options);
long binLen = bin.value(options);
- if (options.has(segmentTar)) {
- SegmentTarUtils.check(dir, journalFileName, fullTraversal,
debugLevel, binLen);
- } else {
+ if (options.has(segment)) {
SegmentUtils.check(dir, journalFileName, fullTraversal,
debugLevel, binLen);
+ } else {
+ SegmentTarUtils.check(dir, journalFileName, fullTraversal,
debugLevel, binLen);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
Tue Aug 30 11:38:12 2016
@@ -36,11 +36,11 @@ class CheckpointsCommand implements Comm
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
if (options.nonOptionArguments().isEmpty()) {
- System.out.println("usage: checkpoints {<path>|<mongo-uri>}
[list|rm-all|rm-unreferenced|rm <checkpoint>] [--segment-tar]");
+ System.out.println("usage: checkpoints {<path>|<mongo-uri>}
[list|rm-all|rm-unreferenced|rm <checkpoint>] [--segment]");
System.exit(1);
}
@@ -65,10 +65,10 @@ class CheckpointsCommand implements Comm
.getNodeStore();
closer.register(Utils.asCloseable(store));
cps = Checkpoints.onDocumentMK(store);
- } else if (options.has(segmentTar)) {
- cps = Checkpoints.onSegmentTar(new File(connection), closer);
- } else {
+ } else if (options.has(segment)) {
cps = Checkpoints.onSegment(new File(connection), closer);
+ } else {
+ cps = Checkpoints.onSegmentTar(new File(connection), closer);
}
System.out.println("Checkpoints " + connection);
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=1758368&r1=1758367&r2=1758368&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
Tue Aug 30 11:38:12 2016
@@ -42,7 +42,7 @@ class CompactCommand implements Command
"Path to segment store (required)").ofType(String.class);
OptionSpec<Void> forceFlag = parser.accepts(
"force", "Force compaction and ignore non matching segment
version");
- OptionSpec<?> segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
String path = directoryArg.value(options);
@@ -70,10 +70,10 @@ class CompactCommand implements Command
System.out.println(" -> compacting");
try {
- if (options.has(segmentTar)) {
- SegmentTarUtils.compact(directory, force);
- } else {
+ if (options.has(segment)) {
SegmentUtils.compact(directory, force);
+ } else {
+ SegmentTarUtils.compact(directory, force);
}
success = true;
} catch (Throwable e) {
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
Tue Aug 30 11:38:12 2016
@@ -91,8 +91,7 @@ public class DataStoreCheckCommand imple
// Optional argument to specify the dump path
ArgumentAcceptingOptionSpec<String> dump = parser.accepts("dump",
"Dump Path")
.withRequiredArg().ofType(String.class);
- OptionSpec
- segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSpec<?> help = parser.acceptsAll(asList("h", "?", "help"),
"show help").forHelp();
@@ -133,12 +132,12 @@ public class DataStoreCheckCommand imple
closer.register(Utils.asCloseable(nodeStore));
blobStore = (GarbageCollectableBlobStore)
nodeStore.getBlobStore();
marker = new DocumentBlobReferenceRetriever(nodeStore);
- } else if (options.has(segmentTar)) {
- marker = SegmentTarUtils.newBlobReferenceRetriever(source,
closer);
- } else {
+ } else if (options.has(segment)) {
FileStore fileStore = openFileStore(source);
closer.register(Utils.asCloseable(fileStore));
marker = new
SegmentBlobReferenceRetriever(fileStore.getTracker());
+ } else {
+ marker = SegmentTarUtils.newBlobReferenceRetriever(source,
closer);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java
Tue Aug 30 11:38:12 2016
@@ -26,7 +26,7 @@ class DebugCommand implements Command {
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSpec<String> nonOptions =
parser.nonOptions().ofType(String.class);
OptionSet options = parser.parse(args);
@@ -37,10 +37,10 @@ class DebugCommand implements Command {
String[] nonOptionsArray = options.valuesOf(nonOptions).toArray(new
String[0]);
- if (options.has(segmentTar)) {
- SegmentTarUtils.debug(nonOptionsArray);
- } else {
+ if (options.has(segment)) {
SegmentUtils.debug(nonOptionsArray);
+ } else {
+ SegmentTarUtils.debug(nonOptionsArray);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java
Tue Aug 30 11:38:12 2016
@@ -38,7 +38,7 @@ class FileStoreDiffCommand implements Co
OptionSpec<?> incrementalO = parser.accepts("incremental", "Runs diffs
between each subsequent revisions in the provided interval");
OptionSpec<String> pathO = parser.accepts("path", "Filter diff by
given path").withRequiredArg().ofType(String.class).defaultsTo("/");
OptionSpec<?> ignoreSNFEsO = parser.accepts("ignore-snfes", "Ignores
SegmentNotFoundExceptions and continues running the diff (experimental)");
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
if (options.has(help)) {
@@ -61,10 +61,10 @@ class FileStoreDiffCommand implements Co
String path = pathO.value(options);
boolean ignoreSNFEs = options.has(ignoreSNFEsO);
- if (options.has(segmentTar)) {
- SegmentTarUtils.diff(store, out, listOnly, interval, incremental,
path, ignoreSNFEs);
- } else {
+ if (options.has(segment)) {
SegmentUtils.diff(store, out, listOnly, interval, incremental,
path, ignoreSNFEs);
+ } else {
+ SegmentTarUtils.diff(store, out, listOnly, interval, incremental,
path, ignoreSNFEs);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java
Tue Aug 30 11:38:12 2016
@@ -45,7 +45,7 @@ class GraphCommand implements Command {
"pattern", "Regular exception specifying which nodes to
include (optional). " +
"Ignore when --gc is specified.")
.withRequiredArg().ofType(String.class);
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
@@ -82,10 +82,10 @@ class GraphCommand implements Command {
boolean gcGraph = options.has(gcGraphArg);
- if (options.has(segmentTar)) {
- SegmentTarUtils.graph(directory, gcGraph, epoch, regExp, out);
- } else {
+ if (options.has(segment)) {
SegmentUtils.graph(directory, gcGraph, epoch, regExp, out);
+ } else {
+ SegmentTarUtils.graph(directory, gcGraph, epoch, regExp, out);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java
Tue Aug 30 11:38:12 2016
@@ -41,7 +41,7 @@ class HistoryCommand implements Command
OptionSpec<Integer> depthArg = parser.accepts(
"depth", "Depth up to which to dump node
states").withRequiredArg().ofType(Integer.class)
.defaultsTo(0);
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
File directory = directoryArg.value(options);
@@ -56,10 +56,10 @@ class HistoryCommand implements Command
String journalName = journalArg.value(options);
File journal = new File(isValidFileStoreOrFail(directory),
journalName);
- if (options.has(segmentTar)) {
- SegmentTarUtils.history(directory, journal, path, depth);
- } else {
+ if (options.has(segment)) {
SegmentUtils.history(directory, journal, path, depth);
+ } else {
+ SegmentTarUtils.history(directory, journal, path, depth);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
Tue Aug 30 11:38:12 2016
@@ -84,7 +84,7 @@ class ResetClusterIdCommand implements C
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
if (options.nonOptionArguments().isEmpty()) {
@@ -105,12 +105,12 @@ class ResetClusterIdCommand implements C
.getNodeStore();
closer.register(Utils.asCloseable(dns));
store = dns;
- } else if (options.has(segmentTar)) {
- store = SegmentTarUtils.bootstrapNodeStore(source, closer);
- } else {
+ } else if (options.has(segment)) {
FileStore fs = openFileStore(source);
closer.register(Utils.asCloseable(fs));
store = SegmentNodeStore.builder(fs).build();
+ } else {
+ store = SegmentTarUtils.bootstrapNodeStore(source, closer);
}
deleteClusterId(store);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
Tue Aug 30 11:38:12 2016
@@ -29,7 +29,7 @@ class RestoreCommand implements Command
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
- OptionSpec segmentTar = parser.accepts("segment-tar", "Use
oak-segment-tar instead of oak-segment");
+ OptionSpec segment = parser.accepts("segment", "Use oak-segment
instead of oak-segment-tar");
OptionSet options = parser.parse(args);
if (options.nonOptionArguments().size() < 2) {
@@ -40,10 +40,10 @@ class RestoreCommand implements Command
File target = new File(options.nonOptionArguments().get(0).toString());
File source = new File(options.nonOptionArguments().get(1).toString());
- if (options.has(segmentTar)) {
- SegmentTarUtils.restore(source, target);
- } else {
+ if (options.has(segment)) {
SegmentUtils.restore(source, target);
+ } else {
+ SegmentTarUtils.restore(source, target);
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java?rev=1758368&r1=1758367&r2=1758368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Tue Aug 30 11:38:12 2016
@@ -18,6 +18,9 @@
*/
package org.apache.jackrabbit.oak.run;
+import static com.google.common.base.Charsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,9 +47,10 @@ import org.apache.commons.lang3.StringEs
import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
-import org.apache.jackrabbit.oak.plugins.segment.SegmentBlob;
-import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.SegmentBlob;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -60,9 +64,6 @@ import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Charsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-
/**
* Tests for {@link DataStoreCheckCommand}
*/
@@ -90,11 +91,12 @@ public class DataStoreCheckTest {
File storeFile = temporaryFolder.newFolder();
storePath = storeFile.getAbsolutePath();
- FileStore.Builder builder = FileStore.builder(storeFile)
- .withBlobStore(blobStore).withMaxFileSize(256)
- .withCacheSize(64).withMemoryMapping(false);
- FileStore fileStore = builder.build();
- NodeStore store = SegmentNodeStore.builder(fileStore).build();
+ FileStore fileStore = FileStoreBuilder.fileStoreBuilder(storeFile)
+ .withBlobStore(blobStore)
+ .withMaxFileSize(256)
+ .withSegmentCacheSize(64)
+ .build();
+ NodeStore store = SegmentNodeStoreBuilders.builder(fileStore).build();
/* Create nodes with blobs stored in DS*/
NodeBuilder a = store.getRoot().builder();
