Author: mreutegg
Date: Mon Nov 23 09:43:35 2015
New Revision: 1715747
URL: http://svn.apache.org/viewvc?rev=1715747&view=rev
Log:
OAK-3557: NodeDocument.isConflicting() reads complete revision history for
changed property
Merged revision 1712018 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 23 09:43:35 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,1681921,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,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,1711282,1711296,1
711498,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191
+/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,1681921,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,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,1711282,1711296,1
711498,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1715747&r1=1715746&r2=1715747&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Mon Nov 23 09:43:35 2015
@@ -999,7 +999,7 @@ public final class NodeDocument extends
continue;
}
// was this property touched after baseRevision?
- for (Revision rev : getValueMap(name).keySet()) {
+ for (Revision rev : getChanges(name, baseRevision, context)) {
if (rev.equals(commitRevision)) {
continue;
}
@@ -1417,6 +1417,59 @@ public final class NodeDocument extends
}
/**
+ * Returns all changes for the given property back to {@code min} revision
+ * (exclusive). The revisions include committed as well as uncommitted
+ * changes.
+ *
+ * @param property the name of the property.
+ * @param min the lower bound revision (exclusive).
+ * @param context the revision context.
+ * @return changes back to {@code min} revision.
+ */
+ @Nonnull
+ Iterable<Revision> getChanges(@Nonnull final String property,
+ @Nonnull final Revision min,
+ @Nonnull final RevisionContext context) {
+ return new Iterable<Revision>() {
+ @Override
+ public Iterator<Revision> iterator() {
+ final Set<Revision> changes = getValueMap(property).keySet();
+ final Set<Integer> clusterIds = Sets.newHashSet();
+ for (Revision r : getLocalMap(property).keySet()) {
+ clusterIds.add(r.getClusterId());
+ }
+ for (Range r : getPreviousRanges().values()) {
+ if (isRevisionNewer(context, r.high, min)) {
+ clusterIds.add(r.high.getClusterId());
+ }
+ }
+ final Iterator<Revision> unfiltered = changes.iterator();
+ return new AbstractIterator<Revision>() {
+ @Override
+ protected Revision computeNext() {
+ while (unfiltered.hasNext()) {
+ Revision next = unfiltered.next();
+ if (isRevisionNewer(context, next, min)) {
+ return next;
+ } else {
+ // further revisions with this clusterId
+ // are older than min revision
+ clusterIds.remove(next.getClusterId());
+ // no more revisions to check
+ if (clusterIds.isEmpty()) {
+ return endOfData();
+ }
+ }
+ }
+ return endOfData();
+ }
+ };
+ }
+ };
+
+ }
+
+ /**
* Returns the local value map for the given key.
*
* @param key the key.
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java?rev=1715747&r1=1715746&r2=1715747&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
Mon Nov 23 09:43:35 2015
@@ -23,7 +23,6 @@ import static java.util.AbstractMap.Simp
import java.util.Iterator;
import java.util.Map;
-import java.util.NoSuchElementException;
import java.util.TreeMap;
import javax.annotation.Nonnull;
@@ -31,6 +30,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
+import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -85,37 +85,17 @@ class PropertyHistory implements Iterabl
* @return the docs in the correct order.
*/
private Iterator<NodeDocument> ensureOrder(final
Iterable<Map.Entry<Revision, NodeDocument>> docs) {
- return new Iterator<NodeDocument>() {
+ return new AbstractIterator<NodeDocument>() {
PeekingIterator<Map.Entry<Revision, NodeDocument>> input
= Iterators.peekingIterator(docs.iterator());
TreeMap<Revision, NodeDocument> queue =
new TreeMap<Revision,
NodeDocument>(StableRevisionComparator.INSTANCE);
- NodeDocument next = fetchNext();
@Override
- public boolean hasNext() {
- return next != null;
- }
-
- @Override
- public NodeDocument next() {
- if (!hasNext()) {
- throw new NoSuchElementException();
- }
- NodeDocument doc = next;
- next = fetchNext();
- return doc;
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- private NodeDocument fetchNext() {
+ protected NodeDocument computeNext() {
refillQueue();
if (queue.isEmpty()) {
- return null;
+ return endOfData();
} else {
return queue.remove(queue.lastKey());
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1715747&r1=1715746&r2=1715747&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Mon Nov 23 09:43:35 2015
@@ -21,6 +21,7 @@ import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Random;
import java.util.Set;
@@ -451,6 +452,92 @@ public class NodeDocumentTest {
ns.dispose();
}
+ @Test
+ public void getChanges() throws Exception {
+ final int numChanges = 200;
+ Random random = new Random();
+ DocumentNodeStore ns = createTestStore(numChanges);
+ DocumentStore store = ns.getDocumentStore();
+ NodeDocument doc = getRootDocument(store);
+ for (int i = 0; i < 10; i++) {
+ int idx = random.nextInt(numChanges);
+ Revision r = Iterables.get(doc.getValueMap("p").keySet(), idx);
+ Iterable<Revision> revs = doc.getChanges("p", r, ns);
+ assertEquals(idx, Iterables.size(revs));
+ }
+ ns.dispose();
+ }
+
+ @Test
+ public void getChangesMixedClusterIds() throws Exception {
+ final int numChanges = 200;
+ Random random = new Random();
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ DocumentNodeStore ns1 = createTestStore(store, 0);
+ DocumentNodeStore ns2 = createTestStore(store, 0);
+ List<DocumentNodeStore> nodeStores = Lists.newArrayList(ns1, ns2);
+
+ for (int i = 0; i < numChanges; i++) {
+ DocumentNodeStore ns =
nodeStores.get(random.nextInt(nodeStores.size()));
+ ns.runBackgroundOperations();
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.setProperty("p", i);
+ merge(ns, builder);
+ ns.runBackgroundOperations();
+ if (random.nextDouble() < 0.2) {
+ Revision head = ns.getHeadRevision();
+ for (UpdateOp op : SplitOperations.forDocument(
+ getRootDocument(store), ns, head, 2)) {
+ store.createOrUpdate(NODES, op);
+ }
+ }
+ }
+
+ NodeDocument doc = getRootDocument(store);
+ for (int i = 0; i < 10; i++) {
+ int idx = random.nextInt(numChanges);
+ Revision r = Iterables.get(doc.getValueMap("p").keySet(), idx);
+ Iterable<Revision> revs1 = doc.getChanges("p", r, ns1);
+ Iterable<Revision> revs2 = doc.getChanges("p", r, ns2);
+ assertEquals(Iterables.size(revs1), Iterables.size(revs2));
+ assertEquals(idx, Iterables.size(revs1));
+ }
+
+ ns1.dispose();
+ ns2.dispose();
+ }
+
+ // OAK-3557
+ @Test
+ public void isConflicting() throws Exception {
+ final int numChanges = 200;
+ final Set<String> prevDocCalls = Sets.newHashSet();
+ MemoryDocumentStore store = new MemoryDocumentStore() {
+ @Override
+ public <T extends Document> T find(Collection<T> collection,
+ String key) {
+ if (Utils.getPathFromId(key).startsWith("p")) {
+ prevDocCalls.add(key);
+ }
+ return super.find(collection, key);
+ }
+ };
+ DocumentNodeStore ns = createTestStore(store, numChanges);
+ NodeDocument doc = getRootDocument(store);
+ Map<Revision, String> valueMap = doc.getValueMap("p");
+ assertEquals(200, valueMap.size());
+ Revision baseRev = valueMap.keySet().iterator().next();
+ Revision commitRev = ns.newRevision();
+ UpdateOp op = new UpdateOp(Utils.getIdFromPath("/"), false);
+ op.setMapEntry("p", commitRev, "v");
+
+ prevDocCalls.clear();
+ assertFalse(doc.isConflicting(op, baseRev, commitRev, ns, false));
+ assertTrue("too many calls for previous documents: " + prevDocCalls,
+ prevDocCalls.size() <= 6);
+ ns.dispose();
+ }
+
private DocumentNodeStore createTestStore(int numChanges) throws Exception
{
return createTestStore(new MemoryDocumentStore(), numChanges);
}
