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 to...@apache.org on 2017/05/09 11:51:10 UTC
svn commit: r1794545 - in
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade:
cli/parser/MigrationOptions.java nodestate/FilteringNodeState.java
Author: tomekr
Date: Tue May 9 11:51:10 2017
New Revision: 1794545
URL: http://svn.apache.org/viewvc?rev=1794545&view=rev
Log:
OAK-6188: Allow to exclude nodes containing name fragment during the migration
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/nodestate/FilteringNodeState.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=1794545&r1=1794544&r2=1794545&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 Tue May 9 11:51:10 2017
@@ -329,6 +329,10 @@ public class MigrationOptions {
log.info("paths to exclude: {}", (Object) excludePaths);
}
+ if (excludeFragments != null) {
+ log.info("fragments to exclude: {}", (Object) excludeFragments);
+ }
+
if (failOnError) {
log.info("Unreadable nodes will cause failure of the entire transaction");
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java?rev=1794545&r1=1794544&r2=1794545&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java Tue May 9 11:51:10 2017
@@ -163,7 +163,8 @@ public class FilteringNodeState extends
@Nonnull final Set<String> excludePaths,
@Nonnull final Set<String> excludedFragments
) {
- return isHidden(path, includePaths, excludePaths, excludedFragments)
+ return !excludedFragments.isEmpty()
+ || isHidden(path, includePaths, excludePaths, excludedFragments)
|| isAncestorOfAnyPath(path, excludePaths)
|| isAncestorOfAnyPath(path, includePaths);
}