Author: chetanm
Date: Thu Nov 24 14:01:05 2016
New Revision: 1771131
URL: http://svn.apache.org/viewvc?rev=1771131&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached
-- Pass CommitInfo.EMPTY instead of null for DocumentNodeStore.done as its a
local commit
-- Switch to Nonnull annotation for CommitInfo param
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitRootUpdateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.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=1771131&r1=1771130&r2=1771131&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
Thu Nov 24 14:01:05 2016
@@ -85,6 +85,7 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.slf4j.Logger;
@@ -281,7 +282,7 @@ public class DocumentMK {
isBranch = baseRev != null && baseRev.isBranch();
parseJsonDiff(commit, jsonDiff, rootPath);
commit.apply();
- rev = nodeStore.done(commit, isBranch, null);
+ rev = nodeStore.done(commit, isBranch, CommitInfo.EMPTY);
success = true;
} catch (DocumentStoreException e) {
throw new DocumentStoreException(e);
@@ -308,7 +309,7 @@ public class DocumentMK {
throw new DocumentStoreException("Not a branch: " +
branchRevisionId);
}
try {
- return nodeStore.merge(revision, null).toString();
+ return nodeStore.merge(revision, CommitInfo.EMPTY).toString();
} catch (DocumentStoreException e) {
throw new DocumentStoreException(e);
} catch (CommitFailedException e) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1771131&r1=1771130&r2=1771131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
Thu Nov 24 14:01:05 2016
@@ -348,7 +348,7 @@ public class ClusterTest {
ns1.addObserver(new Observer() {
@Override
public void contentChanged(@Nonnull NodeState root,
- @Nullable CommitInfo info) {
+ @Nonnull CommitInfo info) {
rootStates1.add((DocumentNodeState) root);
}
});
@@ -357,7 +357,7 @@ public class ClusterTest {
ns2.addObserver(new Observer() {
@Override
public void contentChanged(@Nonnull NodeState root,
- @Nullable CommitInfo info) {
+ @Nonnull CommitInfo info) {
rootStates2.add((DocumentNodeState) root);
}
});
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java?rev=1771131&r1=1771130&r2=1771131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
Thu Nov 24 14:01:05 2016
@@ -107,7 +107,7 @@ public class CommitQueueTest {
store.canceled(commit);
} else {
boolean isBranch = random.nextInt(5) == 0;
- store.done(commit, isBranch, null);
+ store.done(commit, isBranch, CommitInfo.EMPTY);
}
}
} catch (Exception e) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitRootUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitRootUpdateTest.java?rev=1771131&r1=1771130&r2=1771131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitRootUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitRootUpdateTest.java
Thu Nov 24 14:01:05 2016
@@ -88,7 +88,7 @@ public class CommitRootUpdateTest {
success = true;
} finally {
if (success) {
- ns.done(c, false, null);
+ ns.done(c, false, CommitInfo.EMPTY);
} else {
ns.canceled(c);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java?rev=1771131&r1=1771130&r2=1771131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
Thu Nov 24 14:01:05 2016
@@ -66,7 +66,7 @@ public class CommitTest {
op.setMapEntry("p", c.getRevision(), "v");
try {
c.apply();
- ns.done(c, false, null);
+ ns.done(c, false, CommitInfo.EMPTY);
} catch (DocumentStoreException e) {
// expected
}
@@ -99,7 +99,7 @@ public class CommitTest {
new RevisionVector(c.getRevision())));
try {
c.apply();
- ns.done(c, false, null);
+ ns.done(c, false, CommitInfo.EMPTY);
fail("commit must fail");
} catch (DocumentStoreException e) {
// expected
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=1771131&r1=1771130&r2=1771131&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 Nov 24 14:01:05 2016
@@ -2712,7 +2712,7 @@ public class DocumentNodeStoreTest {
final AtomicBoolean failCommit = new AtomicBoolean();
ns.addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable
CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
if (failCommit.get()){
throw testException;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java?rev=1771131&r1=1771130&r2=1771131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
Thu Nov 24 14:01:05 2016
@@ -21,6 +21,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -83,7 +85,7 @@ public class JournalTest extends Abstrac
}
@Override
- public void contentChanged(NodeState root, CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo
info) {
synchronized(incomingRootStates1) {
incomingRootStates1.add((DocumentNodeState) root);
incomingRootStates1.notifyAll();
