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 st...@apache.org on 2021/02/02 13:54:21 UTC
svn commit: r1886122 - in /jackrabbit/oak/trunk/oak-store-document/src:
main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Author: stefanegli
Date: Tue Feb 2 13:54:21 2021
New Revision: 1886122
URL: http://svn.apache.org/viewvc?rev=1886122&view=rev
Log:
OAK-9300 : DocumentNodeStore should refuse checkpoint calls after disposal. Patch provided by José Andrés Cordero Benítez
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1886122&r1=1886121&r2=1886122&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Feb 2 13:54:21 2021
@@ -2018,12 +2018,14 @@ public final class DocumentNodeStore
@NotNull
@Override
public String checkpoint(long lifetime, @NotNull Map<String, String> properties) {
+ checkOpen();
return checkpoints.create(lifetime, properties).toString();
}
@NotNull
@Override
public String checkpoint(long lifetime) {
+ checkOpen();
Map<String, String> empty = Collections.emptyMap();
return checkpoint(lifetime, empty);
}
@@ -2031,6 +2033,7 @@ public final class DocumentNodeStore
@NotNull
@Override
public Map<String, String> checkpointInfo(@NotNull String checkpoint) {
+ checkOpen();
Revision r = Revision.fromString(checkpoint);
Checkpoints.Info info = checkpoints.getCheckpoints().get(r);
if (info == null) {
@@ -2044,6 +2047,7 @@ public final class DocumentNodeStore
@NotNull
@Override
public Iterable<String> checkpoints() {
+ checkOpen();
final long now = clock.getTime();
return Iterables.transform(Iterables.filter(checkpoints.getCheckpoints().entrySet(),
new Predicate<Map.Entry<Revision,Checkpoints.Info>>() {
@@ -2062,6 +2066,7 @@ public final class DocumentNodeStore
@Nullable
@Override
public NodeState retrieve(@NotNull String checkpoint) {
+ checkOpen();
RevisionVector rv = getCheckpoints().retrieve(checkpoint);
if (rv == null) {
return null;
@@ -2073,6 +2078,7 @@ public final class DocumentNodeStore
@Override
public boolean release(@NotNull String checkpoint) {
+ checkOpen();
checkpoints.release(checkpoint);
return true;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1886122&r1=1886121&r2=1886122&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Tue Feb 2 13:54:21 2021
@@ -122,11 +122,7 @@ import org.apache.jackrabbit.oak.stats.C
import org.hamcrest.number.OrderingComparison;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -4043,6 +4039,54 @@ public class DocumentNodeStoreTest {
}
}
+ // Tests for OAK-9300
+ @Test
+ public void createCheckpointAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.checkpoint(60000));
+ }
+
+ @Test
+ public void createCheckpointWithPropertiesAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.checkpoint(60000, Collections.emptyMap()));
+ }
+
+ @Test
+ public void retrieveCheckpointInfoAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ String ref = store.checkpoint(60000);
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.checkpointInfo(ref));
+ }
+
+ @Test
+ public void getCheckpointsAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ String ref = store.checkpoint(60000);
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.checkpoints());
+ }
+
+ @Test
+ public void retrieveCheckpointAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ String ref = store.checkpoint(60000);
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.retrieve(ref));
+ }
+
+ @Test
+ public void releaseCheckpointAfterDispose() {
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ String ref = store.checkpoint(60000);
+ store.dispose();
+ Assert.assertThrows(IllegalStateException.class, () -> store.release(ref));
+ }
+ // End of tests for OAK-9300
+
private void getChildNodeCountTest(int numChildren,
Iterable<Long> maxValues,
Iterable<Long> expectedValues)