Author: mreutegg
Date: Thu Nov 23 08:25:33 2017
New Revision: 1816107
URL: http://svn.apache.org/viewvc?rev=1816107&view=rev
Log:
OAK-4518: ConcurrentAddReferenceTest fails occasionally
Merged revisions 1750656,1753481 from trunk
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
- copied, changed from r1750656,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 23 08:25:33 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512,1790375,1803776,1805392,1805400,1805402,1811553
-/jackrabbit/oak/trunk:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376
,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693
401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1
705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,1717462,171763
2,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732170,173
2268,1732278,1732330,1732418,1732435,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332,1753355,1753444,
1754117,1754239,1755366,1756520,1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760677,1760701,1760709,1760946,1761444,1761571,1761762,1761787,1761866,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1767502,1768446,1768637,1769939-1769940,1770694,1771739,1774141,1774256,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283,1787074,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795613,1795618,1796144,1798035,1798834,1799924,1801011,1801013,1807308,1808125,1808240,1808246,1809024,1809026,1809163,1811655,1814189
+/jackrabbit/oak/trunk:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376
,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693
401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1
705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,1717462,171763
2,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732170,173
2268,1732278,1732330,1732418,1732435,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332,1753355,
1753444,1753481,1754117,1754239,1755366,1756520,1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760677,1760701,1760709,1760946,1761444,1761571,1761762,1761787,1761866,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1767502,1768446,1768637,1769939-1769940,1770694,1771739,1774141,1774256,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283,1787074,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795613,1795618,1796144,1798035,1798834,1799924,1801011,1801013,1807308,1808125,1808240,1808246,1809024,1809026,1809163,1811655,1814189
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.2/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 23 08:25:33 2017
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/branches/1.4/oak-core:1745750,1747354,1750078,1750512,1790375,1803776,1805392,1805400,1805402
-/jackrabbit/oak/trunk/oak-core:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,168418
6,1684376,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,169
3209,1693401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,
1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,17174
62,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,17
32170,1732268,1732278,1732330,1732418,1732435,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332,1753355
,1753444,1754117,1754239,1755366,1756520,1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760677,1760701,1760709,1760946,1761444,1761571,1761762,1761787,1761866,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1767502,1768446,1768637,1769939-1769940,1770694,1771739,1774141,1774256,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283,1787074,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795613,1795618,1796144,1798035,1798834,1799924,1801011,1801013,1807308,1808125,1808240,1808246,1809024,1809026,1809163
+/jackrabbit/oak/trunk/oak-core:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,168418
6,1684376,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,169
3209,1693401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,
1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,17174
62,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,17
32170,1732268,1732278,1732330,1732418,1732435,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332
,1753355,1753444,1753481,1754117,1754239,1755366,1756520,1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760677,1760701,1760709,1760946,1761444,1761571,1761762,1761787,1761866,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1767502,1768446,1768637,1769939-1769940,1770694,1771739,1774141,1774256,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283,1787074,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795613,1795618,1796144,1798035,1798834,1799924,1801011,1801013,1807308,1808125,1808240,1808246,1809024,1809026,1809163
/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Thu Nov 23 08:25:33 2017
@@ -532,7 +532,6 @@ public class DocumentMK implements Micro
private int nodeCachePercentage = DEFAULT_NODE_CACHE_PERCENTAGE;
private int childrenCachePercentage =
DEFAULT_CHILDREN_CACHE_PERCENTAGE;
private int diffCachePercentage = DEFAULT_DIFF_CACHE_PERCENTAGE;
- private int docChildrenCachePercentage =
DEFAULT_DOC_CHILDREN_CACHE_PERCENTAGE;
private int cacheSegmentCount = DEFAULT_CACHE_SEGMENT_COUNT;
private int cacheStackMoveDistance = DEFAULT_CACHE_STACK_MOVE_DISTANCE;
private boolean useSimpleRevision;
@@ -768,21 +767,31 @@ public class DocumentMK implements Micro
public Builder memoryCacheDistribution(int nodeCachePercentage,
int childrenCachePercentage,
- int docChildrenCachePercentage,
int diffCachePercentage) {
checkArgument(nodeCachePercentage >= 0);
checkArgument(childrenCachePercentage>= 0);
- checkArgument(docChildrenCachePercentage >= 0);
checkArgument(diffCachePercentage >= 0);
checkArgument(nodeCachePercentage + childrenCachePercentage +
- docChildrenCachePercentage + diffCachePercentage < 100);
+ diffCachePercentage < 100);
this.nodeCachePercentage = nodeCachePercentage;
this.childrenCachePercentage = childrenCachePercentage;
- this.docChildrenCachePercentage = docChildrenCachePercentage;
this.diffCachePercentage = diffCachePercentage;
return this;
}
+ /**
+ * @deprecated Use {@link #memoryCacheDistribution(int, int, int)}
+ * instead. As of 1.2.28, this method ignores the
+ * {@code docChildrenCachePercentage}.
+ */
+ public Builder memoryCacheDistribution(int nodeCachePercentage,
+ int childrenCachePercentage,
+ int docChildrenCachePercentage,
+ int diffCachePercentage) {
+ return memoryCacheDistribution(nodeCachePercentage,
+ childrenCachePercentage, diffCachePercentage);
+ }
+
public long getNodeCacheSize() {
return memoryCacheSize * nodeCachePercentage / 100;
}
@@ -793,11 +802,7 @@ public class DocumentMK implements Micro
public long getDocumentCacheSize() {
return memoryCacheSize - getNodeCacheSize() -
getChildrenCacheSize()
- - getDiffCacheSize() - getDocChildrenCacheSize();
- }
-
- public long getDocChildrenCacheSize() {
- return memoryCacheSize * docChildrenCachePercentage / 100;
+ - getDiffCacheSize();
}
public long getDiffCacheSize() {
@@ -897,10 +902,6 @@ public class DocumentMK implements Micro
return buildCache(CacheType.CHILDREN, getChildrenCacheSize(),
null, null);
}
- public Cache<StringValue, NodeDocument.Children>
buildDocChildrenCache() {
- return buildCache(CacheType.DOC_CHILDREN,
getDocChildrenCacheSize(), null, null);
- }
-
public Cache<PathRev, StringValue> buildMemoryDiffCache() {
return buildCache(CacheType.DIFF, getMemoryDiffCacheSize(), null,
null);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Thu Nov 23 08:25:33 2017
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.toArray;
import static com.google.common.collect.Iterables.transform;
import static java.util.Collections.singletonList;
@@ -31,8 +30,6 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.document.JournalEntry.fillExternalChanges;
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
-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 java.io.Closeable;
@@ -46,7 +43,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.NavigableSet;
import java.util.Set;
import java.util.SortedMap;
import java.util.TimeZone;
@@ -67,9 +63,7 @@ import javax.annotation.Nullable;
import javax.management.NotCompliantMBeanException;
import com.google.common.base.Function;
-import com.google.common.base.Predicates;
import com.google.common.cache.Cache;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -97,9 +91,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.json.BlobSerializer;
-import org.apache.jackrabbit.oak.plugins.document.Branch.BranchCommit;
import
org.apache.jackrabbit.oak.plugins.document.util.LoggingDocumentStoreWrapper;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import
org.apache.jackrabbit.oak.plugins.document.util.TimingDocumentStoreWrapper;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
@@ -323,14 +315,6 @@ public final class DocumentNodeStore
private final CacheStats nodeChildrenCacheStats;
/**
- * Child doc cache.
- *
- * Key: StringValue, value: Children
- */
- private final Cache<StringValue, NodeDocument.Children> docChildrenCache;
- private final CacheStats docChildrenCacheStats;
-
- /**
* The change log to keep track of commits for diff operations.
*/
private final DiffCache diffCache;
@@ -444,10 +428,6 @@ public final class DocumentNodeStore
nodeChildrenCacheStats = new CacheStats(nodeChildrenCache,
"Document-NodeChildren",
builder.getWeigher(), builder.getChildrenCacheSize());
- docChildrenCache = builder.buildDocChildrenCache();
- docChildrenCacheStats = new CacheStats(docChildrenCache,
"Document-DocChildren",
- builder.getWeigher(), builder.getDocChildrenCacheSize());
-
diffCache = builder.getDiffCache();
checkpoints = new Checkpoints(this);
@@ -737,10 +717,6 @@ public final class DocumentNodeStore
return nodeChildrenCacheStats;
}
- public CacheStats getDocChildrenCacheStats() {
- return docChildrenCacheStats;
- }
-
@Nonnull
public Iterable<CacheStats> getDiffCacheStats() {
return diffCache.getStats();
@@ -754,10 +730,6 @@ public final class DocumentNodeStore
return nodeChildrenCache;
}
- void invalidateDocChildrenCache() {
- docChildrenCache.invalidateAll();
- }
-
void invalidateNodeChildrenCache() {
nodeChildrenCache.invalidateAll();
}
@@ -854,6 +826,7 @@ public final class DocumentNodeStore
}
}
+ @Nonnull
DocumentNodeState.Children getChildren(@Nonnull final DocumentNodeState
parent,
@Nullable final String name,
final int limit)
@@ -976,71 +949,7 @@ public final class DocumentNodeStore
} else {
from = Utils.getKeyLowerLimit(path);
}
- if (name != null || limit > NUM_CHILDREN_CACHE_LIMIT) {
- // do not use cache when there is a lower bound name
- // or more than 16k child docs are requested
- return store.query(Collection.NODES, from, to, limit);
- }
- final StringValue key = new StringValue(path);
- // check cache
- NodeDocument.Children c = docChildrenCache.getIfPresent(key);
- if (c == null) {
- c = new NodeDocument.Children();
- List<NodeDocument> docs = store.query(Collection.NODES, from, to,
limit);
- for (NodeDocument doc : docs) {
- String p = doc.getPath();
- c.childNames.add(PathUtils.getName(p));
- }
- c.isComplete = docs.size() < limit;
- docChildrenCache.put(key, c);
- return docs;
- } else if (c.childNames.size() < limit && !c.isComplete) {
- // fetch more and update cache
- String lastName = c.childNames.get(c.childNames.size() - 1);
- String lastPath = concat(path, lastName);
- String low = Utils.getIdFromPath(lastPath);
- int remainingLimit = limit - c.childNames.size();
- List<NodeDocument> docs = store.query(Collection.NODES,
- low, to, remainingLimit);
- NodeDocument.Children clone = c.clone();
- for (NodeDocument doc : docs) {
- String p = doc.getPath();
- clone.childNames.add(PathUtils.getName(p));
- }
- clone.isComplete = docs.size() < remainingLimit;
- docChildrenCache.put(key, clone);
- c = clone;
- }
- Iterable<NodeDocument> head = filter(transform(c.childNames,
- new Function<String, NodeDocument>() {
- @Override
- public NodeDocument apply(String name) {
- String p = concat(path, name);
- NodeDocument doc = store.find(Collection.NODES,
Utils.getIdFromPath(p));
- if (doc == null) {
- docChildrenCache.invalidate(key);
- }
- return doc;
- }
- }), Predicates.notNull());
- Iterable<NodeDocument> it;
- if (c.isComplete) {
- it = head;
- } else {
- // OAK-2420: 'head' may have null documents when documents are
- // concurrently removed from the store. concat 'tail' to fetch
- // more documents if necessary
- final String last = getIdFromPath(concat(
- path, c.childNames.get(c.childNames.size() - 1)));
- Iterable<NodeDocument> tail = new Iterable<NodeDocument>() {
- @Override
- public Iterator<NodeDocument> iterator() {
- return store.query(NODES, last, to, limit).iterator();
- }
- };
- it = Iterables.concat(head, tail);
- }
- return Iterables.limit(it, limit);
+ return store.query(Collection.NODES, from, to, limit);
}
/**
@@ -1165,41 +1074,6 @@ public final class DocumentNodeStore
w.tag('^').key(PathUtils.getName(p)).object().endObject();
}
cacheEntry.append(path, w.toString());
-
- // update docChildrenCache
- if (!added.isEmpty()) {
- StringValue docChildrenKey = new StringValue(path);
- NodeDocument.Children docChildren =
docChildrenCache.getIfPresent(docChildrenKey);
- if (docChildren != null) {
- int currentSize = docChildren.childNames.size();
- NavigableSet<String> names =
Sets.newTreeSet(docChildren.childNames);
- // incomplete cache entries must not be updated with
- // names at the end of the list because there might be
- // a next name in DocumentStore smaller than the one added
- if (!docChildren.isComplete) {
- for (String childPath : added) {
- String name = PathUtils.getName(childPath);
- if (names.higher(name) != null) {
- names.add(Utils.unshareString(name));
- }
- }
- } else {
- // add all
- for (String childPath : added) {
-
names.add(Utils.unshareString(PathUtils.getName(childPath)));
- }
- }
- // any changes?
- if (names.size() != currentSize) {
- // create new cache entry with updated names
- boolean complete = docChildren.isComplete;
- docChildren = new NodeDocument.Children();
- docChildren.isComplete = complete;
- docChildren.childNames.addAll(names);
- docChildrenCache.put(docChildrenKey, docChildren);
- }
- }
- }
}
/**
@@ -1933,33 +1807,13 @@ public final class DocumentNodeStore
if (externalSort == null) {
// if no externalSort available, then invalidate the
classic way: everything
stats.cacheStats = store.invalidateCache();
- docChildrenCache.invalidateAll();
} else {
try {
externalSort.sort();
stats.cacheStats =
store.invalidateCache(pathToId(externalSort));
- // OAK-3002: only invalidate affected items (using
journal)
- long origSize = docChildrenCache.size();
- if (origSize == 0) {
- // if docChildrenCache is empty, don't bother
- // calling invalidateAll either way
- // (esp calling invalidateAll(Iterable) will
- // potentially iterate over all keys even though
- // there's nothing to be deleted)
- LOG.trace("backgroundRead: docChildrenCache
nothing to invalidate");
- } else {
- // however, if the docChildrenCache is not empty,
- // use the invalidateAll(Iterable) variant,
- // passing it a Iterable<StringValue>, as that's
- // what is contained in the cache
-
docChildrenCache.invalidateAll(asStringValueIterable(externalSort));
- long newSize = docChildrenCache.size();
- LOG.trace("backgroundRead: docChildrenCache
invalidation result: orig: {}, new: {} ", origSize, newSize);
- }
} catch (Exception ioe) {
LOG.error("backgroundRead: got IOException during
external sorting/cache invalidation (as a result, invalidating entire cache):
"+ioe, ioe);
stats.cacheStats = store.invalidateCache();
- docChildrenCache.invalidateAll();
}
}
stats.cacheInvalidationTime = clock.getTime() - time;
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Thu Nov 23 08:25:33 2017
@@ -24,10 +24,8 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toLong;
import static
org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder.DEFAULT_CHILDREN_CACHE_PERCENTAGE;
import static
org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder.DEFAULT_DIFF_CACHE_PERCENTAGE;
-import static
org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder.DEFAULT_DOC_CHILDREN_CACHE_PERCENTAGE;
import static
org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder.DEFAULT_NODE_CACHE_PERCENTAGE;
import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
-import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.scheduleWithFixedDelay;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -156,12 +154,6 @@ public class DocumentNodeStoreService {
)
private static final String PROP_DIFF_CACHE_PERCENTAGE =
"diffCachePercentage";
- @Property(intValue =
DocumentMK.Builder.DEFAULT_DOC_CHILDREN_CACHE_PERCENTAGE,
- label = "Document Children Cache",
- description = "Percentage of cache to be allocated towards
Document children cache"
- )
- private static final String PROP_DOC_CHILDREN_CACHE_PERCENTAGE =
"docChildrenCachePercentage";
-
@Property(intValue = DocumentMK.Builder.DEFAULT_CACHE_SEGMENT_COUNT,
label = "LIRS Cache Segment Count",
description = "The number of segments in the LIRS cache " +
@@ -353,7 +345,6 @@ public class DocumentNodeStoreService {
int cacheSize = toInteger(prop(PROP_CACHE), DEFAULT_CACHE);
int nodeCachePercentage = toInteger(prop(PROP_NODE_CACHE_PERCENTAGE),
DEFAULT_NODE_CACHE_PERCENTAGE);
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 blobCacheSize = toInteger(prop(PROP_BLOB_CACHE_SIZE),
DEFAULT_BLOB_CACHE_SIZE);
String persistentCache =
PropertiesUtil.toString(prop(PROP_PERSISTENT_CACHE), DEFAULT_PERSISTENT_CACHE);
@@ -366,7 +357,6 @@ public class DocumentNodeStoreService {
memoryCacheDistribution(
nodeCachePercentage,
childrenCachePercentage,
- docChildrenCachePercentage,
diffCachePercentage).
setCacheSegmentCount(cacheSegmentCount).
setCacheStackMoveDistance(cacheStackMoveDistance);
@@ -557,13 +547,6 @@ public class DocumentNodeStoreService {
CacheStatsMBean.TYPE,
store.getNodeChildrenCacheStats().getName())
);
- registrations.add(
- registerMBean(whiteboard,
- CacheStatsMBean.class,
- store.getDocChildrenCacheStats(),
- CacheStatsMBean.TYPE,
- store.getDocChildrenCacheStats().getName())
- );
for (CacheStats cs : store.getDiffCacheStats()) {
registrations.add(
registerMBean(whiteboard,
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
Thu Nov 23 08:25:33 2017
@@ -154,7 +154,6 @@ public class VersionGarbageCollector {
gc.removeDocuments(stats);
- nodeStore.invalidateDocChildrenCache();
stats.deleteDeletedDocs.stop();
} finally {
gc.close();
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java
Thu Nov 23 08:25:33 2017
@@ -60,10 +60,6 @@ public abstract class AbstractJournalTes
mks.clear();
}
- protected static void invalidateDocChildrenCache(DocumentNodeStore store) {
- store.invalidateDocChildrenCache();
- }
-
protected static void renewClusterIdLease(DocumentNodeStore store) {
store.renewClusterIdLease();
}
Copied:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
(from r1750656,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java&r1=1750656&r2=1816107&rev=1816107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
Thu Nov 23 08:25:33 2017
@@ -33,13 +33,11 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-@Ignore
public class ConcurrentReadAndAddTest {
@Rule
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
Thu Nov 23 08:25:33 2017
@@ -215,14 +215,18 @@ public class VersionGCDeletionTest {
final Semaphore queries = new Semaphore(0);
final CountDownLatch ready = new CountDownLatch(1);
MemoryDocumentStore ms = new MemoryDocumentStore() {
+ @Nonnull
@Override
- public <T extends Document> T find(Collection<T> collection,
- String key) {
- if (Thread.currentThread() != currentThread) {
+ public <T extends Document> List<T> query(Collection<T> collection,
+ String fromKey,
+ String toKey,
+ int limit) {
+ if (collection == Collection.NODES
+ && Thread.currentThread() != currentThread) {
ready.countDown();
queries.acquireUninterruptibly();
}
- return super.find(collection, key);
+ return super.query(collection, fromKey, toKey, limit);
}
};
store = new DocumentMK.Builder().clock(clock)
@@ -280,7 +284,7 @@ public class VersionGCDeletionTest {
VersionGCStats stats = gc.gc(30, MINUTES);
assertEquals(90, stats.deletedDocGCCount);
- queries.release(200);
+ queries.release(2);
List<String> names = f.get();
assertEquals(expected, names);
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1816107&r1=1816106&r2=1816107&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
Thu Nov 23 08:25:33 2017
@@ -70,8 +70,7 @@ public class JournalIT extends AbstractJ
final DocumentNodeStore ns2 = createMK(2, 0).getNodeStore();
LOG.info("cache size 1:
"+(ns1.getDocumentStore().getCacheStats()==null ? "null" :
ns1.getDocumentStore().getCacheStats().getElementCount()));
- // invalidate both caches under test first
- invalidateDocChildrenCache(ns1);
+ // invalidate cache under test first
ns1.getDocumentStore().invalidateCache();
{
@@ -167,8 +166,7 @@ public class JournalIT extends AbstractJ
final DocumentNodeStore ns1 = createMK(1, 0).getNodeStore();
final DocumentNodeStore ns2 = createMK(2, 0).getNodeStore();
- // invalidate both caches under test first
- invalidateDocChildrenCache(ns1);
+ // invalidate cache under test first
ns1.getDocumentStore().invalidateCache();
// first create child node in instance 1
