Author: mreutegg
Date: Thu Apr 11 07:31:31 2019
New Revision: 1857301
URL: http://svn.apache.org/viewvc?rev=1857301&view=rev
Log:
OAK-8012: Unmerged branch changes visible after restart
Merged revision 1852493 from trunk
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 11 07:31:31 2019
@@ -3,5 +3,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226,1846057
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492,1854455,1854701,1854827,1854930
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1854455,1854701,1854827,1854930
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1857301&r1=1857300&r2=1857301&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Thu Apr 11 07:31:31 2019
@@ -2026,19 +2026,25 @@ public final class NodeDocument extends
return false;
}
if (Utils.isCommitted(commitValue)) {
- if (context.getBranches().getBranch(readRevision) == null
- && !readRevision.isBranch()) {
+ Branch b = context.getBranches().getBranch(readRevision);
+ if (b == null) {
+ // readRevision is not from a branch commit, though it may
+ // still be a branch revision when it references the base
+ // of a new branch that has not yet been created. In that
+ // case the branch revision is equivalent with the trunk
+ // revision.
+
// resolve commit revision
revision = resolveCommitRevision(revision, commitValue);
- // readRevision is not from a branch
// compare resolved revision as is
return !readRevision.isRevisionNewer(revision);
} else {
- // on same merged branch?
- if
(commitValue.equals(getCommitValue(readRevision.getBranchRevision().asTrunkRevision())))
{
- // compare unresolved revision
- return !readRevision.isRevisionNewer(revision);
- }
+ // read revision is on a branch and the change is committed
+ // get the base revision of the branch and check
+ // if change is visible from there
+ RevisionVector baseRev =
b.getBase(readRevision.getBranchRevision());
+ revision = resolveCommitRevision(revision, commitValue);
+ return !baseRev.isRevisionNewer(revision);
}
} else {
// branch commit (not merged)
@@ -2049,9 +2055,23 @@ public final class NodeDocument extends
// this is an unmerged branch commit from another cluster node,
// hence never visible to us
return false;
+ } else {
+ // unmerged branch change with local clusterId
+ Branch b = context.getBranches().getBranch(readRevision);
+ if (b == null) {
+ // reading on trunk never sees changes on an unmerged
branch
+ return false;
+ } else if (b.containsCommit(revision)) {
+ // read revision is on the same branch as the
+ // unmerged branch changes -> compare revisions as is
+ return !readRevision.isRevisionNewer(revision);
+ } else {
+ // read revision is on a different branch than the
+ // unmerged branch changes -> never visible
+ return false;
+ }
}
}
- return includeRevision(context, resolveCommitRevision(revision,
commitValue), readRevision);
}
/**
@@ -2075,37 +2095,6 @@ public final class NodeDocument extends
return value;
}
- private static boolean includeRevision(RevisionContext context,
- Revision x,
- RevisionVector readRevision) {
- Branch b = null;
- if (x.getClusterId() == context.getClusterId()) {
- RevisionVector branchRev = new
RevisionVector(x).asBranchRevision(context.getClusterId());
- b = context.getBranches().getBranch(branchRev);
- }
- if (b != null) {
- // only include if read revision is also a branch revision
- // with a history including x
- if (readRevision.isBranch()
- && b.containsCommit(readRevision.getBranchRevision())) {
- // in same branch, include if the same revision or
- // readRevision is newer
- return !readRevision.isRevisionNewer(x);
- }
- // not part of branch identified by requestedRevision
- return false;
- }
- // assert: x is not a branch commit
- b = context.getBranches().getBranch(readRevision);
- if (b != null) {
- // reset readRevision to branch base revision to make
- // sure we don't include revisions committed after branch
- // was created
- readRevision = b.getBase(readRevision.getBranchRevision());
- }
- return !readRevision.isRevisionNewer(x);
- }
-
/**
* Get the latest property value smaller or equal the readRevision
revision.
*
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java?rev=1857301&r1=1857300&r2=1857301&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
Thu Apr 11 07:31:31 2019
@@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -76,7 +75,6 @@ public class BranchTest {
assertModifiedPaths(b.getModifiedPathsUntil(c5));
}
- @Ignore("OAK-8012")
@Test
public void orphanedBranchTest() {
String rootId = Utils.getIdFromPath("/");
