Author: stillalex Date: Thu Feb 28 15:14:36 2019 New Revision: 1854533 URL: http://svn.apache.org/viewvc?rev=1854533&view=rev Log: OAK-8095 VersionStorageEditor can prevent upgrade of version store
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java?rev=1854533&r1=1854532&r2=1854533&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java Thu Feb 28 15:14:36 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/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java?rev=1854533&r1=1854532&r2=1854533&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java Thu Feb 28 15:14:36 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); } }