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 2021/02/18 15:01:10 UTC
svn commit: r1886663 - in /jackrabbit/oak/branches/1.22: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Thu Feb 18 15:01:10 2021
New Revision: 1886663
URL: http://svn.apache.org/viewvc?rev=1886663&view=rev
Log:
OAK-9358: DocumentNodeStore may accumulate split candidates
Merge revision 1886615 from trunk
Enable tests and re-implement fix in 1.22 branch
Modified:
jackrabbit/oak/branches/1.22/ (props changed)
jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.22/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
Propchange: jackrabbit/oak/branches/1.22/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1886615
Modified: jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1886663&r1=1886662&r2=1886663&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Feb 18 15:01:10 2021
@@ -2385,6 +2385,7 @@ public final class DocumentNodeStore
String id = it.next();
NodeDocument doc = store.find(Collection.NODES, id);
if (doc == null) {
+ it.remove();
continue;
}
cleanCollisions(doc, collisionGarbageBatchSize);
Modified: jackrabbit/oak/branches/1.22/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java?rev=1886663&r1=1886662&r2=1886663&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java (original)
+++ jackrabbit/oak/branches/1.22/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java Thu Feb 18 15:01:10 2021
@@ -45,7 +45,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.jetbrains.annotations.NotNull;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.Iterables;
@@ -1075,7 +1074,6 @@ public class DocumentSplitTest extends B
}
}
- @Ignore("OAK-9358")
@Test
public void splitCandidatesCleanAfterBackgroundUpdate() throws Exception {
DocumentNodeStore ns = mk.getNodeStore();
@@ -1088,7 +1086,6 @@ public class DocumentSplitTest extends B
assertThat(ns.getSplitCandidates(), empty());
}
- @Ignore("OAK-9358")
@Test
public void splitCandidatesCleanAfterBackgroundUpdateWithUnknownId() throws Exception {
DocumentNodeStore ns = mk.getNodeStore();