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/03/30 08:13:34 UTC
svn commit: r1789448 -
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
Author: tomekr
Date: Thu Mar 30 08:13:34 2017
New Revision: 1789448
URL: http://svn.apache.org/viewvc?rev=1789448&view=rev
Log:
OAK-6003: Allow to migrate checkpoints for all type of sidegrades
Don't wrap the node state when calling compareAgainstBaseState(), so the
node states can be compared in the optimized way.
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1789448&r1=1789447&r2=1789448&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Thu Mar 30 08:13:34 2017
@@ -343,7 +343,7 @@ public class RepositorySidegrade {
copyProperties(checkpointRoot, targetRoot);
} else {
LOG.info("Applying diff to {}", checkpoint.getName());
- checkpointRoot.compareAgainstBaseState(wrapSource(previousRoot), new ApplyDiff(targetRoot));
+ checkpointRoot.compareAgainstBaseState(previousRoot, new ApplyDiff(targetRoot));
}
target.merge(targetRoot, EmptyHook.INSTANCE, CommitInfo.EMPTY);
previousRoot = checkpointRoot;
@@ -366,7 +366,7 @@ public class RepositorySidegrade {
copyProperties(sourceRoot, targetRoot);
} else {
LOG.info("Applying diff to head");
- sourceRoot.compareAgainstBaseState(wrapSource(previousRoot), new ApplyDiff(targetRoot));
+ sourceRoot.compareAgainstBaseState(previousRoot, new ApplyDiff(targetRoot));
}
LOG.info("Rewriting checkpoint names in /:async {}", nameToRevision);