Author: stillalex
Date: Fri Mar 1 11:43:39 2019
New Revision: 1854577
URL: http://svn.apache.org/viewvc?rev=1854577&view=rev
Log:
OAK-8095 VersionStorageEditor can prevent upgrade of version store
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
jackrabbit/oak/branches/1.10/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 1 11:43:39 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854462,1854466,1854468,1854515
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854462,1854466,1854468,1854515,1854533
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java?rev=1854577&r1=1854576&r2=1854577&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
Fri Mar 1 11:43:39 2019
@@ -54,17 +54,19 @@ class VersionStorageEditor extends Defau
VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
@NotNull NodeBuilder workspaceRoot) {
this(versionStorageNode, workspaceRoot, versionStorageNode,
- VERSION_STORE_PATH);
+ VERSION_STORE_PATH, false);
}
private VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
@NotNull NodeBuilder workspaceRoot,
@NotNull NodeBuilder builder,
- @NotNull String path) {
+ @NotNull String path,
+ boolean initPhase) {
this.versionStorageNode = checkNotNull(versionStorageNode);
this.workspaceRoot = checkNotNull(workspaceRoot);
this.builder = checkNotNull(builder);
this.path = checkNotNull(path);
+ this.initPhase = initPhase;
}
@Override
@@ -88,8 +90,7 @@ class VersionStorageEditor extends Defau
if (d < VERSION_HISTORY_DEPTH && !isVersionStorageNode(after)) {
return null;
}
- return new VersionStorageEditor(versionStorageNode, workspaceRoot,
- builder.child(name), p);
+ return new VersionStorageEditor(versionStorageNode, workspaceRoot,
builder.child(name), p, initPhase);
}
@Override
Modified:
jackrabbit/oak/branches/1.10/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java?rev=1854577&r1=1854576&r2=1854577&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
Fri Mar 1 11:43:39 2019
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.junit.Test;
@@ -77,6 +78,27 @@ public class InitialContentTest implemen
NodeBuilder builder = before.builder();
new
InitialContent().withPrePopulatedVersionStore().initialize(builder);
NodeState after = builder.getNodeState();
+ new VersionHook().processCommit(before, after, CommitInfo.EMPTY);
+ }
+
+
+ @Test
+ public void validatePrePopulatedNonEmpty() throws Exception {
+ NodeState init = EMPTY_NODE;
+ NodeBuilder builderI = init.builder();
+
+ // create a partial version storage structure
+ new
InitialContent().withPrePopulatedVersionStore().initialize(builderI);
+ NodeBuilder versionStorage =
builderI.child(JCR_SYSTEM).child(JCR_VERSIONSTORAGE);
+ versionStorage.removeProperty(VERSION_STORE_INIT);
+ versionStorage.getChildNode("00").getChildNode("00").remove();
+ versionStorage.getChildNode("01").getChildNode("00").remove();
+ versionStorage.getChildNode("02").remove();
+
+ NodeState before = builderI.getNodeState();
+ NodeBuilder builder = before.builder();
+ new
InitialContent().withPrePopulatedVersionStore().initialize(builder);
+ NodeState after = builder.getNodeState();
new VersionHook().processCommit(before, after, CommitInfo.EMPTY);
}
}
