Author: mreutegg
Date: Tue Sep 27 11:33:55 2016
New Revision: 1762453
URL: http://svn.apache.org/viewvc?rev=1762453&view=rev
Log:
OAK-4850: List checkpoints
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/memory/MemoryNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.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=1762453&r1=1762452&r2=1762453&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 Sep 27 11:33:55 2016
@@ -72,6 +72,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.cache.Cache;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.UncheckedExecutionException;
@@ -1657,6 +1658,24 @@ public final class DocumentNodeStore
}
}
+ @Nonnull
+ @Override
+ public Iterable<String> checkpoints() {
+ final long now = clock.getTime();
+ return
Iterables.transform(Iterables.filter(checkpoints.getCheckpoints().entrySet(),
+ new Predicate<Map.Entry<Revision,Checkpoints.Info>>() {
+ @Override
+ public boolean apply(Map.Entry<Revision,Checkpoints.Info> cp) {
+ return cp.getValue().getExpiryTime() > now;
+ }
+ }), new Function<Map.Entry<Revision,Checkpoints.Info>, String>() {
+ @Override
+ public String apply(Map.Entry<Revision,Checkpoints.Info> cp) {
+ return cp.getKey().toString();
+ }
+ });
+ }
+
@CheckForNull
@Override
public NodeState retrieve(@Nonnull String checkpoint) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
Tue Sep 27 11:33:55 2016
@@ -36,7 +36,9 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
@@ -220,6 +222,12 @@ public class MemoryNodeStore implements
}
}
+ @Nonnull
+ @Override
+ public synchronized Iterable<String> checkpoints() {
+ return Lists.newArrayList(checkpoints.keySet());
+ }
+
@Override @CheckForNull
public synchronized NodeState retrieve(@Nonnull String checkpoint) {
Checkpoint cp = checkpoints.get(checkNotNull(checkpoint));
@@ -237,8 +245,8 @@ public class MemoryNodeStore implements
}
/** test purpose only! */
- public synchronized Set<String> listCheckpoints() {
- return checkpoints.keySet();
+ public Set<String> listCheckpoints() {
+ return Sets.newHashSet(checkpoints());
}
//------------------------------------------------------------< private
>---
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java
Tue Sep 27 11:33:55 2016
@@ -158,6 +158,20 @@ public interface NodeStore {
Map<String, String> checkpointInfo(@Nonnull String checkpoint);
/**
+ * Returns all valid checkpoints. The returned {@code Iterable} provides a
+ * snapshot of valid checkpoints at the time this method is called. That
+ * is, the {@code Iterable} will not reflect checkpoints created after this
+ * method was called.
+ * <p>
+ * See {@link #checkpoint(long, Map)} for a definition of a valid
+ * checkpoint.
+ *
+ * @return valid checkpoints.
+ */
+ @Nonnull
+ Iterable<String> checkpoints();
+
+ /**
* Retrieves the root node from a previously created repository checkpoint.
*
* @param checkpoint string reference of a checkpoint
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java
Tue Sep 27 11:33:55 2016
@@ -80,6 +80,12 @@ public abstract class ProxyNodeStore imp
return getNodeStore().checkpointInfo(checkpoint);
}
+ @Nonnull
+ @Override
+ public Iterable<String> checkpoints() {
+ return getNodeStore().checkpoints();
+ }
+
@Override
public NodeState retrieve(String checkpoint) {
return getNodeStore().retrieve(checkpoint);
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
Tue Sep 27 11:33:55 2016
@@ -32,6 +32,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@@ -39,6 +41,10 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -547,6 +553,33 @@ public class NodeStoreTest extends OakBa
assertTrue(root.hasChildNode("bar"));
}
+ @Test
+ public void checkpoints() throws Exception {
+ assumeTrue(fixture != NodeStoreFixtures.SEGMENT_TAR);
+ int numCps = 3;
+ Map<String, String> info = Maps.newHashMap();
+ Set<String> cps = Sets.newHashSet();
+ for (int i = 0; i < numCps; i++) {
+ info.put("key", "" + i);
+ cps.add(store.checkpoint(TimeUnit.HOURS.toMillis(1), info));
+ }
+ assertEquals(numCps, cps.size());
+ assertEquals(cps, Sets.newHashSet(store.checkpoints()));
+ Set<String> keys = Sets.newHashSet();
+ for (String cp : cps) {
+ info = store.checkpointInfo(cp);
+ assertTrue(info.containsKey("key"));
+ keys.add(info.get("key"));
+ }
+ assertEquals(Sets.newHashSet("0", "1", "2"), keys);
+ while (!cps.isEmpty()) {
+ String cp = cps.iterator().next();
+ cps.remove(cp);
+ store.release(cp);
+ assertEquals(cps.size(), Iterables.size(store.checkpoints()));
+ }
+ }
+
private void compareAgainstBaseState(int childNodeCount) throws
CommitFailedException {
NodeState before = store.getRoot();
NodeBuilder builder = before.builder();
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Tue Sep 27 11:33:55 2016
@@ -462,6 +462,12 @@ public class SegmentNodeStore implements
return properties;
}
+ @Nonnull
+ @Override
+ public Iterable<String> checkpoints() {
+ return getCheckpoints().getChildNodeNames();
+ }
+
@Override @CheckForNull
public NodeState retrieve(@Nonnull String checkpoint) {
checkNotNull(checkpoint);
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java?rev=1762453&r1=1762452&r2=1762453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java
Tue Sep 27 11:33:55 2016
@@ -100,6 +100,12 @@ public class TarNodeStore implements Nod
return ns.checkpointInfo(checkpoint);
}
+ @Nonnull
+ @Override
+ public Iterable<String> checkpoints() {
+ return ns.checkpoints();
+ }
+
@Override
public NodeState retrieve(@Nonnull String checkpoint) {
return ns.retrieve(checkpoint);
