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 re...@apache.org on 2016/02/11 19:25:00 UTC
svn commit: r1729869 - 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/cache/
oak-core/src/main/java/org/apache/jackrabbit/oak/plug...
Author: reschke
Date: Thu Feb 11 18:25:00 2016
New Revision: 1729869
URL: http://svn.apache.org/viewvc?rev=1729869&view=rev
Log:
OAK-3649: Extract node document cache from Mongo and RDB document stores (ported to 1.0)
(includes patch for OAK-3929: RevisionGC does not invalidate document cache)
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
- copied unchanged from r1718528, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/
- copied from r1718528, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
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/mongo/MongoDocumentStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 11 18:25:00 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500,1700753,1709440,1714095,1725270
-/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,1701907,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,1711654,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,1715092,1715346,1715767,1715771
,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718626,1718646,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723333,1723713,1723731,1724026,1724057,1724210,1724401,1724423,1724628,1724631,1725555,1726232,1726570,1726579,1726585-1726586,1726795,1726797,1726809,1726993,1727026,1727254,1727358,1727476,1728037,1728041,1728070,1728114,1728281,1728443,1729200
+/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,1701907,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,1711654,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,1715092,1715346,1715767,1715771
,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718528,1718626,1718646,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723333,1723713,1723731,1724026,1724057,1724210,1724401,1724423,1724628,1724631,1725555,1726232,1726570,1726579,1726585-1726586,1726795,1726797,1726809,1726812,1726993,1727026,1727254,1727358,1727476,1728037,1728041,1728070,1728114,1728281,1728443,1729200
/jackrabbit/trunk:1345480
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=1729869&r1=1729868&r2=1729869&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 Thu Feb 11 18:25:00 2016
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.cache.EmpiricalWeigher;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -43,6 +44,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopStream;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState.Children;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
@@ -890,6 +893,12 @@ public class DocumentMK implements Micro
return buildCache(CacheType.DOCUMENT, getDocumentCacheSize(), null, docStore);
}
+ public NodeDocumentCache buildNodeDocumentCache(DocumentStore docStore, NodeDocumentLocks locks) {
+ Cache<CacheValue, NodeDocument> cache = buildDocumentCache(docStore);
+ CacheStats cacheStats = new CacheStats(cache, "Document-Documents", getWeigher(), getDocumentCacheSize());
+ return new NodeDocumentCache(cache, cacheStats, locks);
+ }
+
private <K extends CacheValue, V extends CacheValue> Cache<K, V> buildCache(
CacheType cacheType,
long maxWeight,
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1729869&r1=1729868&r2=1729869&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Thu Feb 11 18:25:00 2016
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -30,9 +30,7 @@ import java.util.TreeMap;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -49,7 +47,6 @@ import com.mongodb.ReadPreference;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
-import org.apache.jackrabbit.oak.plugins.document.CachedNodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -65,17 +62,15 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.TreeNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.util.PerfLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
-import com.google.common.cache.Cache;
import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.Striped;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
import com.mongodb.DBCollection;
@@ -86,7 +81,9 @@ import com.mongodb.QueryBuilder;
import com.mongodb.WriteConcern;
import com.mongodb.WriteResult;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.in;
+import static com.google.common.base.Predicates.not;
+import static com.google.common.collect.Iterables.filter;
/**
* A document store that uses MongoDB as the backend.
@@ -116,28 +113,9 @@ public class MongoDocumentStore implemen
private final DB db;
- private final Cache<CacheValue, NodeDocument> nodesCache;
- private final CacheStats cacheStats;
+ private final NodeDocumentCache nodesCache;
- /**
- * Locks to ensure cache consistency on reads, writes and invalidation.
- */
- private final Striped<Lock> locks = Striped.lock(128);
-
- /**
- * ReadWriteLocks to synchronize cache access when child documents are
- * requested from MongoDB and put into the cache. Accessing a single
- * document in the cache will acquire a read (shared) lock for the parent
- * key in addition to the lock (from {@link #locks}) for the individual
- * document. Reading multiple sibling documents will acquire a write
- * (exclusive) lock for the parent key. See OAK-1897.
- */
- private final Striped<ReadWriteLock> parentLocks = Striped.readWriteLock(64);
-
- /**
- * Counts how many times {@link TreeLock}s were acquired.
- */
- private final AtomicLong lockAcquisitionCounter = new AtomicLong();
+ private final TreeNodeDocumentLocks nodeLocks;
private Clock clock = Clock.SIMPLE;
@@ -236,10 +214,9 @@ public class MongoDocumentStore implemen
options.put("unique", Boolean.FALSE);
this.journal.ensureIndex(index, options);
+ this.nodeLocks = new TreeNodeDocumentLocks();
+ this.nodesCache = builder.buildNodeDocumentCache(this, nodeLocks);
- nodesCache = builder.buildDocumentCache(this);
- cacheStats = new CacheStats(nodesCache, "Document-Documents", builder.getWeigher(),
- builder.getDocumentCacheSize());
LOG.info("Configuration maxReplicationLagMillis {}, " +
"maxDeltaForModTimeIdxSecs {}, disableIndexHint {}",
maxReplicationLagMillis, maxDeltaForModTimeIdxSecs, disableIndexHint);
@@ -282,7 +259,7 @@ public class MongoDocumentStore implemen
}
return result;
}
-
+
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
LOG.debug("invalidateCache: start");
@@ -295,7 +272,7 @@ public class MongoDocumentStore implemen
final List<String> ids = new ArrayList<String>(IN_CLAUSE_BATCH_SIZE);
while(it.hasNext() && ids.size() < IN_CLAUSE_BATCH_SIZE) {
final String id = it.next();
- if (getCachedNodeDoc(id) != null) {
+ if (nodesCache.getIfPresent(id) != null) {
// only add those that we actually do have cached
ids.add(id);
}
@@ -314,21 +291,22 @@ public class MongoDocumentStore implemen
DBCursor cursor = nodes.find(query.get(), fields);
cursor.setReadPreference(ReadPreference.primary());
result.queryCount++;
-
+
+ Map<String, Number> modCounts = new HashMap<String, Number>();
for (DBObject obj : cursor) {
- result.cacheEntriesProcessedCount++;
String id = (String) obj.get(Document.ID);
Number modCount = (Number) obj.get(Document.MOD_COUNT);
-
- CachedNodeDocument cachedDoc = getCachedNodeDoc(id);
- if (cachedDoc != null
- && !Objects.equal(cachedDoc.getModCount(), modCount)) {
- invalidateCache(Collection.NODES, id);
- result.invalidationCount++;
- } else {
- result.upToDateCount++;
- }
+ modCounts.put(id, modCount);
}
+
+ int invalidated = nodesCache.invalidateOutdated(modCounts);
+ for (String id : filter(ids, not(in(modCounts.keySet())))) {
+ nodesCache.invalidate(id);
+ invalidated++;
+ }
+ result.cacheEntriesProcessedCount += ids.size();
+ result.invalidationCount += invalidated;
+ result.upToDateCount += ids.size() - invalidated;
}
result.cacheSize = size;
@@ -339,22 +317,10 @@ public class MongoDocumentStore implemen
@Override
public <T extends Document> void invalidateCache(Collection<T> collection, String key) {
if (collection == Collection.NODES) {
- TreeLock lock = acquire(key);
- try {
- nodesCache.invalidate(new StringValue(key));
- } finally {
- lock.unlock();
- }
- }
- }
-
- public <T extends Document> void invalidateCache(Collection<T> collection, List<String> keys) {
- for(String key : keys){
- invalidateCache(collection, key);
+ nodesCache.invalidate(key);
}
}
-
@Override
public <T extends Document> T find(Collection<T> collection, String key) {
final long start = PERFLOG.start();
@@ -381,11 +347,10 @@ public class MongoDocumentStore implemen
if (collection != Collection.NODES) {
return findUncached(collection, key, DocumentReadPreference.PRIMARY);
}
- CacheValue cacheKey = new StringValue(key);
NodeDocument doc;
if (maxCacheAge > 0 || preferCached) {
// first try without lock
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(key);
if (doc != null) {
if (preferCached ||
getTime() - doc.getCreated() < maxCacheAge) {
@@ -398,12 +363,12 @@ public class MongoDocumentStore implemen
}
Throwable t;
try {
- TreeLock lock = acquire(key);
+ Lock lock = nodeLocks.acquire(key);
try {
if (maxCacheAge > 0 || preferCached) {
// try again some other thread may have populated
// the cache by now
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(key);
if (doc != null) {
if (preferCached ||
getTime() - doc.getCreated() < maxCacheAge) {
@@ -418,7 +383,7 @@ public class MongoDocumentStore implemen
collection, key,
getReadPreference(maxCacheAge));
invalidateCache(collection, key);
- doc = nodesCache.get(cacheKey, new Callable<NodeDocument>() {
+ doc = nodesCache.get(key, new Callable<NodeDocument>() {
@Override
public NodeDocument call() throws Exception {
return d == null ? NodeDocument.NULL : d;
@@ -559,7 +524,7 @@ public class MongoDocumentStore implemen
String parentId = Utils.getParentIdFromLowerLimit(fromKey);
long lockTime = -1;
final long start = PERFLOG.start();
- TreeLock lock = withLock ? acquireExclusive(parentId != null ? parentId : "") : null;
+ Lock lock = withLock ? nodeLocks.acquireExclusive(parentId != null ? parentId : "") : null;
try {
if (start != -1) {
lockTime = System.currentTimeMillis() - start;
@@ -590,26 +555,7 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES
&& doc != null
&& lock != null) {
- doc.seal();
- String id = doc.getId();
- CacheValue cacheKey = new StringValue(id);
- // do not overwrite document in cache if the
- // existing one in the cache is newer
- NodeDocument cached = nodesCache.getIfPresent(cacheKey);
- if (cached != null && cached != NodeDocument.NULL) {
- // check mod count
- Number cachedModCount = cached.getModCount();
- Number modCount = doc.getModCount();
- if (cachedModCount == null || modCount == null) {
- throw new IllegalStateException(
- "Missing " + Document.MOD_COUNT);
- }
- if (modCount.longValue() > cachedModCount.longValue()) {
- nodesCache.put(cacheKey, (NodeDocument) doc);
- }
- } else {
- nodesCache.put(cacheKey, (NodeDocument) doc);
- }
+ nodesCache.putIfNewer((NodeDocument) doc);
}
list.add(doc);
}
@@ -660,7 +606,11 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e, "Remove failed for " + keyBatch);
} finally {
- invalidateCache(collection, keyBatch);
+ if (collection == Collection.NODES) {
+ for (String key : keyBatch) {
+ invalidateCache(collection, key);
+ }
+ }
}
}
} finally {
@@ -693,7 +643,9 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e, "Remove failed for " + batch);
} finally {
- invalidateCache(collection, Lists.newArrayList(batchIds));
+ if (collection == Collection.NODES) {
+ invalidateCache(batchIds);
+ }
}
batchIds.clear();
batch.clear();
@@ -705,6 +657,7 @@ public class MongoDocumentStore implemen
return num;
}
+ @SuppressWarnings("unchecked")
@CheckForNull
private <T extends Document> T findAndModify(Collection<T> collection,
UpdateOp updateOp,
@@ -715,16 +668,17 @@ public class MongoDocumentStore implemen
updateOp = updateOp.copy();
DBObject update = createUpdate(updateOp);
- TreeLock lock = acquire(updateOp.getId());
+ Lock lock = null;
+ if (collection == Collection.NODES) {
+ lock = nodeLocks.acquire(updateOp.getId());
+ }
final long start = PERFLOG.start();
try {
// get modCount of cached document
Number modCount = null;
T cachedDoc = null;
if (collection == Collection.NODES) {
- @SuppressWarnings("unchecked")
- T doc = (T) nodesCache.getIfPresent(new StringValue(updateOp.getId()));
- cachedDoc = doc;
+ cachedDoc = (T) nodesCache.getIfPresent(updateOp.getId());
if (cachedDoc != null) {
modCount = cachedDoc.getModCount();
}
@@ -741,7 +695,10 @@ public class MongoDocumentStore implemen
WriteResult result = dbCollection.update(query.get(), update);
if (result.getN() > 0) {
// success, update cached document
- putToCache(collection, cachedDoc, updateOp);
+ if (collection == Collection.NODES) {
+ NodeDocument newDoc = (NodeDocument) applyChanges(collection, cachedDoc, updateOp);
+ nodesCache.put(newDoc);
+ }
// return previously cached document
return cachedDoc;
}
@@ -756,13 +713,16 @@ public class MongoDocumentStore implemen
}
T oldDoc = convertFromDBObject(collection, oldNode);
if (oldDoc != null) {
- putToCache(collection, oldDoc, updateOp);
+ if (collection == Collection.NODES) {
+ NodeDocument newDoc = (NodeDocument) applyChanges(collection, oldDoc, updateOp);
+ nodesCache.put(newDoc);
+ }
oldDoc.seal();
} else if (upsert) {
if (collection == Collection.NODES) {
NodeDocument doc = (NodeDocument) collection.newDocument(this);
UpdateUtils.applyChanges(doc, updateOp);
- addToCache(doc);
+ nodesCache.putIfAbsent(doc);
}
} else {
// updateOp without conditions and not an upsert
@@ -772,7 +732,9 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e);
} finally {
- lock.unlock();
+ if (lock != null) {
+ lock.unlock();
+ }
PERFLOG.end(start, 1, "findAndModify [{}]", updateOp.getId());
}
}
@@ -862,12 +824,7 @@ public class MongoDocumentStore implemen
}
if (collection == Collection.NODES) {
for (T doc : docs) {
- TreeLock lock = acquire(doc.getId());
- try {
- addToCache((NodeDocument) doc);
- } finally {
- lock.unlock();
- }
+ nodesCache.putIfAbsent((NodeDocument) doc);
}
}
return true;
@@ -896,7 +853,7 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES) {
cachedDocs = Maps.newHashMap();
for (String key : keys) {
- cachedDocs.put(key, nodesCache.getIfPresent(new StringValue(key)));
+ cachedDocs.put(key, nodesCache.getIfPresent(key));
}
}
try {
@@ -907,14 +864,16 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES) {
// update cache
for (Entry<String, NodeDocument> entry : cachedDocs.entrySet()) {
- TreeLock lock = acquire(entry.getKey());
+ // the cachedDocs is not empty, so the collection = NODES
+ Lock lock = nodeLocks.acquire(entry.getKey());
try {
- if (entry.getValue() == null
- || entry.getValue() == NodeDocument.NULL) {
- // make sure concurrently loaded document is invalidated
- nodesCache.invalidate(new StringValue(entry.getKey()));
+ if (entry.getValue() == null || entry.getValue() == NodeDocument.NULL) {
+ // make sure concurrently loaded document is
+ // invalidated
+ nodesCache.invalidate(entry.getKey());
} else {
- updateCache(Collection.NODES, entry.getValue(), updateOp.shallowCopy(entry.getKey()));
+ NodeDocument newDoc = applyChanges(Collection.NODES, entry.getValue(), updateOp.shallowCopy(entry.getKey()));
+ nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
}
} finally {
lock.unlock();
@@ -964,7 +923,7 @@ public class MongoDocumentStore implemen
ReadPreference readPreference = ReadPreference.primaryPreferred();
if (parentId != null) {
long replicationSafeLimit = getTime() - maxReplicationLagMillis;
- NodeDocument cachedDoc = (NodeDocument) getIfCached(collection, parentId);
+ NodeDocument cachedDoc = nodesCache.getIfPresent(parentId);
if (cachedDoc != null && !cachedDoc.hasBeenModifiedSince(replicationSafeLimit)) {
//If parent has been modified loooong time back then there children
@@ -1044,20 +1003,16 @@ public class MongoDocumentStore implemen
@Override
public void dispose() {
nodes.getDB().getMongo().close();
-
- if (nodesCache instanceof Closeable) {
- try {
- ((Closeable) nodesCache).close();
- } catch (IOException e) {
-
- LOG.warn("Error occurred while closing Off Heap Cache", e);
- }
+ try {
+ nodesCache.close();
+ } catch (IOException e) {
+ LOG.warn("Error occurred while closing Off Heap Cache", e);
}
}
@Override
public CacheStats getCacheStats() {
- return cacheStats;
+ return nodesCache.getCacheStats();
}
@Override
@@ -1073,18 +1028,6 @@ public class MongoDocumentStore implemen
return disableIndexHint;
}
- Iterable<? extends Map.Entry<CacheValue, ? extends CachedNodeDocument>> getCacheEntries() {
- return nodesCache.asMap().entrySet();
- }
-
- CachedNodeDocument getCachedNodeDoc(String id) {
- return nodesCache.getIfPresent(new StringValue(id));
- }
-
- protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
- return nodesCache;
- }
-
private static void log(String message, Object... args) {
if (LOG.isDebugEnabled()) {
String argList = Arrays.toString(args);
@@ -1101,127 +1044,13 @@ public class MongoDocumentStore implemen
return null;
}
@SuppressWarnings("unchecked")
- T doc = (T) nodesCache.getIfPresent(new StringValue(key));
+ T doc = (T) nodesCache.getIfPresent(key);
if (doc == NodeDocument.NULL) {
doc = null;
}
return doc;
}
- /**
- * Applies an update to the nodes cache. This method does not acquire
- * a lock for the document. The caller must ensure it holds a lock for
- * the updated document. See striped {@link #locks}.
- *
- * @param <T> the document type.
- * @param collection the document collection.
- * @param oldDoc the old document.
- * @param updateOp the update operation.
- */
- private <T extends Document> void updateCache(@Nonnull Collection<T> collection,
- @Nonnull T oldDoc,
- @Nonnull UpdateOp updateOp) {
- // cache the new document
- if (collection == Collection.NODES) {
- checkNotNull(oldDoc);
- checkNotNull(updateOp);
- // we can only update the cache based on the oldDoc if we
- // still have the oldDoc in the cache, otherwise we may
- // update the cache with an outdated document
- CacheValue key = new StringValue(updateOp.getId());
- NodeDocument cached = nodesCache.getIfPresent(key);
- if (cached == null) {
- // cannot use oldDoc to update cache
- return;
- }
-
- // check if the currently cached document matches oldDoc
- if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
- NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
- oldDoc.deepCopy(newDoc);
-
- UpdateUtils.applyChanges(newDoc, updateOp);
- newDoc.seal();
-
- nodesCache.put(key, newDoc);
- } else {
- // the cache entry was modified by some other thread in
- // the meantime. the updated cache entry may or may not
- // include this update. we cannot just apply our update
- // on top of the cached entry.
- // therefore we must invalidate the cache entry
- nodesCache.invalidate(key);
- }
- }
- }
-
- /**
- * Adds a document to the {@link #nodesCache} iff there is no document
- * in the cache with the document key. This method does not acquire a lock
- * from {@link #locks}! The caller must ensure a lock is held for the
- * given document.
- *
- * @param doc the document to add to the cache.
- * @return either the given <code>doc</code> or the document already present
- * in the cache.
- */
- @Nonnull
- private NodeDocument addToCache(@Nonnull final NodeDocument doc) {
- if (doc == NodeDocument.NULL) {
- throw new IllegalArgumentException("doc must not be NULL document");
- }
- doc.seal();
- // make sure we only cache the document if it wasn't
- // changed and cached by some other thread in the
- // meantime. That is, use get() with a Callable,
- // which is only used when the document isn't there
- try {
- CacheValue key = new StringValue(doc.getId());
- for (;;) {
- NodeDocument cached = nodesCache.get(key,
- new Callable<NodeDocument>() {
- @Override
- public NodeDocument call() {
- return doc;
- }
- });
- if (cached != NodeDocument.NULL) {
- return cached;
- } else {
- nodesCache.invalidate(key);
- }
- }
- } catch (ExecutionException e) {
- // will never happen because call() just returns
- // the already available doc
- throw new IllegalStateException(e);
- }
- }
-
- /**
- * Unconditionally puts a document into the cache if {@code collection} is
- * {@link Collection#NODES}. The document put into the cache is
- * {@code oldDoc} with the {@code updateOp} applied. This method does not
- * acquire a lock from {@link #locks}! The caller must ensure a lock is held
- * for the given document.
- *
- * @param collection the collection where oldDoc belongs to.
- * @param oldDoc how the document looked before the update.
- * @param updateOp the update just applied to the document.
- */
- private <T extends Document> void putToCache(@Nonnull Collection<T> collection,
- @Nonnull T oldDoc,
- @Nonnull UpdateOp updateOp) {
- if (collection == Collection.NODES) {
- CacheValue key = new StringValue(oldDoc.getId());
- NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
- oldDoc.deepCopy(newDoc);
- UpdateUtils.applyChanges(newDoc, updateOp);
- newDoc.seal();
- nodesCache.put(key, newDoc);
- }
- }
-
@Nonnull
private static QueryBuilder createQueryForUpdate(String key,
Map<Key, Condition> conditions) {
@@ -1308,44 +1137,13 @@ public class MongoDocumentStore implemen
return update;
}
- /**
- * Returns the parent id for the given id. An empty String is returned if
- * the given value is the id of the root document or the id for a long path.
- *
- * @param id an id for a document.
- * @return the id of the parent document or the empty String.
- */
@Nonnull
- private static String getParentId(@Nonnull String id) {
- String parentId = Utils.getParentId(checkNotNull(id));
- if (parentId == null) {
- parentId = "";
- }
- return parentId;
- }
-
- /**
- * Acquires a log for the given key. The returned tree lock will also hold
- * a shared lock on the parent key.
- *
- * @param key a key.
- * @return the acquired lock for the given key.
- */
- private TreeLock acquire(String key) {
- lockAcquisitionCounter.incrementAndGet();
- return TreeLock.shared(parentLocks.get(getParentId(key)), locks.get(key));
- }
-
- /**
- * Acquires an exclusive lock on the given parent key. Use this method to
- * block cache access for child keys of the given parent key.
- *
- * @param parentKey the parent key.
- * @return the acquired lock for the given parent key.
- */
- private TreeLock acquireExclusive(String parentKey) {
- lockAcquisitionCounter.incrementAndGet();
- return TreeLock.exclusive(parentLocks.get(parentKey));
+ private <T extends Document> T applyChanges(Collection<T> collection, T oldDoc, UpdateOp update) {
+ T doc = collection.newDocument(this);
+ oldDoc.deepCopy(doc);
+ UpdateUtils.applyChanges(doc, update);
+ doc.seal();
+ return doc;
}
@Override
@@ -1389,42 +1187,16 @@ public class MongoDocumentStore implemen
this.maxLockedQueryTimeMS = maxLockedQueryTimeMS;
}
- long getLockAcquisitionCount() {
- return lockAcquisitionCounter.get();
+ void resetLockAcquisitionCount() {
+ nodeLocks.resetLockAcquisitionCount();
}
- private final static class TreeLock {
-
- private final Lock parentLock;
- private final Lock lock;
-
- private TreeLock(Lock parentLock, Lock lock) {
- this.parentLock = parentLock;
- this.lock = lock;
- }
-
- static TreeLock shared(ReadWriteLock parentLock, Lock lock) {
- return new TreeLock(parentLock.readLock(), lock).lock();
- }
-
- static TreeLock exclusive(ReadWriteLock parentLock) {
- return new TreeLock(parentLock.writeLock(), null).lock();
- }
-
- private TreeLock lock() {
- parentLock.lock();
- if (lock != null) {
- lock.lock();
- }
- return this;
- }
+ long getLockAcquisitionCount() {
+ return nodeLocks.getLockAcquisitionCount();
+ }
- private void unlock() {
- if (lock != null) {
- lock.unlock();
- }
- parentLock.unlock();
- }
+ NodeDocumentCache getNodeDocumentCache() {
+ return nodesCache;
}
@Override
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1729869&r1=1729868&r2=1729869&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Feb 11 18:25:00 2016
@@ -58,7 +58,6 @@ import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.cache.CacheStats;
-import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -71,21 +70,20 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
+import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.util.OakVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
-import com.google.common.cache.Cache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.hash.BloomFilter;
import com.google.common.hash.Funnel;
import com.google.common.hash.PrimitiveSink;
-import com.google.common.util.concurrent.Striped;
/**
* Implementation of {@link DocumentStore} for relational databases.
@@ -302,7 +300,7 @@ public class RDBDocumentStore implements
}
return null;
}
-
+
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
//TODO: optimize me
@@ -314,22 +312,6 @@ public class RDBDocumentStore implements
invalidateCache(collection, id, false);
}
- @Override
- public long determineServerTimeDifferenceMillis() {
- Connection connection = null;
- try {
- connection = this.ch.getROConnection();
- long result = this.db.determineServerTimeDifferenceMillis(connection);
- connection.commit();
- return result;
- } catch (SQLException ex) {
- LOG.error("Trying to determine time difference to server", ex);
- throw new DocumentStoreException(ex);
- } finally {
- this.ch.closeConnection(connection);
- }
- }
-
private <T extends Document> void invalidateCache(Collection<T> collection, String id, boolean remove) {
if (collection == Collection.NODES) {
invalidateNodesCache(id, remove);
@@ -337,13 +319,12 @@ public class RDBDocumentStore implements
}
private void invalidateNodesCache(String id, boolean remove) {
- StringValue key = new StringValue(id);
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
if (remove) {
- nodesCache.invalidate(key);
+ nodesCache.invalidate(id);
} else {
- NodeDocument entry = nodesCache.getIfPresent(key);
+ NodeDocument entry = nodesCache.getIfPresent(id);
if (entry != null) {
entry.markUpToDate(0);
}
@@ -353,6 +334,22 @@ public class RDBDocumentStore implements
}
}
+ @Override
+ public long determineServerTimeDifferenceMillis() {
+ Connection connection = null;
+ try {
+ connection = this.ch.getROConnection();
+ long result = this.db.determineServerTimeDifferenceMillis(connection);
+ connection.commit();
+ return result;
+ } catch (SQLException ex) {
+ LOG.error("Trying to determine time difference to server", ex);
+ throw new DocumentStoreException(ex);
+ } finally {
+ this.ch.closeConnection(connection);
+ }
+ }
+
// used for diagnostics
private String droppedTables = "";
@@ -459,14 +456,14 @@ public class RDBDocumentStore implements
if (collection != Collection.NODES) {
return null;
} else {
- NodeDocument doc = unwrap(nodesCache.getIfPresent(new StringValue(id)));
+ NodeDocument doc = unwrap(nodesCache.getIfPresent(id));
return castAsT(doc);
}
}
@Override
public CacheStats getCacheStats() {
- return this.cacheStats;
+ return nodesCache.getCacheStats();
}
@Override
@@ -548,8 +545,8 @@ public class RDBDocumentStore implements
this.ch = new RDBConnectionHandler(ds);
this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of RDBDocumentStore creation") : null;
- this.nodesCache = builder.buildDocumentCache(this);
- this.cacheStats = new CacheStats(nodesCache, "Document-Documents", builder.getWeigher(), builder.getDocumentCacheSize());
+ this.locks = new StripedNodeDocumentLocks();
+ this.nodesCache = builder.buildNodeDocumentCache(this, locks);
Connection con = this.ch.getRWConnection();
@@ -872,11 +869,10 @@ public class RDBDocumentStore implements
if (collection != Collection.NODES) {
return readDocumentUncached(collection, id, null);
} else {
- CacheValue cacheKey = new StringValue(id);
NodeDocument doc = null;
if (maxCacheAge > 0) {
// first try without lock
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(id);
if (doc != null) {
long lastCheckTime = doc.getLastCheckTime();
if (lastCheckTime != 0) {
@@ -887,7 +883,7 @@ public class RDBDocumentStore implements
}
}
try {
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
// caller really wants the cache to be cleared
if (maxCacheAge == 0) {
@@ -895,7 +891,7 @@ public class RDBDocumentStore implements
doc = null;
}
final NodeDocument cachedDoc = doc;
- doc = nodesCache.get(cacheKey, new Callable<NodeDocument>() {
+ doc = nodesCache.get(id, new Callable<NodeDocument>() {
@Override
public NodeDocument call() throws Exception {
NodeDocument doc = (NodeDocument) readDocumentUncached(collection, id, cachedDoc);
@@ -919,7 +915,7 @@ public class RDBDocumentStore implements
ndoc.seal();
}
doc = wrap(ndoc);
- nodesCache.put(cacheKey, doc);
+ nodesCache.put(doc);
}
} finally {
lock.unlock();
@@ -951,9 +947,9 @@ public class RDBDocumentStore implements
docs.add(doc);
}
boolean done = insertDocuments(collection, docs);
- if (done) {
+ if (done && collection == Collection.NODES) {
for (T doc : docs) {
- addToCache(collection, doc);
+ nodesCache.putIfAbsent((NodeDocument) doc);
}
}
else {
@@ -987,7 +983,9 @@ public class RDBDocumentStore implements
if (!insertDocuments(collection, Collections.singletonList(doc))) {
throw new DocumentStoreException("Can't insert the document: " + doc.getId());
}
- addToCache(collection, doc);
+ if (collection == Collection.NODES) {
+ nodesCache.putIfAbsent((NodeDocument) doc);
+ }
return oldDoc;
} catch (DocumentStoreException ex) {
// may have failed due to a race condition; try update instead
@@ -1019,7 +1017,7 @@ public class RDBDocumentStore implements
maintainUpdateStats(collection, update.getId());
addUpdateCounters(update);
T doc = createNewDocument(collection, oldDoc, update);
- Lock l = getAndLock(update.getId());
+ Lock l = locks.acquire(update.getId());
try {
boolean success = false;
@@ -1053,7 +1051,9 @@ public class RDBDocumentStore implements
doc = createNewDocument(collection, oldDoc, update);
}
} else {
- updateCache(collection, oldDoc, doc);
+ if (collection == Collection.NODES) {
+ nodesCache.replaceCachedDocument((NodeDocument) oldDoc, (NodeDocument) doc);
+ }
}
}
@@ -1107,7 +1107,7 @@ public class RDBDocumentStore implements
if (collection == Collection.NODES) {
cachedDocs = new HashMap<String, NodeDocument>();
for (String key : chunkedIds) {
- cachedDocs.put(key, nodesCache.getIfPresent(new StringValue(key)));
+ cachedDocs.put(key, nodesCache.getIfPresent(key));
}
}
@@ -1135,16 +1135,16 @@ public class RDBDocumentStore implements
for (Entry<String, NodeDocument> entry : cachedDocs.entrySet()) {
T oldDoc = castAsT(entry.getValue());
String id = entry.getKey();
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
if (oldDoc == null) {
// make sure concurrently loaded document is
// invalidated
- nodesCache.invalidate(new StringValue(id));
+ nodesCache.invalidate(id);
} else {
addUpdateCounters(update);
T newDoc = createNewDocument(collection, oldDoc, update);
- updateCache(collection, oldDoc, newDoc);
+ nodesCache.replaceCachedDocument((NodeDocument) oldDoc, (NodeDocument) newDoc);
}
} finally {
lock.unlock();
@@ -1584,16 +1584,9 @@ public class RDBDocumentStore implements
return (T) doc;
}
- // Memory Cache
- private Cache<CacheValue, NodeDocument> nodesCache;
- private CacheStats cacheStats;
- private final Striped<Lock> locks = Striped.lock(64);
-
- private Lock getAndLock(String key) {
- Lock l = locks.get(key);
- l.lock();
- return l;
- }
+ private NodeDocumentCache nodesCache;
+
+ private NodeDocumentLocks locks;
@CheckForNull
private static NodeDocument unwrap(@Nonnull NodeDocument doc) {
@@ -1619,100 +1612,6 @@ public class RDBDocumentStore implements
return n != null ? n.longValue() : -1;
}
- private <T extends Document> void addToCache(Collection<T> collection, T doc) {
- if (collection == Collection.NODES) {
- Lock lock = getAndLock(idOf(doc));
- try {
- addToCache((NodeDocument) doc);
- } finally {
- lock.unlock();
- }
- }
- }
-
- /**
- * Applies an update to the nodes cache. This method does not acquire
- * a lock for the document. The caller must ensure it holds a lock for
- * the updated document. See striped {@link #locks}.
- *
- * @param <T> the document type.
- * @param collection the document collection.
- * @param oldDoc the old document.
- * @param updateOp the update operation.
- */
- private <T extends Document> void updateCache(@Nonnull Collection<T> collection,
- @Nonnull T oldDoc,
- @Nonnull T newDoc) {
- // cache the new document
- if (collection == Collection.NODES) {
- checkNotNull(oldDoc);
- checkNotNull(newDoc);
- // we can only update the cache based on the oldDoc if we
- // still have the oldDoc in the cache, otherwise we may
- // update the cache with an outdated document
- CacheValue key = new StringValue(idOf(newDoc));
- NodeDocument cached = nodesCache.getIfPresent(key);
- if (cached == null) {
- // cannot use oldDoc to update cache
- return;
- }
-
- // check if the currently cached document matches oldDoc
- if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
- nodesCache.put(key, (NodeDocument)newDoc);
- } else {
- // the cache entry was modified by some other thread in
- // the meantime. the updated cache entry may or may not
- // include this update. we cannot just apply our update
- // on top of the cached entry.
- // therefore we must invalidate the cache entry
- nodesCache.invalidate(key);
- }
- }
- }
-
- /**
- * Adds a document to the {@link #nodesCache} iff there is no document
- * in the cache with the document key. This method does not acquire a lock
- * from {@link #locks}! The caller must ensure a lock is held for the
- * given document.
- *
- * @param doc the document to add to the cache.
- * @return either the given <code>doc</code> or the document already present
- * in the cache.
- */
- @Nonnull
- private NodeDocument addToCache(@Nonnull final NodeDocument doc) {
- if (doc == NodeDocument.NULL) {
- throw new IllegalArgumentException("doc must not be NULL document");
- }
- doc.seal();
- // make sure we only cache the document if it wasn't
- // changed and cached by some other thread in the
- // meantime. That is, use get() with a Callable,
- // which is only used when the document isn't there
- try {
- CacheValue key = new StringValue(idOf(doc));
- for (;;) {
- NodeDocument cached = nodesCache.get(key, new Callable<NodeDocument>() {
- @Override
- public NodeDocument call() {
- return doc;
- }
- });
- if (cached != NodeDocument.NULL) {
- return cached;
- } else {
- nodesCache.invalidate(key);
- }
- }
- } catch (ExecutionException e) {
- // will never happen because call() just returns
- // the already available doc
- throw new IllegalStateException(e);
- }
- }
-
@Nonnull
protected <T extends Document> T convertFromDBObject(@Nonnull Collection<T> collection, @Nonnull RDBRow row) {
// this method is present here in order to facilitate unit testing for OAK-3566
@@ -1727,8 +1626,7 @@ public class RDBDocumentStore implements
}
String id = row.getId();
- CacheValue cacheKey = new StringValue(id);
- NodeDocument inCache = nodesCache.getIfPresent(cacheKey);
+ NodeDocument inCache = nodesCache.getIfPresent(id);
Number modCount = row.getModcount();
// do not overwrite document in cache if the
@@ -1753,26 +1651,7 @@ public class RDBDocumentStore implements
return castAsT(fresh);
}
- Lock lock = getAndLock(id);
- try {
- inCache = nodesCache.getIfPresent(cacheKey);
- if (inCache != null && inCache != NodeDocument.NULL) {
- // check mod count
- Number cachedModCount = inCache.getModCount();
- if (cachedModCount == null) {
- throw new IllegalStateException("Missing " + Document.MOD_COUNT);
- }
- if (modCount.longValue() > cachedModCount.longValue()) {
- nodesCache.put(cacheKey, fresh);
- } else {
- fresh = inCache;
- }
- } else {
- nodesCache.put(cacheKey, fresh);
- }
- } finally {
- lock.unlock();
- }
+ nodesCache.putIfNewer(fresh);
return castAsT(fresh);
}
@@ -1821,7 +1700,7 @@ public class RDBDocumentStore implements
}
}
- protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
+ protected NodeDocumentCache getNodeDocumentCache() {
return nodesCache;
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java?rev=1729869&r1=1729868&r2=1729869&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java Thu Feb 11 18:25:00 2016
@@ -20,17 +20,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import com.google.common.cache.Cache;
import com.google.common.collect.Lists;
import com.mongodb.DB;
-import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Before;
import org.junit.Test;
@@ -145,18 +143,17 @@ public class CacheConsistencyIT extends
}, "reader");
t3.start();
- Cache<CacheValue, NodeDocument> cache = store.getNodeDocumentCache();
+ NodeDocumentCache cache = store.getNodeDocumentCache();
// run for at most five seconds
long end = System.currentTimeMillis() + 1000;
String id = Utils.getIdFromPath("/test/foo");
- CacheValue key = new StringValue(id);
while (t1.isAlive() && t2.isAlive() && t3.isAlive()
&& System.currentTimeMillis() < end) {
- if (cache.getIfPresent(key) != null) {
+ if (cache.getIfPresent(id) != null) {
Thread.sleep(0, (int) (Math.random() * 100));
// simulate eviction
- cache.invalidate(key);
+ cache.invalidate(id);
}
}
for (Throwable e : exceptions) {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1729869&r1=1729868&r2=1729869&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java Thu Feb 11 18:25:00 2016
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import com.google.common.collect.Iterables;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
@@ -47,14 +45,12 @@ public class CacheInvalidationIT extends
private DocumentNodeStore c1;
private DocumentNodeStore c2;
private int initialCacheSizeC1;
- private int initialCacheSizeC2;
@Before
public void prepareStores() throws Exception {
c1 = createNS(1);
c2 = createNS(2);
initialCacheSizeC1 = getCurrentCacheSize(c1);
- initialCacheSizeC2 = getCurrentCacheSize(c2);
}
private int createScenario() throws CommitFailedException {
@@ -75,7 +71,6 @@ public class CacheInvalidationIT extends
"/a/d",
"/a/d/h",
};
- final int totalPaths = paths.length + 1; // 1 extra for root
NodeBuilder root = getRoot(c1).builder();
createTree(root, paths);
c1.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);
@@ -103,11 +98,9 @@ public class CacheInvalidationIT extends
//Only 2 entries /a and /a/d would be invalidated
// '/' would have been added to cache in start of backgroundRead
//itself
- assertEquals(initialCacheSizeC1+ totalPaths - 2, Iterables.size(ds(c1).getCacheEntries()));
+ assertEquals(initialCacheSizeC1 + totalPaths - 2, ds(c1).getNodeDocumentCache().asMap().size());
}
-
-
@Test
public void testCacheInvalidationHierarchicalNotExist()
throws CommitFailedException {
@@ -146,7 +139,7 @@ public class CacheInvalidationIT extends
}
private int getCurrentCacheSize(DocumentNodeStore ds){
- return Iterables.size(ds(ds).getCacheEntries());
+ return ds(ds).getNodeDocumentCache().asMap().size();
}
private static void refreshHead(DocumentNodeStore store) {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java?rev=1729869&r1=1729868&r2=1729869&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java Thu Feb 11 18:25:00 2016
@@ -67,12 +67,12 @@ public class MongoDocumentStoreTest exte
}
mk.commit("/", sb.toString(), null, null);
store.queriesWithoutLock.set(0);
- long lockCount = store.getLockAcquisitionCount();
+ store.resetLockAcquisitionCount();
List<NodeDocument> docs = store.query(Collection.NODES, fromId, toId,
"foo", System.currentTimeMillis(), Integer.MAX_VALUE);
assertTrue(docs.isEmpty());
if (store.queriesWithoutLock.get() > 0) {
- assertEquals(lockCount + 1, store.getLockAcquisitionCount());
+ assertEquals(1, store.getLockAcquisitionCount());
return;
}
}