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 2016/05/31 21:34:15 UTC
svn commit: r1746353 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Author: mreutegg
Date: Tue May 31 21:34:15 2016
New Revision: 1746353
URL: http://svn.apache.org/viewvc?rev=1746353&view=rev
Log:
OAK-4358: Stale cluster ids can potentially lead to lots of previous docs traversal in NodeDocument.getNewestRevision
Merged revision 1746342 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:34:15 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1746353&r1=1746352&r2=1746353&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Tue May 31 21:34:15 2016
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Ignore;
import org.junit.Test;
import static com.google.common.collect.Sets.newHashSet;
@@ -550,6 +551,77 @@ public class NodeDocumentTest {
ns.dispose();
}
+ // OAK-4358
+ @Ignore
+ @Test
+ public void tooManyReadsOnGetNewestRevision() throws Exception {
+ final Set<String> prevDocCalls = 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 ns1 = createTestStore(store, 1, 0);
+ DocumentNodeStore ns2 = createTestStore(store, 2, 0);
+
+ // create a test node on ns1
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("test");
+ merge(ns1, b1);
+ ns1.runBackgroundOperations();
+ ns2.runBackgroundOperations();
+
+ // modify node on ns2 a couple of time and
+ // split off some changes
+ for (int i = 0; i < 3; i++) {
+ NodeBuilder b2 = ns2.getRoot().builder();
+ b2.child("test").setProperty("ns2", i);
+ merge(ns2, b2);
+ }
+ String testId = Utils.getIdFromPath("/test");
+ NodeDocument test = ns2.getDocumentStore().find(NODES, testId);
+ assertNotNull(test);
+ List<UpdateOp> ops = SplitOperations.forDocument(test, ns2,
+ ns2.getHeadRevision(), 2);
+ assertEquals(2, ops.size());
+ for (UpdateOp op : ops) {
+ ns2.getDocumentStore().createOrUpdate(NODES, op);
+ }
+ ns2.runBackgroundOperations();
+ ns1.runBackgroundOperations();
+
+ List<RevisionVector> headRevs = Lists.newArrayList();
+ // perform many changes on ns1 and split
+ for (int i = 0; i < 20; i++) {
+ b1 = ns1.getRoot().builder();
+ b1.child("test").setProperty("ns1", i);
+ merge(ns1, b1);
+ test = ns1.getDocumentStore().find(NODES, testId);
+ for (UpdateOp op : SplitOperations.forDocument(test, ns1,
+ ns1.getHeadRevision(), 3)) {
+ ns1.getDocumentStore().createOrUpdate(NODES, op);
+ }
+ headRevs.add(ns1.getHeadRevision());
+ }
+
+ int numPrevDocs = Iterators.size(test.getPreviousDocLeaves());
+ assertEquals(10, numPrevDocs);
+
+ // getNewestRevision must not read all previous documents
+ prevDocCalls.clear();
+ // simulate a call done by a commit with a
+ // base revision somewhat in the past
+ test.getNewestRevision(ns1, headRevs.get(16), ns1.newRevision(),
+ null, new HashSet<Revision>());
+ // must only read one previous document for ns1 changes
+ assertEquals(1, prevDocCalls.size());
+ }
+
private DocumentNodeStore createTestStore(int numChanges) throws Exception {
return createTestStore(new MemoryDocumentStore(), 0, numChanges);
}