Author: mreutegg
Date: Wed Aug 24 14:50:19 2016
New Revision: 1757536
URL: http://svn.apache.org/viewvc?rev=1757536&view=rev
Log:
OAK-4697: Optimize read of old node state
Add ignored test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1757536&r1=1757535&r2=1757536&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Wed Aug 24 14:50:19 2016
@@ -30,6 +30,8 @@ import com.google.common.collect.Iterato
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.plugins.document.VersionGarbageCollector.VersionGCStats;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -37,6 +39,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;
@@ -633,6 +636,41 @@ public class NodeDocumentTest {
ns.dispose();
}
+ @Ignore("OAK-4697")
+ @Test
+ public void tooManyReadsOnGetNodeAtRevision() throws Exception {
+ final int numChanges = 200;
+ 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 ns = createTestStore(store, 0, numChanges);
+ NodeDocument doc = getRootDocument(store);
+ Map<Revision, String> valueMap = doc.getValueMap("p");
+ assertEquals(200, valueMap.size());
+ Revision oldest = Iterables.getLast(valueMap.keySet());
+
+ prevDocCalls.clear();
+ DocumentNodeState state = doc.getNodeAtRevision(ns,
+ new RevisionVector(oldest), null);
+ assertNotNull(state);
+ PropertyState prop = state.getProperty("p");
+ assertNotNull(prop);
+ assertEquals(0L, (long) prop.getValue(Type.LONG));
+
+ assertTrue("too many calls for previous documents: " + prevDocCalls,
+ prevDocCalls.size() <= 2);
+
+ ns.dispose();
+ }
+
private DocumentNodeStore createTestStore(int numChanges) throws Exception
{
return createTestStore(new MemoryDocumentStore(), 0, numChanges);
}