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 13:01:20 UTC
svn commit: r1787960 - 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: Tue Mar 21 13:01:19 2017
New Revision: 1787960
URL: http://svn.apache.org/viewvc?rev=1787960&view=rev
Log:
OAK-5959: Hide DocumentNodeStore.backgroundRead()
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
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=1787960&r1=1787959&r2=1787960&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 Tue Mar 21 13:01:19 2017
@@ -156,7 +156,7 @@ public class DocumentMK {
}
void backgroundRead() {
- nodeStore.backgroundRead();
+ nodeStore.runBackgroundReadOperations();
}
void backgroundWrite() {
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=1787960&r1=1787959&r2=1787960&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 13:01:19 2017
@@ -2022,7 +2022,7 @@ public final class DocumentNodeStore
/**
* Perform a background read and make external changes visible.
*/
- BackgroundReadStats backgroundRead() {
+ private BackgroundReadStats backgroundRead() {
BackgroundReadStats stats = new BackgroundReadStats();
long time = clock.getTime();
String id = Utils.getIdFromPath("/");
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=1787960&r1=1787959&r2=1787960&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 Tue Mar 21 13:01:19 2017
@@ -104,7 +104,7 @@ public class ExternalChangesTest {
ns1.backgroundWrite();
c2.reset();
- ns2.backgroundRead();
+ ns2.runBackgroundReadOperations();
CommitInfo ci = c2.getExternalChange();
CommitContext cc = (CommitContext) ci.getInfo().get(CommitContext.NAME);
@@ -131,7 +131,7 @@ public class ExternalChangesTest {
ns1.backgroundWrite();
c2.reset();
- ns2.backgroundRead();
+ ns2.runBackgroundReadOperations();
CommitInfo ci = c2.getExternalChange();
CommitContext cc = (CommitContext) ci.getInfo().get(CommitContext.NAME);
@@ -164,7 +164,7 @@ public class ExternalChangesTest {
ns1.backgroundWrite();
c2.reset();
- ns2.backgroundRead();
+ ns2.runBackgroundReadOperations();
CommitInfo ci = c2.getExternalChange();
CommitContext cc = (CommitContext) ci.getInfo().get(CommitContext.NAME);
@@ -205,7 +205,7 @@ public class ExternalChangesTest {
ns1.backgroundWrite();
c2.reset();
- ns2.backgroundRead();
+ ns2.runBackgroundReadOperations();
CommitInfo ci = c2.getExternalChange();
cc = (CommitContext) ci.getInfo().get(CommitContext.NAME);