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/27 09:04:11 UTC
svn commit: r1788851 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/
test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Mon Mar 27 09:04:10 2017
New Revision: 1788851
URL: http://svn.apache.org/viewvc?rev=1788851&view=rev
Log:
OAK-5988: Hide DocumentNodeStore.backgroundWrite()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
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/ExternalChangesTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1788851&r1=1788850&r2=1788851&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Mon Mar 27 09:04:10 2017
@@ -160,7 +160,7 @@ public class DocumentMK {
}
void backgroundWrite() {
- nodeStore.backgroundWrite();
+ nodeStore.runBackgroundUpdateOperations();
}
void runBackgroundOperations() {
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=1788851&r1=1788850&r2=1788851&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 Mon Mar 27 09:04:10 2017
@@ -2182,7 +2182,9 @@ public final class DocumentNodeStore
return Collections.unmodifiableSet(splitCandidates.keySet());
}
- BackgroundWriteStats backgroundWrite() {
+ //-----------------------------< internal >---------------------------------
+
+ private BackgroundWriteStats backgroundWrite() {
return unsavedLastRevisions.persist(this, new UnsavedModifications.Snapshot() {
@Override
public void acquiring(Revision mostRecent) {
@@ -2191,8 +2193,6 @@ public final class DocumentNodeStore
}, backgroundOperationLock.writeLock());
}
- //-----------------------------< internal >---------------------------------
-
private static Supplier<VersionGarbageCollector> createVersionGCSupplier(
final DocumentNodeStore ns, final VersionGCSupport gcSupport) {
return memoize(new Supplier<VersionGarbageCollector>() {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java?rev=1788851&r1=1788850&r2=1788851&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java Mon Mar 27 09:04:10 2017
@@ -101,7 +101,7 @@ public class ExternalChangesTest {
b2.setProperty("foo2", "bar");
ns1.merge(b2, newCollectingHook(), newCommitInfo());
- ns1.backgroundWrite();
+ ns1.runBackgroundUpdateOperations();
c2.reset();
ns2.runBackgroundReadOperations();
@@ -128,7 +128,7 @@ public class ExternalChangesTest {
//Commit without ChangeSet
ns1.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- ns1.backgroundWrite();
+ ns1.runBackgroundUpdateOperations();
c2.reset();
ns2.runBackgroundReadOperations();
@@ -161,7 +161,7 @@ public class ExternalChangesTest {
}
ns1.merge(b1, newCollectingHook(), newCommitInfo());
- ns1.backgroundWrite();
+ ns1.runBackgroundUpdateOperations();
c2.reset();
ns2.runBackgroundReadOperations();
@@ -183,7 +183,7 @@ public class ExternalChangesTest {
NodeBuilder b0 = ns1.getRoot().builder();
b0.child("0");
ns1.merge(b0, newCollectingHook(), newCommitInfo());
- ns1.backgroundWrite();
+ ns1.runBackgroundUpdateOperations();
NodeBuilder b1 = ns1.getRoot().builder();
b1.child("a");
@@ -202,7 +202,7 @@ public class ExternalChangesTest {
b3.child("c");
ns1.merge(b3, newCollectingHook(), newCommitInfo());
- ns1.backgroundWrite();
+ ns1.runBackgroundUpdateOperations();
c2.reset();
ns2.runBackgroundReadOperations();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java?rev=1788851&r1=1788850&r2=1788851&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java Mon Mar 27 09:04:10 2017
@@ -203,8 +203,6 @@ public class NodeStoreDiffTest {
private void ops(){
ns.runBackgroundOperations();
- //Background ops are disabled for simple revisions
- ns.backgroundWrite();
}
private NodeState createNodes(String... paths) throws CommitFailedException {