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 2015/10/01 13:26:29 UTC
svn commit: r1706215 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugi...
Author: mreutegg
Date: Thu Oct 1 11:26:28 2015
New Revision: 1706215
URL: http://svn.apache.org/viewvc?rev=1706215&view=rev
Log:
OAK-3388: Inconsistent read in cluster with clock differences
Merged revisions 1702241,1705871 from trunk
Removed:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CollisionHandler.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 1 11:26:28 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500,1700753
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609
064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1
627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,164135
0,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646687,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,165
6033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,
1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,16850
23,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,17
01750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705268,1705273,1705677,1705701
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609
064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1
627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,164135
0,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646687,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,165
6033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,
1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,16850
23,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,17
01750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702241,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705268,1705273,1705677,1705701,1705871
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Thu Oct 1 11:26:28 2015
@@ -54,9 +54,10 @@ public class Commit {
private final DocumentNodeStoreBranch branch;
private final Revision baseRevision;
private final Revision revision;
- private HashMap<String, UpdateOp> operations = new LinkedHashMap<String, UpdateOp>();
- private JsopWriter diff = new JsopStream();
- private Set<Revision> collisions = new LinkedHashSet<Revision>();
+ private final HashMap<String, UpdateOp> operations = new LinkedHashMap<String, UpdateOp>();
+ private final JsopWriter diff = new JsopStream();
+ private final Set<Revision> collisions = new LinkedHashSet<Revision>();
+ private Branch b;
/**
* List of all node paths which have been modified in this commit. In addition to the nodes
@@ -500,13 +501,12 @@ public class Commit {
if (baseRevision != null) {
Revision newestRev = null;
if (before != null) {
- newestRev = before.getNewestRevision(nodeStore, revision,
- new CollisionHandler() {
- @Override
- void concurrentModification(Revision other) {
- collisions.add(other);
- }
- });
+ Revision base = baseRevision;
+ if (nodeStore.isDisableBranches()) {
+ base = base.asTrunkRevision();
+ }
+ newestRev = before.getNewestRevision(
+ nodeStore, base, revision, getBranch(), collisions);
}
String conflictMessage = null;
if (newestRev == null) {
@@ -585,6 +585,20 @@ public class Commit {
}
/**
+ * @return the branch if this is a branch commit, otherwise {@code null}.
+ */
+ @CheckForNull
+ private Branch getBranch() {
+ if (baseRevision == null || !baseRevision.isBranch()) {
+ return null;
+ }
+ if (b == null) {
+ b = nodeStore.getBranches().getBranch(revision);
+ }
+ return b;
+ }
+
+ /**
* Apply the changes to the DocumentNodeStore (to update the cache).
*
* @param before the revision right before this commit.
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Oct 1 11:26:28 2015
@@ -42,6 +42,7 @@ import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.text.SimpleDateFormat;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -1705,6 +1706,29 @@ public final class DocumentNodeStore
return stats;
}
Map<Integer, Revision> lastRevMap = doc.getLastRev();
+ try {
+ long externalTime = Utils.getMaxExternalTimestamp(lastRevMap.values(), clusterId);
+ long localTime = clock.getTime();
+ if (localTime < externalTime) {
+ LOG.warn("Detected clock differences. Local time is '{}', " +
+ "while most recent external time is '{}'. " +
+ "Current _lastRev entries: {}",
+ new Date(localTime), new Date(externalTime), lastRevMap.values());
+ double delay = ((double) externalTime - localTime) / 1000d;
+ String msg = String.format("Background read will be delayed by %.1f seconds. " +
+ "Please check system time on cluster nodes.", delay);
+ LOG.warn(msg);
+ clock.waitUntil(externalTime + 1);
+ } else if (localTime == externalTime) {
+ // make sure local time is past external time
+ // but only log at debug
+ LOG.debug("Local and external time are equal. Waiting until local" +
+ "time is more recent than external reported time.");
+ clock.waitUntil(externalTime + 1);
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException("Background read interrupted", e);
+ }
Revision.RevisionComparator revisionComparator = getRevisionComparator();
// the (old) head occurred first
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Thu Oct 1 11:26:28 2015
@@ -56,7 +56,9 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -684,15 +686,21 @@ public final class NodeDocument extends
* Get the revision of the latest change made to this node.
*
* @param context the revision context
+ * @param baseRev the base revision of the current change.
* @param changeRev the revision of the current change
- * @param handler the conflict handler, which is called for concurrent changes
- * preceding <code>changeRev</code>.
+ * @param branch the branch associated with the current change or
+ * {@code null} if {@code changeRev} is not a branch commit.
+ * @param collisions concurrent changes preceding <code>changeRev</code>.
* @return the revision, or null if deleted
*/
@CheckForNull
- public Revision getNewestRevision(final RevisionContext context,
- final Revision changeRev,
- final CollisionHandler handler) {
+ Revision getNewestRevision(final RevisionContext context,
+ final Revision baseRev,
+ final Revision changeRev,
+ final Branch branch,
+ final Set<Revision> collisions) {
+ checkArgument(!baseRev.isBranch() || branch != null,
+ "Branch must be non-null if baseRev is a branch revision");
final Map<Revision, String> validRevisions = Maps.newHashMap();
Predicate<Revision> predicate = new Predicate<Revision>() {
@Override
@@ -703,15 +711,25 @@ public final class NodeDocument extends
if (isValidRevision(context, input, null, changeRev, validRevisions)) {
return true;
}
- handler.concurrentModification(input);
+ collisions.add(input);
return false;
}
};
Revision newestRev = null;
+ int localClusterId = context.getClusterId();
// check local commits first
SortedMap<Revision, String> revisions = getLocalRevisions();
SortedMap<Revision, String> commitRoots = getLocalCommitRoot();
+ // go through all local commits and consider all
+ // changes from another cluster node not yet visible from
+ // the base version as collision
+ for (Revision r : concat(revisions.keySet(), commitRoots.keySet())) {
+ if (r.getClusterId() != localClusterId
+ && isRevisionNewer(context, r, baseRev)) {
+ collisions.add(r);
+ }
+ }
Iterator<Revision> it = filter(Iterables.mergeSorted(
ImmutableList.of(revisions.keySet(), commitRoots.keySet()),
revisions.comparator()), predicate).iterator();
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java Thu Oct 1 11:26:28 2015
@@ -607,7 +607,7 @@ public class Revision {
if (comp != 0) {
return comp;
}
- return Integer.signum(o1.getClusterId() - o2.getClusterId());
+ return o1.compareTo(o2);
}
/**
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Thu Oct 1 11:26:28 2015
@@ -498,12 +498,30 @@ public class Utils {
*/
@CheckForNull
public static Revision max(@Nullable Revision a, @Nullable Revision b) {
+ return max(a, b, StableRevisionComparator.INSTANCE);
+ }
+
+ /**
+ * Returns the revision which is considered more recent or {@code null} if
+ * both revisions are {@code null}. The implementation will return the first
+ * revision if both are considered equal. The comparison is done using the
+ * provided comparator.
+ *
+ * @param a the first revision (or {@code null}).
+ * @param b the second revision (or {@code null}).
+ * @param c the comparator.
+ * @return the revision considered more recent.
+ */
+ @CheckForNull
+ public static Revision max(@Nullable Revision a,
+ @Nullable Revision b,
+ @Nonnull Comparator<Revision> c) {
if (a == null) {
return b;
} else if (b == null) {
return a;
}
- return StableRevisionComparator.INSTANCE.compare(a, b) >= 0 ? a : b;
+ return c.compare(a, b) >= 0 ? a : b;
}
/**
@@ -616,4 +634,26 @@ public class Utils {
}
});
}
+
+ /**
+ * Returns the highest timestamp of all the passed external revisions.
+ * A revision is considered external if the clusterId is different from the
+ * passed {@code localClusterId}.
+ *
+ * @param revisions the revisions to consider.
+ * @param localClusterId the id of the local cluster node.
+ * @return the highest timestamp or {@link Long#MIN_VALUE} if none of the
+ * revisions is external.
+ */
+ public static long getMaxExternalTimestamp(Iterable<Revision> revisions,
+ int localClusterId) {
+ long maxTime = Long.MIN_VALUE;
+ for (Revision r : revisions) {
+ if (r.getClusterId() == localClusterId) {
+ continue;
+ }
+ maxTime = Math.max(maxTime, r.getTimestamp());
+ }
+ return maxTime;
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Thu Oct 1 11:26:28 2015
@@ -90,7 +90,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -1112,7 +1111,6 @@ public class DocumentNodeStoreTest {
}
// OAK-2929
- @Ignore
@Test
public void conflictDetectionWithClockDifference() throws Exception {
MemoryDocumentStore store = new MemoryDocumentStore();
@@ -1170,7 +1168,6 @@ public class DocumentNodeStoreTest {
}
// OAK-2929
- @Ignore
@Test
public void parentWithUnseenChildrenMustNotBeDeleted() throws Exception {
final MemoryDocumentStore docStore = new MemoryDocumentStore();
@@ -1333,12 +1330,7 @@ public class DocumentNodeStoreTest {
//root would hold reference to store2 root state after initial repo initialization
root = store2.getRoot();
- //The hidden node itself should be creatable across cluster concurrently
- builder = root.builder();
- builder.child(":dynHidden");
- merge(store2, builder);
-
- //Children of hidden node should be creatable across cluster concurrently
+ //The hidden node and children should be creatable across cluster concurrently
builder = root.builder();
builder.child(":hidden").child("b");
builder.child(":dynHidden").child("c");
@@ -1501,6 +1493,109 @@ public class DocumentNodeStoreTest {
false, "Change deleted merge conflicts for internal docs should fail");
}
+ // OAK-3388
+ @Test
+ public void clusterWithClockDifferences() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ long now = System.currentTimeMillis();
+ Clock c1 = new Clock.Virtual();
+ c1.waitUntil(now);
+ Revision.setClock(c1);
+ DocumentNodeStore ns1 = builderProvider.newBuilder().clock(c1)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("node");
+ merge(ns1, b1);
+ // make /node visible
+ ns1.runBackgroundOperations();
+
+ Revision.resetClockToDefault();
+ Clock c2 = new Clock.Virtual();
+ // c2 is five seconds ahead
+ c2.waitUntil(now + 5000);
+ Revision.setClock(c2);
+
+ DocumentNodeStore ns2 = builderProvider.newBuilder().clock(c2)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ // ns2 sees /node
+ assertTrue(ns2.getRoot().hasChildNode("node"));
+
+ // remove /node on ns2
+ NodeBuilder b2 = ns2.getRoot().builder();
+ b2.child("node").remove();
+ merge(ns2, b2);
+ ns2.runBackgroundOperations();
+
+ // add /node again on ns1
+ Revision.resetClockToDefault();
+ Revision.setClock(c1);
+ ns1.runBackgroundOperations();
+ b1 = ns1.getRoot().builder();
+ assertFalse(b1.hasChildNode("node"));
+ b1.child("node");
+ merge(ns1, b1);
+ ns1.runBackgroundOperations();
+
+ // check if /node is visible on ns2
+ Revision.resetClockToDefault();
+ Revision.setClock(c2);
+ ns2.runBackgroundOperations();
+ b2 = ns2.getRoot().builder();
+ assertTrue(b2.hasChildNode("node"));
+ }
+
+ // OAK-3388
+ @Test
+ public void clusterWithClockDifferences2() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ long now = System.currentTimeMillis();
+ Clock c1 = new Clock.Virtual();
+ c1.waitUntil(now);
+ Revision.setClock(c1);
+ DocumentNodeStore ns1 = builderProvider.newBuilder().clock(c1)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("node").setProperty("p", 1);
+ merge(ns1, b1);
+ // make /node visible
+ ns1.runBackgroundOperations();
+
+ Revision.resetClockToDefault();
+ Clock c2 = new Clock.Virtual();
+ // c2 is five seconds ahead
+ c2.waitUntil(now + 5000);
+ Revision.setClock(c2);
+
+ DocumentNodeStore ns2 = builderProvider.newBuilder().clock(c2)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ // ns2 sees /node
+ assertTrue(ns2.getRoot().hasChildNode("node"));
+ assertEquals(1, ns2.getRoot().getChildNode("node").getProperty("p").getValue(Type.LONG).longValue());
+
+ // increment /node/p ns2
+ NodeBuilder b2 = ns2.getRoot().builder();
+ b2.child("node").setProperty("p", 2);
+ merge(ns2, b2);
+ ns2.runBackgroundOperations();
+
+ // increment /node/p2 on ns1
+ Revision.resetClockToDefault();
+ Revision.setClock(c1);
+ ns1.runBackgroundOperations();
+ b1 = ns1.getRoot().builder();
+ assertEquals(2, b1.getChildNode("node").getProperty("p").getValue(Type.LONG).longValue());
+ b1.child("node").setProperty("p", 3);
+ merge(ns1, b1);
+ ns1.runBackgroundOperations();
+
+ // check if /node/p=3 is visible on ns2
+ Revision.resetClockToDefault();
+ Revision.setClock(c2);
+ ns2.runBackgroundOperations();
+ b2 = ns2.getRoot().builder();
+ assertEquals(3, b2.getChildNode("node").getProperty("p").getValue(Type.LONG).longValue());
+ }
+
/**
* Utility class that eases creating single cluster id merge conflicts. The two methods:
* <ul>
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Thu Oct 1 11:26:28 2015
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
@@ -39,7 +40,10 @@ import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Tests for {@link NodeDocument}.
@@ -275,21 +279,135 @@ public class NodeDocumentTest {
// simulate a change revision within the range of
// the most recent previous document
Iterable<Revision> changes = prev.getAllChanges();
- Revision changeRev = new Revision(Iterables.getLast(changes).getTimestamp(), 1000, ns.getClusterId());
+ Revision baseRev = Iterables.getLast(changes);
+ Revision changeRev = new Revision(baseRev.getTimestamp(), 1000, ns.getClusterId());
// reset calls to previous documents
prevDocCalls.clear();
- doc.getNewestRevision(ns, changeRev, new CollisionHandler() {
- @Override
- void concurrentModification(Revision other) {
- // ignore
- }
- });
+ doc.getNewestRevision(ns, baseRev, changeRev, null, new HashSet<Revision>());
// must not read all previous docs
assertTrue("too many calls for previous documents: " + prevDocCalls,
prevDocCalls.size() <= 4);
ns.dispose();
}
+
+ @Test
+ public void getNewestRevision() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ DocumentNodeStore ns1 = createTestStore(store, 0);
+ DocumentNodeStore ns2 = createTestStore(store, 0);
+
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("test");
+ merge(ns1, b1);
+ Revision created = ns1.getHeadRevision();
+
+ NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ Set<Revision> collisions = Sets.newHashSet();
+ Revision newest = doc.getNewestRevision(ns1, ns1.getHeadRevision(),
+ ns1.newRevision(), null, collisions);
+ assertEquals(created, newest);
+ assertEquals(0, collisions.size());
+
+ // from ns2 POV newest must be null, because the node is not yet visible
+ newest = doc.getNewestRevision(ns2, ns2.getHeadRevision(),
+ ns2.newRevision(), null, collisions);
+ assertNull(newest);
+ assertEquals(1, collisions.size());
+ assertEquals(created, collisions.iterator().next());
+
+ ns1.runBackgroundOperations();
+ ns2.runBackgroundOperations();
+ collisions.clear();
+
+ // now ns2 sees /test
+ doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ newest = doc.getNewestRevision(ns2, ns2.getHeadRevision(),
+ ns2.newRevision(), null, collisions);
+ assertEquals(created, newest);
+ assertEquals(0, collisions.size());
+
+ Revision uncommitted = ns1.newRevision();
+ UpdateOp op = new UpdateOp(Utils.getIdFromPath("/test"), false);
+ NodeDocument.setCommitRoot(op, uncommitted, 0);
+ op.setMapEntry("p", uncommitted, "v");
+ assertNotNull(store.findAndUpdate(NODES, op));
+
+ collisions.clear();
+ // ns1 must report uncommitted in collisions
+ doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ newest = doc.getNewestRevision(ns1, ns1.getHeadRevision(),
+ ns1.newRevision(), null, collisions);
+ assertEquals(created, newest);
+ assertEquals(1, collisions.size());
+ assertEquals(uncommitted, collisions.iterator().next());
+
+ collisions.clear();
+ // ns2 must report uncommitted in collisions
+ newest = doc.getNewestRevision(ns2, ns2.getHeadRevision(),
+ ns2.newRevision(), null, collisions);
+ assertEquals(created, newest);
+ assertEquals(1, collisions.size());
+ assertEquals(uncommitted, collisions.iterator().next());
+
+ b1 = ns1.getRoot().builder();
+ b1.child("test").setProperty("q", "v");
+ merge(ns1, b1);
+ Revision committed = ns1.getHeadRevision();
+
+ collisions.clear();
+ // ns1 must now report committed revision as newest
+ // uncommitted is not considered a collision anymore
+ // because it is older than the base revision
+ doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ newest = doc.getNewestRevision(ns1, created,
+ ns1.newRevision(), null, collisions);
+ assertEquals(committed, newest);
+ assertEquals(0, collisions.size());
+
+ // ns2 must report committed revision as collision because
+ // it is not yet visible. newest is when the node was created
+ newest = doc.getNewestRevision(ns2, ns2.getHeadRevision(),
+ ns2.newRevision(), null, collisions);
+ assertEquals(created, newest);
+ assertEquals(2, collisions.size());
+ assertTrue(collisions.contains(uncommitted));
+ assertTrue(collisions.contains(committed));
+
+
+ ns1.dispose();
+ ns2.dispose();
+ }
+
+ @Test
+ public void getNewestRevisionCheckArgument() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ DocumentNodeStore ns = createTestStore(store, 0);
+
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child("test");
+ merge(ns, builder);
+
+ Set<Revision> collisions = Sets.newHashSet();
+ NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/test"));
+ Revision branchBase = ns.getHeadRevision().asBranchRevision();
+ try {
+ doc.getNewestRevision(ns, branchBase, ns.newRevision(), null, collisions);
+ fail("Must fail with IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ try {
+ Revision head = ns.getHeadRevision();
+ Branch b = ns.getBranches().create(head, ns.newRevision(), null);
+ doc.getNewestRevision(ns, head, ns.newRevision(), b, collisions);
+ fail("Must fail with IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ ns.dispose();
+ }
private DocumentNodeStore createTestStore(int numChanges) throws Exception {
return createTestStore(new MemoryDocumentStore(), numChanges);
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java Thu Oct 1 11:26:28 2015
@@ -129,6 +129,22 @@ public class RevisionTest {
}
@Test
+ public void compare2() {
+ RevisionComparator comp = new RevisionComparator(1);
+
+ Revision r2 = new Revision(7, 0, 2);
+ Revision r3 = new Revision(5, 0, 3);
+
+ Revision seenAt = new Revision(8, 0, 0);
+ comp.add(r2, seenAt);
+ comp.add(r3, seenAt);
+
+ // both revisions have same seenAt revision, must use
+ // revision timestamp for comparison
+ assertTrue(comp.compare(r2, r3) > 0);
+ }
+
+ @Test
public void revisionComparatorSimple() {
RevisionComparator comp = new RevisionComparator(0);
Revision r1 = Revision.newRevision(0);
@@ -254,12 +270,12 @@ public class RevisionTest {
comp.add(c1sync, Revision.fromString("r2-0-0"));
Revision c2sync = Revision.fromString("r4-1-2");
comp.add(c2sync, Revision.fromString("r2-1-0"));
- Revision c3sync = Revision.fromString("r2-0-3");
+ Revision c3sync = Revision.fromString("r5-0-3");
comp.add(c3sync, Revision.fromString("r2-1-0"));
assertTrue(comp.compare(r1, r2) < 0);
assertTrue(comp.compare(r2, c2sync) < 0);
- // same seen-at revision, but clusterId 2 < 3
+ // same seen-at revision, but rev timestamp c2sync < c3sync
assertTrue(comp.compare(c2sync, c3sync) < 0);
// this means, c3sync must be after r1 and r2
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java?rev=1706215&r1=1706214&r2=1706215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java Thu Oct 1 11:26:28 2015
@@ -16,7 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.document.util;
+import java.util.List;
+
import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -123,4 +126,42 @@ public class UtilsTest {
store.dispose();
}
}
+
+ @Test
+ public void getMaxExternalRevisionTime() {
+ int localClusterId = 1;
+ List<Revision> revs = ImmutableList.of();
+ long revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(Long.MIN_VALUE, revTime);
+
+ revs = ImmutableList.of(Revision.fromString("r1-0-1"));
+ revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(Long.MIN_VALUE, revTime);
+
+ revs = ImmutableList.of(
+ Revision.fromString("r1-0-1"),
+ Revision.fromString("r2-0-2"));
+ revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(2, revTime);
+
+ revs = ImmutableList.of(
+ Revision.fromString("r3-0-1"),
+ Revision.fromString("r2-0-2"));
+ revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(2, revTime);
+
+ revs = ImmutableList.of(
+ Revision.fromString("r1-0-1"),
+ Revision.fromString("r2-0-2"),
+ Revision.fromString("r2-0-3"));
+ revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(2, revTime);
+
+ revs = ImmutableList.of(
+ Revision.fromString("r1-0-1"),
+ Revision.fromString("r3-0-2"),
+ Revision.fromString("r2-0-3"));
+ revTime = Utils.getMaxExternalTimestamp(revs, localClusterId);
+ assertEquals(3, revTime);
+ }
}