Author: mreutegg
Date: Thu Sep 1 07:15:22 2016
New Revision: 1758713
URL: http://svn.apache.org/viewvc?rev=1758713&view=rev
Log:
OAK-4715: Reduce DocumentStore reads for local changes
Disable background ops and only count queries on NODES collection
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1758713&r1=1758712&r2=1758713&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Thu Sep 1 07:15:22 2016
@@ -2746,18 +2746,20 @@ public class DocumentNodeStoreTest {
String fromKey,
String toKey,
int limit) {
- numQueries.incrementAndGet();
+ if (collection == Collection.NODES) {
+ numQueries.incrementAndGet();
+ }
return super.query(collection, fromKey, toKey, limit);
}
};
DocumentNodeStore ns1 = builderProvider.newBuilder().setClusterId(1)
- .setDocumentStore(store).getNodeStore();
+ .setAsyncDelay(0).setDocumentStore(store).getNodeStore();
NodeBuilder builder = ns1.getRoot().builder();
builder.child("node-1");
merge(ns1, builder);
ns1.runBackgroundOperations();
DocumentNodeStore ns2 = builderProvider.newBuilder().setClusterId(2)
- .setDocumentStore(store).getNodeStore();
+ .setAsyncDelay(0).setDocumentStore(store).getNodeStore();
builder = ns2.getRoot().builder();
builder.child("node-2");
merge(ns2, builder);