Author: catholicon
Date: Wed Dec 2 22:21:13 2015
New Revision: 1717690
URL: http://svn.apache.org/viewvc?rev=1717690&view=rev
Log:
AK-3223: Remove MongoDiffCache
(backporting r1695571 into 1.0 branch)
Conflicts:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java
OAK-3494: MemoryDiffCache should also check parent paths before falling to
Loader (or returning null)
(backporting r1707509 into 1.0 branch)
Conflicts:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(backporting r1710800 into 1.0 branch)
Removed:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.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/DiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.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/DocumentNodeStoreService.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 2 22:21:13 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500,1700753,1709440,1714095
-/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,1681921,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,16848
68,1685023,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695492,1695540,1695905,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700718,1700727,1700749,17
00769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702045,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,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707191,1707435,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1712018,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714095,1714170,1714213,1714229,1714238,1714519-1714520,1714730,1714739,1714779,1714956,1714961,1715010,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596
,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632
+/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,1681921,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,16848
68,1685023,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695492,1695540,1695571,1695905,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700718,1700727,17
00749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702045,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,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1712018,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714095,1714170,1714213,1714229,1714238,1714519-1714520,1714730,1714739,1714779,1714956,1714961,1715010,1715346,1715767,1715771,1715888,1715898,1716178
,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
Wed Dec 2 22:21:13 2015
@@ -21,11 +21,15 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.cache.CacheStats;
+import org.apache.jackrabbit.oak.commons.json.JsopReader;
+import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.unshareString;
/**
* A cache for child node diffs.
*/
-public interface DiffCache {
+abstract class DiffCache {
/**
* Returns a jsop diff for the child nodes at the given path. The returned
@@ -45,10 +49,10 @@ public interface DiffCache {
* @return the diff or {@code null} if unknown and no loader was passed.
*/
@CheckForNull
- String getChanges(@Nonnull Revision from,
- @Nonnull Revision to,
- @Nonnull String path,
- @Nullable Loader loader);
+ abstract String getChanges(@Nonnull Revision from,
+ @Nonnull Revision to,
+ @Nonnull String path,
+ @Nullable Loader loader);
/**
* Starts a new cache entry for the diff cache. Actual changes are added
@@ -61,15 +65,70 @@ public interface DiffCache {
* @return the cache entry.
*/
@Nonnull
- Entry newEntry(@Nonnull Revision from,
- @Nonnull Revision to,
- boolean local);
+ abstract Entry newEntry(@Nonnull Revision from,
+ @Nonnull Revision to,
+ boolean local);
/**
* @return the statistics for this cache.
*/
@Nonnull
- Iterable<CacheStats> getStats();
+ abstract Iterable<CacheStats> getStats();
+
+ /**
+ * Parses the jsop diff returned by
+ * {@link #getChanges(Revision, Revision, String, Loader)} and reports the
+ * changes by calling the appropriate methods on {@link Diff}.
+ *
+ * @param jsop the jsop diff to parse.
+ * @param diff the diff handler.
+ * @return {@code true} it the complete jsop was processed or {@code false}
+ * if one of the {@code diff} callbacks requested a stop.
+ * @throws IllegalArgumentException if {@code jsop} is malformed.
+ */
+ static boolean parseJsopDiff(@Nonnull String jsop,
+ @Nonnull Diff diff) {
+ if (jsop.trim().isEmpty()) {
+ return true;
+ }
+ JsopTokenizer t = new JsopTokenizer(jsop);
+ boolean continueComparison = true;
+ while (continueComparison) {
+ int r = t.read();
+ if (r == JsopReader.END) {
+ break;
+ }
+ switch (r) {
+ case '+': {
+ String name = unshareString(t.readString());
+ t.read(':');
+ t.read('{');
+ while (t.read() != '}') {
+ // skip properties
+ }
+ continueComparison = diff.childNodeAdded(name);
+ break;
+ }
+ case '-': {
+ String name = unshareString(t.readString());
+ continueComparison = diff.childNodeDeleted(name);
+ break;
+ }
+ case '^': {
+ String name = unshareString(t.readString());
+ t.read(':');
+ t.read('{');
+ t.read('}');
+ continueComparison = diff.childNodeChanged(name);
+ break;
+ }
+ default:
+ throw new IllegalArgumentException("jsonDiff: illegal
token '"
+ + t.getToken() + "' at pos: " + t.getLastPos() + '
' + jsop);
+ }
+ }
+ return continueComparison;
+ }
interface Entry {
@@ -96,4 +155,14 @@ public interface DiffCache {
String call();
}
+
+ interface Diff {
+
+ boolean childNodeAdded(String name);
+
+ boolean childNodeChanged(String name);
+
+ boolean childNodeDeleted(String name);
+
+ }
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Wed Dec 2 22:21:13 2015
@@ -537,11 +537,9 @@ public class DocumentMK implements Micro
* Use the given MongoDB as backend storage for the DocumentNodeStore.
*
* @param db the MongoDB connection
- * @param changesSizeMB the size in MB of the capped collection backing
- * the MongoDiffCache.
* @return this
*/
- public Builder setMongoDB(DB db, int changesSizeMB, int
blobCacheSizeMB) {
+ public Builder setMongoDB(DB db, int blobCacheSizeMB) {
if (db != null) {
if (this.documentStore == null) {
this.documentStore = new MongoDocumentStore(db, this);
@@ -566,7 +564,7 @@ public class DocumentMK implements Micro
* @return this
*/
public Builder setMongoDB(DB db) {
- return setMongoDB(db, 8, 16);
+ return setMongoDB(db, 16);
}
/**
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=1717690&r1=1717689&r2=1717690&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
Wed Dec 2 22:21:13 2015
@@ -34,7 +34,6 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.asStringValueIterable;
import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.pathToId;
-import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.unshareString;
import java.io.Closeable;
import java.io.IOException;
@@ -2064,67 +2063,45 @@ public final class DocumentNodeStore
return false;
}
- private boolean dispatch(@Nonnull String jsonDiff,
- @Nonnull DocumentNodeState node,
- @Nonnull DocumentNodeState base,
- @Nonnull NodeStateDiff diff) {
- if (jsonDiff.trim().isEmpty()) {
- return true;
- }
- JsopTokenizer t = new JsopTokenizer(jsonDiff);
- boolean continueComparison = true;
- while (continueComparison) {
- int r = t.read();
- if (r == JsopReader.END) {
- break;
+ private boolean dispatch(@Nonnull final String jsonDiff,
+ @Nonnull final DocumentNodeState node,
+ @Nonnull final DocumentNodeState base,
+ @Nonnull final NodeStateDiff diff) {
+ return DiffCache.parseJsopDiff(jsonDiff, new DiffCache.Diff() {
+ @Override
+ public boolean childNodeAdded(String name) {
+ return diff.childNodeAdded(name,
+ node.getChildNode(name));
}
- switch (r) {
- case '+': {
- String name = unshareString(t.readString());
- t.read(':');
- t.read('{');
- while (t.read() != '}') {
- // skip properties
- }
- continueComparison = diff.childNodeAdded(name,
- node.getChildNode(name));
- break;
- }
- case '-': {
- String name = unshareString(t.readString());
- continueComparison = diff.childNodeDeleted(name,
- base.getChildNode(name));
- break;
- }
- case '^': {
- String name = unshareString(t.readString());
- t.read(':');
- t.read('{');
- t.read('}');
- NodeState baseChild = base.getChildNode(name);
- NodeState nodeChild = node.getChildNode(name);
- if (baseChild.exists()) {
- if (nodeChild.exists()) {
- continueComparison = diff.childNodeChanged(name,
- baseChild, nodeChild);
- } else {
- continueComparison = diff.childNodeDeleted(name,
- baseChild);
- }
+
+ @Override
+ public boolean childNodeChanged(String name) {
+ boolean continueComparison = true;
+ NodeState baseChild = base.getChildNode(name);
+ NodeState nodeChild = node.getChildNode(name);
+ if (baseChild.exists()) {
+ if (nodeChild.exists()) {
+ continueComparison = diff.childNodeChanged(name,
+ baseChild, nodeChild);
} else {
- if (nodeChild.exists()) {
- continueComparison = diff.childNodeAdded(name,
- nodeChild);
- }
+ continueComparison = diff.childNodeDeleted(name,
+ baseChild);
+ }
+ } else {
+ if (nodeChild.exists()) {
+ continueComparison = diff.childNodeAdded(name,
+ nodeChild);
}
- break;
}
- default:
- throw new IllegalArgumentException("jsonDiff: illegal
token '"
- + t.getToken() + "' at pos: " + t.getLastPos() + '
' + jsonDiff);
+ return continueComparison;
}
- }
- return continueComparison;
+
+ @Override
+ public boolean childNodeDeleted(String name) {
+ return diff.childNodeDeleted(name,
+ base.getChildNode(name));
+ }
+ });
}
/**
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Wed Dec 2 22:21:13 2015
@@ -85,7 +85,6 @@ public class DocumentNodeStoreService {
private static final String DEFAULT_URI = "mongodb://localhost:27017/oak";
private static final int DEFAULT_CACHE = 256;
private static final int DEFAULT_OFF_HEAP_CACHE = 0;
- private static final int DEFAULT_CHANGES_SIZE = 256;
private static final int DEFAULT_BLOB_CACHE_SIZE = 16;
private static final String DEFAULT_DB = "oak";
private static final String DEFAULT_PERSISTENT_CACHE = "";
@@ -151,9 +150,6 @@ public class DocumentNodeStoreService {
@Property(intValue = DEFAULT_OFF_HEAP_CACHE)
private static final String PROP_OFF_HEAP_CACHE = "offHeapCache";
- @Property(intValue = DEFAULT_CHANGES_SIZE)
- private static final String PROP_CHANGES_SIZE = "changesSize";
-
@Property(intValue = DEFAULT_BLOB_CACHE_SIZE)
private static final String PROP_BLOB_CACHE_SIZE = "blobCacheSize";
@@ -290,7 +286,6 @@ public class DocumentNodeStoreService {
int childrenCachePercentage =
toInteger(prop(PROP_CHILDREN_CACHE_PERCENTAGE),
DEFAULT_CHILDREN_CACHE_PERCENTAGE);
int docChildrenCachePercentage =
toInteger(prop(PROP_DOC_CHILDREN_CACHE_PERCENTAGE),
DEFAULT_DOC_CHILDREN_CACHE_PERCENTAGE);
int diffCachePercentage = toInteger(prop(PROP_DIFF_CACHE_PERCENTAGE),
DEFAULT_DIFF_CACHE_PERCENTAGE);
- int changesSize = toInteger(prop(PROP_CHANGES_SIZE),
DEFAULT_CHANGES_SIZE);
int blobCacheSize = toInteger(prop(PROP_BLOB_CACHE_SIZE),
DEFAULT_BLOB_CACHE_SIZE);
String persistentCache =
PropertiesUtil.toString(prop(PROP_PERSISTENT_CACHE), DEFAULT_PERSISTENT_CACHE);
int cacheSegmentCount = toInteger(prop(PROP_CACHE_SEGMENT_COUNT),
DEFAULT_CACHE_SEGMENT_COUNT);
@@ -342,8 +337,8 @@ public class DocumentNodeStoreService {
// might contain passwords
String type = useMK ? "MK" : "NodeStore";
log.info("Starting Document{} with host={}, db={}, cache size
(MB)={}, Off Heap Cache size (MB)={}, " +
- "'changes' collection size (MB)={},
blobCacheSize (MB)={}, maxReplicationLagInSecs={}",
- type, mongoURI.getHosts(), db, cacheSize,
offHeapCache, changesSize, blobCacheSize, maxReplicationLagInSecs);
+ "blobCacheSize (MB)={},
maxReplicationLagInSecs={}",
+ type, mongoURI.getHosts(), db, cacheSize,
offHeapCache, blobCacheSize, maxReplicationLagInSecs);
log.info("Mongo Connection details {}",
MongoConnection.toString(mongoURI.getOptions()));
}
@@ -351,7 +346,7 @@ public class DocumentNodeStoreService {
DB mongoDB = client.getDB(db);
mkBuilder.setMaxReplicationLag(maxReplicationLagInSecs,
TimeUnit.SECONDS);
- mkBuilder.setMongoDB(mongoDB, changesSize, blobCacheSize);
+ mkBuilder.setMongoDB(mongoDB, blobCacheSize);
log.info("Connected to database {}", mongoDB);
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
Wed Dec 2 22:21:13 2015
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.plugins
/**
* A diff cache, which is pro-actively filled after a commit.
*/
-public class LocalDiffCache implements DiffCache {
+public class LocalDiffCache extends DiffCache {
/**
* Limit is arbitrary for now i.e. 16 MB. Same as in MongoDiffCache
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
Wed Dec 2 22:21:13 2015
@@ -30,11 +30,14 @@ import org.apache.jackrabbit.oak.plugins
import com.google.common.cache.Cache;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.commons.PathUtils.denotesRoot;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
/**
* An in-memory diff cache implementation.
*/
-public class MemoryDiffCache implements DiffCache {
+public class MemoryDiffCache extends DiffCache {
/**
* Diff cache.
@@ -53,20 +56,27 @@ public class MemoryDiffCache implements
@CheckForNull
@Override
- public String getChanges(@Nonnull Revision from,
- @Nonnull Revision to,
- @Nonnull String path,
- final @Nullable Loader loader) {
+ public String getChanges(@Nonnull final Revision from,
+ @Nonnull final Revision to,
+ @Nonnull final String path,
+ @Nullable final Loader loader) {
PathRev key = diffCacheKey(path, from, to);
StringValue diff;
if (loader == null) {
diff = diffCache.getIfPresent(key);
+ if (diff == null && isUnchanged(from, to, path)) {
+ diff = new StringValue("");
+ }
} else {
try {
diff = diffCache.get(key, new Callable<StringValue>() {
@Override
public StringValue call() throws Exception {
- return new StringValue(loader.call());
+ if (isUnchanged(from, to, path)) {
+ return new StringValue("");
+ } else {
+ return new StringValue(loader.call());
+ }
}
});
} catch (ExecutionException e) {
@@ -119,4 +129,61 @@ public class MemoryDiffCache implements
return new PathRev(from + path, to);
}
+ /**
+ * Returns {@code true} if it can be inferred from cache entries on
+ * ancestors of the given {@code path} that the node was not changed
between
+ * the two revisions. This method returns {@code false} if there are no
+ * matching cache entries for the given revision range or one of them
+ * indicates that the node at the given path may have been modified.
+ *
+ * @param from the from revision.
+ * @param to the to revision.
+ * @param path the path of the node to check.
+ * @return {@code true} if there are cache entries that indicate the node
+ * at the given path was modified between the two revisions.
+ */
+ private boolean isUnchanged(@Nonnull final Revision from,
+ @Nonnull final Revision to,
+ @Nonnull final String path) {
+ return !denotesRoot(path)
+ && isChildUnchanged(from, to, getParentPath(path),
getName(path));
+ }
+
+ private boolean isChildUnchanged(@Nonnull final Revision from,
+ @Nonnull final Revision to,
+ @Nonnull final String parent,
+ @Nonnull final String name) {
+ PathRev parentKey = diffCacheKey(parent, from, to);
+ StringValue parentCachedEntry = diffCache.getIfPresent(parentKey);
+ boolean unchanged;
+ if (parentCachedEntry == null) {
+ if (denotesRoot(parent)) {
+ // reached root and we don't know whether name
+ // changed between from and to
+ unchanged = false;
+ } else {
+ // recurse down
+ unchanged = isChildUnchanged(from, to,
+ getParentPath(parent), getName(parent));
+ }
+ } else {
+ unchanged = parseJsopDiff(parentCachedEntry.asString(), new Diff()
{
+ @Override
+ public boolean childNodeAdded(String n) {
+ return !name.equals(n);
+ }
+
+ @Override
+ public boolean childNodeChanged(String n) {
+ return !name.equals(n);
+ }
+
+ @Override
+ public boolean childNodeDeleted(String n) {
+ return !name.equals(n);
+ }
+ });
+ }
+ return unchanged;
+ }
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
Wed Dec 2 22:21:13 2015
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.cache.C
* Implements a tiered diff cache which consists of a {@link LocalDiffCache}
and
* a {@link MemoryDiffCache}.
*/
-class TieredDiffCache implements DiffCache {
+class TieredDiffCache extends DiffCache {
private final DiffCache localCache;
private final DiffCache memoryCache;
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
Wed Dec 2 22:21:13 2015
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.cache.C
/**
* A diff cache implementation, which immediately forgets the diff.
*/
-class AmnesiaDiffCache implements DiffCache {
+class AmnesiaDiffCache extends DiffCache {
static final DiffCache INSTANCE = new AmnesiaDiffCache();
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java?rev=1717690&r1=1717689&r2=1717690&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
Wed Dec 2 22:21:13 2015
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -34,7 +35,9 @@ import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -65,6 +68,46 @@ public class JournalEntryTest {
sort.close();
}
+ //OAK-3494
+ @Test
+ public void useParentDiff() throws Exception {
+ DiffCache cache = new MemoryDiffCache(new DocumentMK.Builder());
+ Revision from = new Revision(1, 0, 1);
+ Revision to = new Revision(2, 0, 1);
+ Revision unjournalled = new Revision(3, 0, 1);
+
+ //Put one entry for (from, to, "/a/b")->["c1", "c2"] manually
+ DiffCache.Entry entry = cache.newEntry(from, to, false);
+ entry.append("/a/b", "^\"c1\":{}^\"c2\":{}");
+ entry.done();
+
+ //NOTE: calling validateCacheUsage fills the cache with an empty diff
for the path being validated.
+ //So, we need to make sure that each validation is done on a separate
path.
+
+ //Cases that cache can answer (only c1 and c2 sub-trees are possibly
changed)
+ validateCacheUsage(cache, from, to, "/a/b/c3", true);
+ validateCacheUsage(cache, from, to, "/a/b/c4/e/f/g", true);
+
+ //Cases that cache can't answer
+ validateCacheUsage(cache, from, to, "/a/b/c1", false); //cached entry
says that c1 sub-tree is changed
+ validateCacheUsage(cache, from, to, "/a/b/c2/d", false); //cached
entry says that c2 sub-tree is changed
+ validateCacheUsage(cache, from, to, "/c", false);//there is no cache
entry for the whole hierarchy
+
+ //Fill cache using journal
+ List<String> paths = Lists.newArrayList("/content/changed",
"/content/changed1/child1");
+ StringSort sort = JournalEntry.newSorter();
+ add(sort, paths);
+ sort.sort();
+ JournalEntry.applyTo(sort, cache, from, to);
+
+ validateCacheUsage(cache, from, to, "/topUnchanged", true);
+ validateCacheUsage(cache, from, to, "/content/changed/unchangedLeaf",
true);
+ validateCacheUsage(cache, from, to, "/content/changed1/child2", true);
+
+ //check against an unjournalled revision (essentially empty cache)
+ validateCacheUsage(cache, from, unjournalled, "/unjournalledPath",
false);
+ }
+
@Test
public void fillExternalChanges() throws Exception {
DocumentStore store = new MemoryDocumentStore();
@@ -146,4 +189,24 @@ public class JournalEntryTest {
}
}
}
+
+ private void validateCacheUsage(DiffCache cache, Revision from, Revision
to, String path, boolean cacheExpected) {
+ String nonLoaderDiff = cache.getChanges(from, to, path, null);
+ final AtomicBoolean loaderCalled = new AtomicBoolean(false);
+ cache.getChanges(from, to, path, new DiffCache.Loader() {
+ @Override
+ public String call() {
+ loaderCalled.set(true);
+ return "";
+ }
+ });
+
+ if (cacheExpected) {
+ assertNotNull(nonLoaderDiff);
+ assertFalse(loaderCalled.get());
+ } else {
+ assertNull(nonLoaderDiff);
+ assertTrue(loaderCalled.get());
+ }
+ }
}
