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 2020/03/31 12:04:04 UTC
svn commit: r1875929 - in /jackrabbit/oak/trunk/oak-store-document: pom.xml
src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
Author: mreutegg
Date: Tue Mar 31 12:04:04 2020
New Revision: 1875929
URL: http://svn.apache.org/viewvc?rev=1875929&view=rev
Log:
OAK-8984: A big number of NOOP changes can result in a StackOverflow
Patch in collaboration with José Andrés Cordero Benítez
Modified:
jackrabbit/oak/trunk/oak-store-document/pom.xml
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
Modified: jackrabbit/oak/trunk/oak-store-document/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/pom.xml?rev=1875929&r1=1875928&r2=1875929&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-document/pom.xml Tue Mar 31 12:04:04 2020
@@ -31,6 +31,10 @@
<name>Oak DocumentNodeStore</name>
<packaging>bundle</packaging>
+ <properties>
+ <test.opts.memory>-Xmx512m -Xss256k</test.opts.memory>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?rev=1875929&r1=1875928&r2=1875929&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java Tue Mar 31 12:04:04 2020
@@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -496,9 +497,13 @@ class DocumentNodeStoreBranch implements
branchState = new Unmodified(base);
} else {
int numChanges = countChanges(base, root);
- head = newModifiedDocumentNodeState(root);
if (numChanges > updateLimit) {
+ head = newModifiedDocumentNodeState(root);
persist();
+ } else {
+ NodeBuilder builder = new MemoryNodeBuilder(base);
+ root.compareAgainstBaseState(base, new ApplyDiff(builder));
+ head = newModifiedDocumentNodeState(builder.getNodeState());
}
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java?rev=1875929&r1=1875928&r2=1875929&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java Tue Mar 31 12:04:04 2020
@@ -16,7 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import org.apache.jackrabbit.oak.json.JsopDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Rule;
import org.junit.Test;
@@ -103,4 +105,19 @@ public class DocumentNodeStoreBranchTest
// expected
}
}
+
+ @Test
+ public void noopChanges() throws Exception {
+ DocumentNodeStore ns = builderProvider.newBuilder().setUpdateLimit(10).getNodeStore();
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child("a").setProperty("p", 1);
+ merge(ns, builder);
+ NodeState root = ns.getRoot();
+ builder = root.builder();
+ builder.child("b");
+ for (int i = 0; i < ns.getUpdateLimit() * 2000; i++) {
+ builder.child("a").setProperty("p", 1);
+ }
+ builder.getNodeState().compareAgainstBaseState(root, new JsopDiff());
+ }
}