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/02 14:32:07 UTC
svn commit: r1834851 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Author: mreutegg
Date: Mon Jul 2 14:32:07 2018
New Revision: 1834851
URL: http://svn.apache.org/viewvc?rev=1834851&view=rev
Log:
OAK-7593: NodeDocument.getLatestValue() may throw IllegalStateException
Merge revisions 1834610,1834823 from trunk
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 2 14:32:07 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834648-1834649
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834610,1834648-1834649,1834823
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1834851&r1=1834850&r2=1834851&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Mon Jul 2 14:32:07 2018
@@ -51,7 +51,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;
@@ -64,7 +63,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;
@@ -1537,38 +1535,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));
}
}
@@ -1611,34 +1611,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.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1834851&r1=1834850&r2=1834851&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Mon Jul 2 14:32:07 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;
@@ -754,7 +755,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();
@@ -779,7 +780,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);
@@ -805,17 +807,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();
}
@@ -861,6 +864,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()));
+ }
+ }
+
@Test
public void getSweepRevisions() throws Exception {
MemoryDocumentStore store = new MemoryDocumentStore();
@@ -1008,4 +1048,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);
+ }
}