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 2017/03/21 12:37:36 UTC
svn commit: r1787954 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Author: mreutegg
Date: Tue Mar 21 12:37:36 2017
New Revision: 1787954
URL: http://svn.apache.org/viewvc?rev=1787954&view=rev
Log:
OAK-5957: Avoid direct access to fields in DocumentNodeStore
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1787954&r1=1787953&r2=1787954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Mar 21 12:37:36 2017
@@ -203,12 +203,12 @@ public final class DocumentNodeStore
/**
* The document store (might be used by multiple node stores).
*/
- protected final DocumentStore store;
+ private final DocumentStore store;
/**
* Marker node, indicating a node does not exist at a given revision.
*/
- protected final DocumentNodeState missing;
+ private final DocumentNodeState missing;
/**
* The commit queue to coordinate the commits.
@@ -218,29 +218,29 @@ public final class DocumentNodeStore
/**
* Commit queue for batch updates.
*/
- protected final BatchCommitQueue batchCommitQueue;
+ private final BatchCommitQueue batchCommitQueue;
/**
* The change dispatcher for this node store.
*/
- protected final ChangeDispatcher dispatcher;
+ private final ChangeDispatcher dispatcher;
/**
* The delay for asynchronous operations (delayed commit propagation and
* cache update).
*/
- protected int asyncDelay = 1000;
+ private int asyncDelay = 1000;
/**
* The maximum back off time in milliseconds when merges are retried. The
* default value is twice the {@link #asyncDelay}.
*/
- protected int maxBackOffMillis =
+ private int maxBackOffMillis =
Integer.getInteger("oak.maxBackOffMS", asyncDelay * 2);
- protected int changeSetMaxItems = Integer.getInteger("oak.document.changeSet.maxItems", 50);
+ private int changeSetMaxItems = Integer.getInteger("oak.document.changeSet.maxItems", 50);
- protected int changeSetMaxDepth = Integer.getInteger("oak.document.changeSet.maxDepth", 9);
+ private int changeSetMaxDepth = Integer.getInteger("oak.document.changeSet.maxDepth", 9);
/**
* Whether this instance is disposed.
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=1787954&r1=1787953&r2=1787954&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 Tue Mar 21 12:37:36 2017
@@ -146,7 +146,7 @@ public class NodeDocumentTest {
NodeDocument root = getRootDocument(ns.getDocumentStore());
// remove most recent previous doc
NodeDocument toRemove = root.getAllPreviousDocs().next();
- int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ int numDeleted = new SplitDocumentCleanUp(ns.getDocumentStore(), new VersionGCStats(),
Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
assertEquals(1, numDeleted);
numChanges -= Iterables.size(toRemove.getAllChanges());
@@ -169,7 +169,7 @@ public class NodeDocumentTest {
NodeDocument root = getRootDocument(ns.getDocumentStore());
// remove oldest previous doc
NodeDocument toRemove = Iterators.getLast(root.getAllPreviousDocs());
- int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ int numDeleted = new SplitDocumentCleanUp(ns.getDocumentStore(), new VersionGCStats(),
Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
assertEquals(1, numDeleted);
numChanges -= Iterables.size(toRemove.getAllChanges());
@@ -252,7 +252,7 @@ public class NodeDocumentTest {
int numLeaves = Iterators.size(root.getPreviousDocLeaves());
// remove most recent previous doc
NodeDocument toRemove = root.getAllPreviousDocs().next();
- int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ int numDeleted = new SplitDocumentCleanUp(ns.getDocumentStore(), new VersionGCStats(),
Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
assertEquals(1, numDeleted);
@@ -276,7 +276,7 @@ public class NodeDocumentTest {
int numLeaves = Iterators.size(root.getPreviousDocLeaves());
// remove oldest previous doc
NodeDocument toRemove = Iterators.getLast(root.getAllPreviousDocs());
- int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ int numDeleted = new SplitDocumentCleanUp(ns.getDocumentStore(), new VersionGCStats(),
Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
assertEquals(1, numDeleted);