Author: tomekr Date: Wed Nov 22 10:17:32 2017 New Revision: 1816027 URL: http://svn.apache.org/viewvc?rev=1816027&view=rev Log: OAK-6971: Remove composite node store-related features from the oak-upgrade
Removed: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Wed Nov 22 10:17:32 2017 @@ -70,9 +70,7 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE; import static org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE; -import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS; -import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths; @@ -110,16 +108,6 @@ public class RepositorySidegrade { private Set<String> excludePaths = DEFAULT_EXCLUDE_PATHS; /** - * Paths supporting fragments during the copy process. Empty by default. - */ - private Set<String> fragmentPaths = DEFAULT_FRAGMENT_PATHS; - - /** - * Fragments to exclude during the copy process. Empty by default. - */ - private Set<String> excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS; - - /** * Paths to merge during the copy process. Empty by default. */ private Set<String> mergePaths = DEFAULT_MERGE_PATHS; @@ -128,8 +116,6 @@ public class RepositorySidegrade { private boolean forceCheckpoints = false; - private boolean includeIndex = false; - private boolean filterLongNames = true; private boolean verify = false; @@ -235,29 +221,6 @@ public class RepositorySidegrade { } /** - * Sets the paths that should support the fragments. - * - * @param fragmentPaths Paths that should support fragments. - */ - public void setFragmentPaths(@Nonnull String... fragmentPaths) { - this.fragmentPaths = copyOf(checkNotNull(fragmentPaths)); - } - - /** - * Sets the name fragments that should be excluded when the source repository - * is copied to the target repository. - * - * @param excludes Name fragments to be excluded from the copy. - */ - public void setExcludeFragments(@Nonnull String... excludes) { - this.excludeFragments = copyOf(checkNotNull(excludes)); - } - - public void setIncludeIndex(boolean includeIndex) { - this.includeIndex = includeIndex; - } - - /** * Sets the paths that should be merged when the source repository * is copied to the target repository. * @@ -457,9 +420,6 @@ public class RepositorySidegrade { NodeBuilder targetRoot = target.getRoot().builder(); copyWorkspace(sourceRoot, targetRoot); removeCheckpointReferences(targetRoot); - if (includeIndex) { - IndexCopier.copy(sourceRoot, targetRoot, includePaths); - } if (!versionCopyConfiguration.isCopyAll()) { NodeBuilder versionStorage = VersionHistoryUtil.getVersionStorage(targetRoot); if (!versionStorage.exists()) { // it's possible that this is a new repository and the version storage @@ -482,7 +442,7 @@ public class RepositorySidegrade { private void removeVersions() throws CommitFailedException { NodeState root = target.getRoot(); - NodeState wrappedRoot = FilteringNodeState.wrap("/", root, includePaths, excludePaths, fragmentPaths, excludeFragments); + NodeState wrappedRoot = FilteringNodeState.wrap("/", root, includePaths, excludePaths, FilteringNodeState.NONE, FilteringNodeState.NONE); List<String> versionablesToStrip = VersionHistoryUtil.getVersionableNodes(wrappedRoot, new TypePredicate(root, JcrConstants.MIX_VERSIONABLE), versionCopyConfiguration.getVersionsMinDate()); if (!versionablesToStrip.isEmpty()) { LOG.info("Removing version histories for included paths"); @@ -492,7 +452,7 @@ public class RepositorySidegrade { } private boolean isCompleteMigration() { - return includePaths.equals(DEFAULT_INCLUDE_PATHS) && excludePaths.equals(DEFAULT_EXCLUDE_PATHS) && excludeFragments.equals(DEFAULT_EXCLUDE_FRAGMENTS) && mergePaths.equals(DEFAULT_MERGE_PATHS) && fragmentPaths.equals(DEFAULT_FRAGMENT_PATHS); + return includePaths.equals(DEFAULT_INCLUDE_PATHS) && excludePaths.equals(DEFAULT_EXCLUDE_PATHS) && mergePaths.equals(DEFAULT_MERGE_PATHS); } private void copyWorkspace(NodeState sourceRoot, NodeBuilder targetRoot) { @@ -508,8 +468,6 @@ public class RepositorySidegrade { NodeStateCopier.builder() .include(includes) .exclude(excludes) - .supportFragment(fragmentPaths) - .excludeFragments(excludeFragments) .merge(merges) .copy(sourceRoot, targetRoot); @@ -570,7 +528,7 @@ public class RepositorySidegrade { private NodeState wrapNodeState(NodeState source, boolean tracePaths, boolean filterPaths) { NodeState wrapped = source; if (!isCompleteMigration() && filterPaths) { - wrapped = FilteringNodeState.wrap("/", wrapped, includePaths, excludePaths, fragmentPaths, excludeFragments); + wrapped = FilteringNodeState.wrap("/", wrapped, includePaths, excludePaths, FilteringNodeState.NONE, FilteringNodeState.NONE); } if (tracePaths) { wrapped = ReportingNodeState.wrap(wrapped, new LoggingReporter(LOG, "Copying", LOG_NODE_COPY, -1)); Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java Wed Nov 22 10:17:32 2017 @@ -159,10 +159,6 @@ public class RepositoryUpgrade { public static final Set<String> DEFAULT_EXCLUDE_PATHS = NONE; - public static final Set<String> DEFAULT_FRAGMENT_PATHS = NONE; - - public static final Set<String> DEFAULT_EXCLUDE_FRAGMENTS = NONE; - public static final Set<String> DEFAULT_MERGE_PATHS = NONE; /** @@ -186,16 +182,6 @@ public class RepositoryUpgrade { private Set<String> excludePaths = DEFAULT_EXCLUDE_PATHS; /** - * Paths supporting fragments during the copy process. Empty by default. - */ - private Set<String> fragmentPaths = DEFAULT_FRAGMENT_PATHS; - - /** - * Fragments to exclude during the copy process. Empty by default. - */ - private Set<String> excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS; - - /** * Paths to merge during the copy process. Empty by default. */ private Set<String> mergePaths = DEFAULT_MERGE_PATHS; @@ -352,25 +338,6 @@ public class RepositoryUpgrade { } /** - * Sets the paths that should support the fragments. - * - * @param fragmentPaths Paths that should support fragments. - */ - public void setFragmentPaths(@Nonnull String... fragmentPaths) { - this.fragmentPaths = copyOf(checkNotNull(fragmentPaths)); - } - - /** - * Sets the name fragments that should be excluded when the source repository - * is copied to the target repository. - * - * @param excludes Name fragments to be excluded from the copy. - */ - public void setExcludeFragments(@Nonnull String... excludes) { - this.excludeFragments = copyOf(checkNotNull(excludes)); - } - - /** * Sets the paths that should be merged when the source repository * is copied to the target repository. * @@ -594,7 +561,7 @@ public class RepositoryUpgrade { private void removeVersions() throws CommitFailedException { NodeState root = target.getRoot(); - NodeState wrappedRoot = FilteringNodeState.wrap("/", root, includePaths, excludePaths, fragmentPaths, excludeFragments); + NodeState wrappedRoot = FilteringNodeState.wrap("/", root, includePaths, excludePaths, FilteringNodeState.NONE, FilteringNodeState.NONE); List<String> versionablesToStrip = VersionHistoryUtil.getVersionableNodes(wrappedRoot, new TypePredicate(root, JcrConstants.MIX_VERSIONABLE), versionCopyConfiguration.getVersionsMinDate()); if (!versionablesToStrip.isEmpty()) { logger.info("Removing version histories for included paths"); @@ -987,8 +954,6 @@ public class RepositoryUpgrade { NodeStateCopier.builder() .include(includes) .exclude(excludes) - .supportFragment(fragmentPaths) - .excludeFragments(excludeFragments) .merge(merges) .copy(sourceRoot, targetRoot); Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java Wed Nov 22 10:17:32 2017 @@ -86,12 +86,6 @@ public class MigrationFactory { if (options.getExcludePaths() != null) { upgrade.setExcludes(options.getExcludePaths()); } - if (options.getFragmentPaths() != null) { - upgrade.setFragmentPaths(options.getFragmentPaths()); - } - if (options.getExcludeFragments() != null) { - upgrade.setExcludeFragments(options.getExcludeFragments()); - } if (options.getMergePaths() != null) { upgrade.setMerges(options.getMergePaths()); } @@ -114,17 +108,10 @@ public class MigrationFactory { if (options.getExcludePaths() != null) { sidegrade.setExcludes(options.getExcludePaths()); } - if (options.getExcludeFragments() != null) { - sidegrade.setExcludeFragments(options.getExcludeFragments()); - } - if (options.getFragmentPaths() != null) { - sidegrade.setFragmentPaths(options.getFragmentPaths()); - } if (options.getMergePaths() != null) { sidegrade.setMerges(options.getMergePaths()); } sidegrade.setFilterLongNames(stores.getSrcType().isSupportLongNames() && !stores.getDstType().isSupportLongNames()); - sidegrade.setIncludeIndex(options.isIncludeIndex()); sidegrade.setVerify(options.isVerify()); sidegrade.setOnlyVerify(options.isOnlyVerify()); sidegrade.setSkipCheckpoints(options.isSkipCheckpoints()); Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Wed Nov 22 10:17:32 2017 @@ -46,14 +46,8 @@ public class MigrationOptions { private final String[] excludePaths; - private final String[] fragmentPaths; - - private final String[] excludeFragments; - private final String[] mergePaths; - private final boolean includeIndex; - private final boolean failOnError; private final boolean earlyShutdown; @@ -121,10 +115,7 @@ public class MigrationOptions { } this.includePaths = checkPaths(args.getOptionList(OptionParserFactory.INCLUDE_PATHS)); this.excludePaths = checkPaths(args.getOptionList(OptionParserFactory.EXCLUDE_PATHS)); - this.fragmentPaths = checkPaths(args.getOptionList(OptionParserFactory.FRAGMENT_PATHS)); - this.excludeFragments = args.getOptionList(OptionParserFactory.EXCLUDE_FRAGMENTS); this.mergePaths = checkPaths(args.getOptionList(OptionParserFactory.MERGE_PATHS)); - this.includeIndex = args.hasOption(OptionParserFactory.INCLUDE_INDEX); this.failOnError = args.hasOption(OptionParserFactory.FAIL_ON_ERROR); this.earlyShutdown = args.hasOption(OptionParserFactory.EARLY_SHUTDOWN); this.skipInitialization = args.hasOption(OptionParserFactory.SKIP_INIT); @@ -185,14 +176,6 @@ public class MigrationOptions { return excludePaths; } - public String[] getFragmentPaths() { - return fragmentPaths; - } - - public String[] getExcludeFragments() { - return excludeFragments; - } - public String[] getMergePaths() { return mergePaths; } @@ -213,10 +196,6 @@ public class MigrationOptions { return skipNameCheck; } - public boolean isIncludeIndex() { - return includeIndex; - } - public boolean isIgnoreMissingBinaries() { return ignoreMissingBinaries; } @@ -342,14 +321,6 @@ public class MigrationOptions { log.info("paths to exclude: {}", (Object) excludePaths); } - if (fragmentPaths != null) { - log.info("paths supporting fragments: {}", (Object) fragmentPaths); - } - - if (excludeFragments != null) { - log.info("fragments to exclude: {}", (Object) excludeFragments); - } - if (failOnError) { log.info("Unreadable nodes will cause failure of the entire transaction"); } @@ -366,10 +337,6 @@ public class MigrationOptions { log.info("Test for long-named nodes will be disabled"); } - if (includeIndex) { - log.info("Index data for the paths {} will be copied", (Object) includePaths); - } - if (ignoreMissingBinaries) { log.info("Missing binaries won't break the migration"); } Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java Wed Nov 22 10:17:32 2017 @@ -70,18 +70,12 @@ public class OptionParserFactory { public static final String EXCLUDE_PATHS = "exclude-paths"; - public static final String FRAGMENT_PATHS = "fragment-paths"; - - public static final String EXCLUDE_FRAGMENTS = "exclude-fragments"; - public static final String MERGE_PATHS = "merge-paths"; public static final String SKIP_INIT = "skip-init"; public static final String SKIP_NAME_CHECK = "skip-name-check"; - public static final String INCLUDE_INDEX = "include-index"; - public static final String VERIFY = "verify"; public static final String ONLY_VERIFY = "only-verify"; @@ -138,13 +132,8 @@ public class OptionParserFactory { .ofType(String.class); op.accepts(EXCLUDE_PATHS, "Comma-separated list of paths to exclude during copy.").withRequiredArg() .ofType(String.class); - op.accepts(FRAGMENT_PATHS, "Comma-separated list of paths supporting fragments.").withRequiredArg() - .ofType(String.class); - op.accepts(EXCLUDE_FRAGMENTS, "Comma-separated list of fragments to exclude during copy.").withRequiredArg() - .ofType(String.class); op.accepts(MERGE_PATHS, "Comma-separated list of paths to merge during copy.").withRequiredArg() .ofType(String.class); - op.accepts(INCLUDE_INDEX, "Copy index data for paths specified in the " + INCLUDE_PATHS + " option"); } private static void addVersioningOptions(OptionParser op) { Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java Wed Nov 22 10:17:32 2017 @@ -73,12 +73,6 @@ public class IncludeExcludeSidegradeTest "/content/assets/foo/2011", "/content/assets/foo/2010" ); - sidegrade.setExcludeFragments( - "oak-mount-libs-xyz" - ); - sidegrade.setFragmentPaths( - "/content/other/path" - ); sidegrade.copy(); } finally { fileStore.close(); Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java?rev=1816027&r1=1816026&r2=1816027&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java Wed Nov 22 10:17:32 2017 @@ -54,10 +54,6 @@ public class IncludeExcludeUpgradeTest e JcrUtils.getOrCreateByPath("/content/assets/foo/2011", "nt:folder", session); JcrUtils.getOrCreateByPath("/content/assets/foo/2010", "nt:folder", session); JcrUtils.getOrCreateByPath("/content/assets/foo/2010/12", "nt:folder", session); - JcrUtils.getOrCreateByPath("/content/other/path/foo/oak-mount-libs-xyz/node1", "nt:folder", session); - JcrUtils.getOrCreateByPath("/content/other/path/foo/oak-mount-libs-xyz/node2", "nt:folder", session); - JcrUtils.getOrCreateByPath("/content/other/path/foo/oak-mount-apps-abc/node3", "nt:folder", session); - JcrUtils.getOrCreateByPath("/content/other/path/foo/oak-mount-apps-abc/node4", "nt:folder", session); session.save(); } @@ -78,12 +74,6 @@ public class IncludeExcludeUpgradeTest e "/content/assets/foo/2011", "/content/assets/foo/2010" ); - upgrade.setExcludeFragments( - "oak-mount-libs-xyz" - ); - upgrade.setFragmentPaths( - "/content/other/path" - ); upgrade.copy(null); } finally { context.getRepository().shutdown(); @@ -96,9 +86,7 @@ public class IncludeExcludeUpgradeTest e "/content/foo/en", "/content/assets/foo/2015/02", "/content/assets/foo/2015/01", - "/content/assets/foo/2014", - "/content/other/path/foo/oak-mount-apps-abc/node3", - "/content/other/path/foo/oak-mount-apps-abc/node4" + "/content/assets/foo/2014" ); } @@ -117,9 +105,7 @@ public class IncludeExcludeUpgradeTest e "/content/assets/foo/2013", "/content/assets/foo/2012", "/content/assets/foo/2011", - "/content/assets/foo/2010", - "/content/other/path/foo/oak-mount-libs-xyz/node1", - "/content/other/path/foo/oak-mount-libs-xyz/node2" + "/content/assets/foo/2010" ); } }