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 2019/03/12 13:50:44 UTC
svn commit: r1855323 - in /jackrabbit/oak/branches/1.8: ./
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: Tue Mar 12 13:50:43 2019
New Revision: 1855323
URL: http://svn.apache.org/viewvc?rev=1855323&view=rev
Log:
OAK-8108: Branch reset does not remove all branch commit entries
Merged revisions 1854848 and 1854859 from trunk
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 12 13:50:43 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044,1854455,1854461,1854466,1854515,1854701
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044,1854455,1854461,1854466,1854515,1854701,1854848,1854859
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1855323&r1=1855322&r2=1855323&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Mar 12 13:50:43 2019
@@ -1672,6 +1672,7 @@ public final class DocumentNodeStore
for (Revision r : reverse(revs)) {
NodeDocument.removeCollision(rootOp, r.asTrunkRevision());
NodeDocument.removeRevision(rootOp, r.asTrunkRevision());
+ NodeDocument.removeBranchCommit(rootOp, r.asTrunkRevision());
operations.clear();
BranchCommit bc = b.getCommit(r);
if (bc.isRebase()) {
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java?rev=1855323&r1=1855322&r2=1855323&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java Tue Mar 12 13:50:43 2019
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -35,6 +36,7 @@ import static org.apache.jackrabbit.oak.
*/
class ResetDiff implements NodeStateDiff {
+ private final ResetDiff parent;
private final Revision revision;
private final String path;
private final Map<String, UpdateOp> operations;
@@ -42,12 +44,14 @@ class ResetDiff implements NodeStateDiff
ResetDiff(@NotNull Revision revision,
@NotNull Map<String, UpdateOp> operations) {
- this(revision, "/", operations);
+ this(null, revision, "/", operations);
}
- private ResetDiff(@NotNull Revision revision,
+ private ResetDiff(@Nullable ResetDiff parent,
+ @NotNull Revision revision,
@NotNull String path,
@NotNull Map<String, UpdateOp> operations) {
+ this.parent = parent;
this.revision = checkNotNull(revision);
this.path = checkNotNull(path);
this.operations = checkNotNull(operations);
@@ -75,9 +79,14 @@ class ResetDiff implements NodeStateDiff
public boolean childNodeAdded(String name, NodeState after) {
NodeDocument.removeCommitRoot(getUpdateOp(), revision);
String p = PathUtils.concat(path, name);
- ResetDiff diff = new ResetDiff(revision, p, operations);
+ ResetDiff diff = new ResetDiff(this, revision, p, operations);
UpdateOp op = diff.getUpdateOp();
NodeDocument.removeDeleted(op, revision);
+ NodeDocument.setDeletedOnce(op);
+ if (parent != null) {
+ // make sure branch related entries are removed also on the parent
+ parent.getUpdateOp();
+ }
return after.compareAgainstBaseState(EMPTY_NODE, diff);
}
@@ -87,13 +96,13 @@ class ResetDiff implements NodeStateDiff
NodeState after) {
String p = PathUtils.concat(path, name);
return after.compareAgainstBaseState(before,
- new ResetDiff(revision, p, operations));
+ new ResetDiff(this, revision, p, operations));
}
@Override
public boolean childNodeDeleted(String name, NodeState before) {
String p = PathUtils.concat(path, name);
- ResetDiff diff = new ResetDiff(revision, p, operations);
+ ResetDiff diff = new ResetDiff(this, revision, p, operations);
NodeDocument.removeDeleted(diff.getUpdateOp(), revision);
return MISSING_NODE.compareAgainstBaseState(before, diff);
}
@@ -112,6 +121,7 @@ class ResetDiff implements NodeStateDiff
}
NodeDocument.removeRevision(update, revision);
NodeDocument.removeCommitRoot(update, revision);
+ NodeDocument.removeBranchCommit(update, revision);
}
return update;
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java?rev=1855323&r1=1855322&r2=1855323&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java Tue Mar 12 13:50:43 2019
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -165,6 +166,30 @@ public class DocumentMKResetTest extends
}
@Test
+ public void resetRemovesBranchCommitEntries() {
+ DocumentStore store = mk.getDocumentStore();
+
+ addNodes(null, "/foo");
+ String b0 = mk.branch(null);
+ String b1 = addNodes(b0, "/foo/bar");
+
+ NodeDocument foo = store.find(NODES, getIdFromPath("/foo"));
+ assertNotNull(foo);
+ assertTrue(foo.getLocalCommitRoot().containsKey(
+ Revision.fromString(b1).asTrunkRevision()));
+
+ addNodes(null, "/foo/bar");
+
+ mk.reset(b1, b0);
+
+ // reset must also remove _bc entry on parent document
+ Revision r = Revision.fromString(b1).asTrunkRevision();
+ for (NodeDocument doc : Utils.getAllDocuments(store)) {
+ assertFalse(doc.getId(), doc.getLocalBranchCommits().contains(r));
+ }
+ }
+
+ @Test
public void resetMultipleCommits() {
DocumentStore store = mk.getDocumentStore();