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 mr...@apache.org on 2015/11/10 14:13:07 UTC
svn commit: r1713631 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Tue Nov 10 13:13:07 2015
New Revision: 1713631
URL: http://svn.apache.org/viewvc?rev=1713631&view=rev
Log:
OAK-3608: Compare of node states on branch may be incorrect
Merged revisions 1713586,1713626 from trunk
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
- copied unchanged from r1713626, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/TrackingDiff.java
- copied unchanged from r1713586, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/TrackingDiff.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 10 13:13:07 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711296,1711498,1712042,1712490,1712531,1712730,1712785,1
713008,1713439,1713461,1713580
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711296,1711498,1712042,1712490,1712531,1712730,1712785,1
713008,1713439,1713461,1713580,1713586,1713626
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java?rev=1713631&r1=1713630&r2=1713631&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java Tue Nov 10 13:13:07 2015
@@ -18,10 +18,12 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
+import java.util.Collections;
import java.util.Map;
import java.util.NavigableMap;
import java.util.Set;
@@ -34,6 +36,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -257,6 +260,36 @@ class Branch {
}
/**
+ * Returns the modified paths since the base revision of this branch until
+ * the given branch revision {@code r} (inclusive).
+ *
+ * @param r a commit on this branch.
+ * @return modified paths until {@code r}.
+ * @throws IllegalArgumentException if r is not a branch revision.
+ */
+ Iterable<String> getModifiedPathsUntil(@Nonnull final Revision r) {
+ checkArgument(checkNotNull(r).isBranch(),
+ "Not a branch revision: %s", r);
+ if (!commits.containsKey(r)) {
+ return Collections.emptyList();
+ }
+ Iterable<Iterable<String>> paths = transform(filter(commits.entrySet(),
+ new Predicate<Map.Entry<Revision, BranchCommit>>() {
+ @Override
+ public boolean apply(Map.Entry<Revision, BranchCommit> input) {
+ return !input.getValue().isRebase()
+ && input.getKey().compareRevisionTime(r) <= 0;
+ }
+ }), new Function<Map.Entry<Revision, BranchCommit>, Iterable<String>>() {
+ @Override
+ public Iterable<String> apply(Map.Entry<Revision, BranchCommit> input) {
+ return input.getValue().getModifiedPaths();
+ }
+ });
+ return Iterables.concat(paths);
+ }
+
+ /**
* Information about a commit within a branch.
*/
abstract static class BranchCommit implements LastRevTracker {
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1713631&r1=1713630&r2=1713631&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Nov 10 13:13:07 2015
@@ -2275,9 +2275,9 @@ public final class DocumentNodeStore
addPathsForDiff(path, paths, getPendingModifications().getPaths(minRev));
for (Revision r : new Revision[]{fromRev, toRev}) {
if (r.isBranch()) {
- BranchCommit c = getBranches().getBranchCommit(r);
- if (c != null) {
- addPathsForDiff(path, paths, c.getModifiedPaths());
+ Branch b = branches.getBranch(r);
+ if (b != null) {
+ addPathsForDiff(path, paths, b.getModifiedPathsUntil(r));
}
}
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java?rev=1713631&r1=1713630&r2=1713631&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java Tue Nov 10 13:13:07 2015
@@ -104,7 +104,7 @@ public class ClusterRevisionComparisonTe
//Trigger a diff. With OAK-2144 an exception would be thrown as diff traverses
//the /a children
- c1ns1.compareAgainstBaseState(c1ns2, new ClusterTest.TrackingDiff());
+ c1ns1.compareAgainstBaseState(c1ns2, new TrackingDiff());
}
@Test
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1713631&r1=1713630&r2=1713631&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java Tue Nov 10 13:13:07 2015
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
-import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -26,7 +24,6 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -45,7 +42,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
-import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -463,52 +459,4 @@ public class ClusterTest {
traverse(child.getNodeState(), PathUtils.concat(path, child.getName()));
}
}
-
- static class TrackingDiff extends DefaultNodeStateDiff {
-
- final String path;
- final Set<String> added;
- final Set<String> deleted;
- final Set<String> modified;
-
- TrackingDiff() {
- this("/", new HashSet<String>(),
- new HashSet<String>(), new HashSet<String>());
- }
-
- private TrackingDiff(String path,
- Set<String> added,
- Set<String> deleted,
- Set<String> modified) {
- this.path = path;
- this.added = added;
- this.deleted = deleted;
- this.modified = modified;
- }
-
- @Override
- public boolean childNodeAdded(String name, NodeState after) {
- String p = PathUtils.concat(path, name);
- added.add(p);
- return after.compareAgainstBaseState(EMPTY_NODE,
- new TrackingDiff(p, added, deleted, modified));
- }
-
- @Override
- public boolean childNodeChanged(String name,
- NodeState before,
- NodeState after) {
- String p = PathUtils.concat(path, name);
- modified.add(p);
- return after.compareAgainstBaseState(before,
- new TrackingDiff(p, added, deleted, modified));
- }
-
- @Override
- public boolean childNodeDeleted(String name, NodeState before) {
- String p = PathUtils.concat(path, name);
- deleted.add(p);
- return MISSING_NODE.compareAgainstBaseState(before, new TrackingDiff(p, added, deleted, modified));
- }
- }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1713631&r1=1713630&r2=1713631&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Tue Nov 10 13:13:07 2015
@@ -594,7 +594,7 @@ public class DocumentNodeStoreTest {
assertTrue(found);
// diff must report '/test' modified and '/test/foo' added
- ClusterTest.TrackingDiff diff = new ClusterTest.TrackingDiff();
+ TrackingDiff diff = new TrackingDiff();
r2.compareAgainstBaseState(r1, diff);
assertEquals(1, diff.modified.size());
assertTrue(diff.modified.contains("/test"));
@@ -2177,6 +2177,54 @@ public class DocumentNodeStoreTest {
merge(ns3, b3);
}
+ // OAK-3608
+ @Test
+ public void compareOnBranch() throws Exception {
+ long modifiedResMillis = SECONDS.toMillis(MODIFIED_IN_SECS_RESOLUTION);
+ Clock clock = new Clock.Virtual();
+ clock.waitUntil(System.currentTimeMillis());
+ Revision.setClock(clock);
+ DocumentNodeStore ns = builderProvider.newBuilder()
+ .clock(clock)
+ .setAsyncDelay(0).getNodeStore();
+ // initial state
+ NodeBuilder builder = ns.getRoot().builder();
+ NodeBuilder p = builder.child("parent");
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ p.child("node-" + i);
+ }
+ p.child("node-x").child("child");
+ merge(ns, builder);
+ ns.runBackgroundOperations();
+
+ // wait until modified timestamp changes
+ clock.waitUntil(clock.getTime() + modifiedResMillis * 2);
+ // force new head revision with this different modified timestamp
+ builder = ns.getRoot().builder();
+ builder.child("a");
+ merge(ns, builder);
+
+ DocumentNodeState root = ns.getRoot();
+ final DocumentNodeStoreBranch b = ns.createBranch(root);
+ // branch state is now Unmodified
+ builder = root.builder();
+ builder.child("parent").child("node-x").child("child").child("x");
+ b.setRoot(builder.getNodeState());
+ // branch state is now InMemory
+ builder.child("b");
+ b.setRoot(builder.getNodeState());
+ // branch state is now Persisted
+ builder.child("c");
+ b.setRoot(builder.getNodeState());
+ // branch state is Persisted
+
+ // create a diff between base and head state of branch
+ DocumentNodeState head = asDocumentNodeState(b.getHead());
+ TrackingDiff diff = new TrackingDiff();
+ head.compareAgainstBaseState(root, diff);
+ assertTrue(diff.modified.contains("/parent/node-x/child"));
+ }
+
private static DocumentNodeState asDocumentNodeState(NodeState state) {
if (!(state instanceof DocumentNodeState)) {
throw new IllegalArgumentException("Not a DocumentNodeState");