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 2018/07/03 06:30:42 UTC
svn commit: r1834918 - in /jackrabbit/oak/branches/1.6/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Author: mreutegg
Date: Tue Jul 3 06:30:42 2018
New Revision: 1834918
URL: http://svn.apache.org/viewvc?rev=1834918&view=rev
Log:
OAK-7593: NodeDocument.getLatestValue() may throw IllegalStateException
Merge revisions 1834610,1834823 from trunk
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 3 06:30:42 2018
@@ -1,5 +1,6 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
+/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825442,1825470
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825442,1825470,1834610,1834823
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1834918&r1=1834917&r2=1834918&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Tue Jul 3 06:30:42 2018
@@ -52,7 +52,6 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.MergeSortedIterators;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +64,6 @@ import static com.google.common.base.Obj
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.copyOf;
-import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.mergeSorted;
import static com.google.common.collect.Iterables.transform;
@@ -1555,38 +1553,40 @@ public final class NodeDocument extends
@Nonnull final Revision readRevision,
@Nonnull final List<Iterable<Entry<Revision, String>>> changes) {
List<Iterable<Map.Entry<Revision, String>>> revs = Lists.newArrayList();
- Revision lowRev = new Revision(Long.MAX_VALUE, 0, readRevision.getClusterId());
RevisionVector readRV = new RevisionVector(readRevision);
- List<Range> ranges = Lists.newArrayList();
- for (Map.Entry<Revision, Range> e : getPreviousRanges().entrySet()) {
- Range range = e.getValue();
- if (range.low.getClusterId() != readRevision.getClusterId()
- || readRevision.compareRevisionTime(range.low) < 0) {
- // either clusterId does not match
- // or range is newer than read revision
- continue;
- }
- // check if it overlaps with previous ranges
- if (range.high.compareRevisionTime(lowRev) < 0) {
- // does not overlap
- if (!ranges.isEmpty()) {
- // there are previous ranges
- // get and merge sort overlapping ranges
- revs.add(changesFor(ranges, readRV, property));
- ranges.clear();
- }
- }
- ranges.add(range);
- lowRev = Utils.min(lowRev, range.low);
- }
- if (!ranges.isEmpty()) {
- // get remaining changes
- revs.add(changesFor(ranges, readRV, property));
- }
-
- if (!revs.isEmpty()) {
- changes.add(concat(revs));
+ List<Range> ranges = new ArrayList<>();
+ for (Range r : getPreviousRanges().values()) {
+ if (r.low.getClusterId() == readRevision.getClusterId()
+ && readRevision.compareRevisionTime(r.low) >= 0) {
+ // clusterId matches and range is visible from read revision
+ ranges.add(r);
+ }
+ }
+ List<Range> batch = new ArrayList<>();
+ while (!ranges.isEmpty()) {
+ // create batches of non-overlapping ranges
+ Range previous = null;
+ Iterator<Range> it = ranges.iterator();
+ while (it.hasNext()) {
+ Range r = it.next();
+ if (previous == null || r.high.compareRevisionTime(previous.low) < 0) {
+ // first range or does not overlap with previous in batch
+ batch.add(r);
+ it.remove();
+ previous = r;
+ }
+ }
+ revs.add(changesFor(batch, readRV, property));
+ batch.clear();
+ }
+
+ if (revs.size() == 1) {
+ // optimize single batch case
+ changes.add(revs.get(0));
+ } else if (!revs.isEmpty()) {
+ // merge sort them
+ changes.add(mergeSorted(revs, ValueComparator.REVERSE));
}
}
@@ -1629,34 +1629,7 @@ public final class NodeDocument extends
}
};
} else {
- changes = new Iterable<Entry<Revision, String>>() {
- private List<Range> rangeList = copyOf(ranges);
- private Iterable<Iterable<Entry<Revision, String>>> changesPerRange
- = transform(rangeList, rangeToChanges);
- @Override
- public Iterator<Entry<Revision, String>> iterator() {
- final Iterator<Iterable<Entry<Revision, String>>> it
- = checkNotNull(changesPerRange.iterator());
- return new MergeSortedIterators<Entry<Revision, String>>(ValueComparator.REVERSE) {
- @Override
- public Iterator<Entry<Revision, String>> nextIterator() {
- while (it.hasNext()) {
- Iterator<Entry<Revision, String>> next = it.next().iterator();
- // check if this even has elements
- if (next.hasNext()) {
- return next;
- }
- }
- return null;
- }
-
- @Override
- public String description() {
- return "Ranges to merge sort: " + rangeList;
- }
- };
- }
- };
+ changes = Iterables.concat(transform(copyOf(ranges), rangeToChanges));
}
return filter(changes, new Predicate<Entry<Revision, String>>() {
@Override
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1834918&r1=1834917&r2=1834918&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Tue Jul 3 06:30:42 2018
@@ -31,6 +31,7 @@ import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -752,7 +753,7 @@ public class NodeDocumentTest {
assertEquals(String.valueOf(numChanges - (i + 1)), value);
assertTrue("too many calls for previous documents ("
+ prevDocCalls.size() + "): " + prevDocCalls,
- prevDocCalls.size() <= 8);
+ prevDocCalls.size() <= 10);
}
ns1.dispose();
@@ -777,7 +778,8 @@ public class NodeDocumentTest {
DocumentNodeStore ns = createTestStore(store, 1, 0);
List<RevisionVector> headRevisions = Lists.newArrayList();
- for (int i = 0; i < 1000; i++) {
+ long count = 1000;
+ for (int i = 0; i < count; i++) {
NodeBuilder builder = ns.getRoot().builder();
NodeBuilder test = builder.child("test");
test.setProperty("p", i);
@@ -803,17 +805,18 @@ public class NodeDocumentTest {
ns.runBackgroundOperations();
NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ assertNotNull(doc);
List<Integer> numCalls = Lists.newArrayList();
- long count = 0;
// go back in time and check number of find calls
+ Collections.reverse(headRevisions);
for (RevisionVector rv : headRevisions) {
prevDocCalls.clear();
DocumentNodeState s = doc.getNodeAtRevision(ns, rv, null);
assertNotNull(s);
- assertEquals(count++, s.getProperty("p").getValue(Type.LONG).longValue());
+ assertEquals(--count, s.getProperty("p").getValue(Type.LONG).longValue());
numCalls.add(prevDocCalls.size());
}
- assertThat(numCalls.toString(), numCalls, everyItem(lessThan(36)));
+ assertThat(numCalls.toString(), numCalls, everyItem(lessThan(43)));
ns.dispose();
}
@@ -859,6 +862,43 @@ public class NodeDocumentTest {
ns2.dispose();
}
+ // OAK-7593
+ @Test
+ public void getVisibleChangesWithOverlappingRanges() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ DocumentNodeStore ns = createTestStore(store, 1, 0);
+ addNode(ns, "/test");
+ setProperty(ns, "/test/p", 1);
+ setProperty(ns, "/test/p", 2);
+ setProperty(ns, "/test/p", 3);
+ RevisionVector readRev = ns.getHeadRevision();
+ setProperty(ns, "/test/q", 1);
+ setProperty(ns, "/test/q", 2);
+
+ String id = Utils.getIdFromPath("/test");
+ NodeDocument doc = store.find(NODES, id);
+ assertNotNull(doc);
+ List<UpdateOp> splitOps = SplitOperations.forDocument(
+ doc, ns, ns.getHeadRevision(), NO_BINARY, 1);
+ assertEquals(2, splitOps.size());
+ store.createOrUpdate(NODES, splitOps);
+
+ setProperty(ns, "/test/p", 4);
+
+ doc = store.find(NODES, id);
+ assertNotNull(doc);
+ splitOps = SplitOperations.forDocument(
+ doc, ns, ns.getHeadRevision(), NO_BINARY, 1);
+ assertEquals(2, splitOps.size());
+ store.createOrUpdate(NODES, splitOps);
+
+ doc = store.find(NODES, id);
+ assertNotNull(doc);
+ for (Map.Entry<Revision, String> change : doc.getVisibleChanges("p", readRev)) {
+ assertFalse(readRev.isRevisionNewer(change.getKey()));
+ }
+ }
+
private DocumentNodeStore createTestStore(int numChanges) throws Exception {
return createTestStore(new MemoryDocumentStore(), 0, numChanges);
}
@@ -923,4 +963,29 @@ public class NodeDocumentTest {
throws CommitFailedException {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
+
+ private void addNode(NodeStore store, String path)
+ throws CommitFailedException {
+ NodeBuilder root = store.getRoot().builder();
+ NodeBuilder builder = root;
+ for (String name : PathUtils.elements(path)) {
+ builder = builder.child(name);
+ }
+ assertTrue(builder.isNew());
+ merge(store, root);
+ }
+
+ private void setProperty(NodeStore store, String path, int value)
+ throws CommitFailedException {
+ NodeBuilder root = store.getRoot().builder();
+ NodeBuilder builder = root;
+ String nodePath = PathUtils.getParentPath(path);
+ String propertyName = PathUtils.getName(path);
+ for (String name : PathUtils.elements(nodePath)) {
+ builder = builder.child(name);
+ }
+ assertFalse(builder.isNew());
+ builder.setProperty(propertyName, value);
+ merge(store, root);
+ }
}