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 ch...@apache.org on 2015/07/31 08:21:19 UTC
svn commit: r1693525 - in /jackrabbit/oak/trunk:
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/
Author: chetanm
Date: Fri Jul 31 06:21:19 2015
New Revision: 1693525
URL: http://svn.apache.org/r1693525
Log:
OAK-3164 - MemoryNodeStore issues duplicate checkpoint
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java?rev=1693525&r1=1693524&r2=1693525&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java Fri Jul 31 06:21:19 2015
@@ -124,8 +124,8 @@ public class LogCustomizer {
protected void append(ILoggingEvent e) {
if (filterLevel == null) {
logs.add(e.getFormattedMessage());
- } else if (filterLevel.isGreaterOrEqual(e.getLevel())) {
- filterLevel.isGreaterOrEqual(e.getLevel());
+ } else if (e.getLevel().isGreaterOrEqual(filterLevel)) {
+ logs.add(e.getFormattedMessage());
}
}
};
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=1693525&r1=1693524&r2=1693525&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 Fri Jul 31 06:21:19 2015
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.CheckForNull;
@@ -62,6 +63,8 @@ public class MemoryNodeStore implements
private final Map<Closeable, Observer> observers = newHashMap();
+ private final AtomicInteger checkpointCounter = new AtomicInteger();
+
public MemoryNodeStore(NodeState state) {
this.root = new AtomicReference<NodeState>(state);
}
@@ -194,7 +197,7 @@ public class MemoryNodeStore implements
public String checkpoint(long lifetime, @Nonnull Map<String, String> properties) {
checkArgument(lifetime > 0);
checkNotNull(properties);
- String checkpoint = "checkpoint" + checkpoints.size();
+ String checkpoint = "checkpoint" + checkpointCounter.incrementAndGet();
checkpoints.put(checkpoint, new Checkpoint(getRoot(), properties));
return checkpoint;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1693525&r1=1693524&r2=1693525&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Fri Jul 31 06:21:19 2015
@@ -39,9 +39,11 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import ch.qos.logback.classic.Level;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate.IndexTaskSpliter;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexLookup;
@@ -804,4 +806,52 @@ public class AsyncIndexUpdateTest {
assertNull(firstCp, asyncNode.getString("async-slow"));
}
+
+ @Test
+ public void checkpointStability() throws Exception{
+ NodeStore store = new MemoryNodeStore();
+ IndexEditorProvider provider = new PropertyIndexEditorProvider();
+
+ NodeBuilder builder = store.getRoot().builder();
+ createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", true, false, ImmutableSet.of("foo"), null)
+ .setProperty(ASYNC_PROPERTY_NAME, "async");
+ builder.child("testRoot").setProperty("foo", "abc");
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider);
+
+ //Initial indexing
+ async.run();
+ //Now checkpoints = [checkpoints0]
+
+ //Index again so as to get change in reindex flag done
+ async.run();
+ //Now checkpoints = [checkpoints1]. checkpoints0 released
+
+ //Now make some changes to
+ builder = store.getRoot().builder();
+ builder.child("testRoot2").setProperty("foo", "abc");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ async.run();
+ //Now checkpoints = [checkpoints1]. Note that size is 1 so new checkpoint name remains same
+
+ LogCustomizer customLogs = LogCustomizer.forLogger(AsyncIndexUpdate.class.getName())
+ .filter(Level.WARN)
+ .create();
+
+ builder = store.getRoot().builder();
+ builder.child("testRoot3").setProperty("foo", "abc");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ customLogs.starting();
+
+ async.run();
+
+ assertEquals(Collections.emptyList(), customLogs.getLogs());
+ customLogs.finished();
+ }
+
}