Author: alexparvulescu Date: Mon Nov 14 13:46:15 2016 New Revision: 1769626
URL: http://svn.apache.org/viewvc?rev=1769626&view=rev Log: OAK-5100 Provide source store external references flag via command line if available Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1769626&r1=1769625&r2=1769626&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Mon Nov 14 13:46:15 2016 @@ -87,6 +87,8 @@ public class MigrationOptions { private final String dstS3; + private final Boolean srcExternalBlobs; + public MigrationOptions(MigrationCliArguments args) { this.disableMmap = args.hasOption(OptionParserFactory.DISABLE_MMAP); this.copyBinaries = args.hasOption(OptionParserFactory.COPY_BINARIES); @@ -134,6 +136,13 @@ public class MigrationOptions { this.dstFds = args.getOption(OptionParserFactory.DST_FDS); this.dstS3 = args.getOption(OptionParserFactory.DST_S3); this.dstS3Config = args.getOption(OptionParserFactory.DST_S3_CONFIG); + + if (args.hasOption(OptionParserFactory.SRC_EXTERNAL_BLOBS)) { + this.srcExternalBlobs = Boolean + .valueOf(OptionParserFactory.SRC_EXTERNAL_BLOBS); + } else { + this.srcExternalBlobs = null; + } } public boolean isCopyBinaries() { @@ -329,6 +338,10 @@ public class MigrationOptions { log.info("Missing binaries won't break the migration"); } + if (srcExternalBlobs != null) { + log.info("Source DataStore external blobs: {}", srcExternalBlobs); + } + log.info("Cache size: {} MB", cacheSizeInMB); } @@ -352,4 +365,8 @@ public class MigrationOptions { return calendar; } + public Boolean getSrcExternalBlobs() { + return srcExternalBlobs; + } + } Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java?rev=1769626&r1=1769625&r2=1769626&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java Mon Nov 14 13:46:15 2016 @@ -52,6 +52,8 @@ public class OptionParserFactory { public static final String SRC_S3_CONFIG = "src-s3config"; + public static final String SRC_EXTERNAL_BLOBS = "src-external-ds"; + public static final String DST_FDS = "datastore"; public static final String DST_FBS = "fileblobstore"; @@ -112,6 +114,7 @@ public class OptionParserFactory { op.accepts(DST_S3_CONFIG, "Configuration file for the target S3DataStore").withRequiredArg() .ofType(String.class); op.accepts(IGNORE_MISSING_BINARIES, "Don't break the migration if some binaries are missing"); + op.accepts(SRC_EXTERNAL_BLOBS, "Flag specifying if the source Store has external references or not"); } private static void addRdbOptions(OptionParser op) { Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java?rev=1769626&r1=1769625&r2=1769626&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java Mon Nov 14 13:46:15 2016 @@ -58,6 +58,10 @@ public class StoreArguments { src = descriptors.get(0); dst = descriptors.get(1); + + if (options.getSrcExternalBlobs() != null) { + srcHasExternalBlobRefs = options.getSrcExternalBlobs(); + } } public void logOptions() {
