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/22 12:48:16 UTC
svn commit: r1788101 - 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: Wed Mar 22 12:48:16 2017
New Revision: 1788101
URL: http://svn.apache.org/viewvc?rev=1788101&view=rev
Log:
OAK-5968: Introduce RevisionContext.getClock()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.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=1788101&r1=1788100&r2=1788101&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 Wed Mar 22 12:48:16 2017
@@ -1833,11 +1833,13 @@ public final class DocumentNodeStore
return clusterId;
}
+ @Override
@Nonnull
public RevisionVector getHeadRevision() {
return root.getRootRevision();
}
+ @Override
@Nonnull
public Revision newRevision() {
if (simpleRevisionCounter != null) {
@@ -1847,6 +1849,12 @@ public final class DocumentNodeStore
}
@Override
+ @Nonnull
+ public Clock getClock() {
+ return clock;
+ }
+
+ @Override
public String getCommitValue(@Nonnull Revision changeRevision,
@Nonnull NodeDocument doc) {
String value = commitValueCache.getIfPresent(changeRevision);
@@ -2943,10 +2951,6 @@ public final class DocumentNodeStore
return diffCache;
}
- public Clock getClock() {
- return clock;
- }
-
public Checkpoints getCheckpoints() {
return checkpoints;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java?rev=1788101&r1=1788100&r2=1788101&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java Wed Mar 22 12:48:16 2017
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.plugin
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.stats.Clock;
+
/**
* Provides revision related context.
*/
@@ -53,6 +55,12 @@ public interface RevisionContext {
Revision newRevision();
/**
+ * @return the clock in use when a new revision is created.
+ */
+ @Nonnull
+ Clock getClock();
+
+ /**
* Retrieves the commit value for a given change. This method returns the
* following types of commit values:
* <ul>
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java?rev=1788101&r1=1788100&r2=1788101&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java Wed Mar 22 12:48:16 2017
@@ -45,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.Test;
import com.google.common.collect.Iterables;
@@ -1113,6 +1114,12 @@ public class DocumentSplitTest extends B
return rc.newRevision();
}
+ @Nonnull
+ @Override
+ public Clock getClock() {
+ return rc.getClock();
+ }
+
@Override
public String getCommitValue(@Nonnull Revision changeRevision,
@Nonnull NodeDocument doc) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java?rev=1788101&r1=1788100&r2=1788101&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java Wed Mar 22 12:48:16 2017
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.plugin
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.stats.Clock;
+
/**
* A revision context for tests.
*/
@@ -52,6 +54,12 @@ public class DummyRevisionContext implem
return Revision.newRevision(getClusterId());
}
+ @Nonnull
+ @Override
+ public Clock getClock() {
+ return Clock.SIMPLE;
+ }
+
@Override
public String getCommitValue(@Nonnull Revision changeRevision,
@Nonnull NodeDocument doc) {