Author: reschke
Date: Thu Feb 11 19:14:26 2016
New Revision: 1729879
URL: http://svn.apache.org/viewvc?rev=1729879&view=rev
Log:
OAK-3634: RDB/MongoDocumentStore may return stale documents (ported to 1.0)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
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/BasicDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 11 19:14:26 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,1718528,1718626,1718646,1718772,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723254,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/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,1718772,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723241,1723251,1723254,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/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=1729879&r1=1729878&r2=1729879&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 19:14:26 2016
@@ -21,7 +21,6 @@ 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;
@@ -84,6 +83,8 @@ import com.mongodb.WriteResult;
import static com.google.common.base.Predicates.in;
import static com.google.common.base.Predicates.not;
import static com.google.common.collect.Iterables.filter;
+import static com.google.common.base.Predicates.notNull;
+import static com.google.common.collect.Maps.filterValues;
/**
* A document store that uses MongoDB as the backend.
@@ -282,22 +283,9 @@ public class MongoDocumentStore implemen
LOG.trace("invalidateCache: batch size: {} of total so far {}",
ids.size(), size);
}
-
- QueryBuilder query = QueryBuilder.start(Document.ID).in(ids);
- // Fetch only the modCount and id
- final BasicDBObject fields = new BasicDBObject(Document.ID, 1);
- fields.put(Document.MOD_COUNT, 1);
-
- 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) {
- String id = (String) obj.get(Document.ID);
- Number modCount = (Number) obj.get(Document.MOD_COUNT);
- modCounts.put(id, modCount);
- }
+ Map<String, Number> modCounts = getModCounts(ids);
+ result.queryCount++;
int invalidated = nodesCache.invalidateOutdated(modCounts);
for (String id : filter(ids, not(in(modCounts.keySet())))) {
@@ -862,18 +850,26 @@ public class MongoDocumentStore implemen
throw new DocumentStoreException("Update failed: " +
writeResult.getError());
}
if (collection == Collection.NODES) {
+ Map<String, Number> modCounts =
getModCounts(filterValues(cachedDocs, notNull()).keySet());
// update cache
for (Entry<String, NodeDocument> entry :
cachedDocs.entrySet()) {
// the cachedDocs is not empty, so the collection =
NODES
Lock lock = nodeLocks.acquire(entry.getKey());
try {
- if (entry.getValue() == null || entry.getValue()
== NodeDocument.NULL) {
+ Number postUpdateModCount =
modCounts.get(entry.getKey());
+ if (postUpdateModCount != null
+ && entry.getValue() != null
+ && entry.getValue() != NodeDocument.NULL
+ && (postUpdateModCount.longValue() - 1) ==
entry.getValue().getModCount()) {
+ // post update modCount is one higher than
+ // what we currently see in the cache. we can
+ // replace the cached document
+ NodeDocument newDoc =
applyChanges(Collection.NODES, entry.getValue(),
updateOp.shallowCopy(entry.getKey()));
+
nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
+ } else {
// make sure concurrently loaded document is
// invalidated
nodesCache.invalidate(entry.getKey());
- } else {
- NodeDocument newDoc =
applyChanges(Collection.NODES, entry.getValue(),
updateOp.shallowCopy(entry.getKey()));
-
nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
}
} finally {
lock.unlock();
@@ -881,6 +877,11 @@ public class MongoDocumentStore implemen
}
}
} catch (MongoException e) {
+ // some documents may still have been updated
+ // invalidate all documents affected by this update call
+ for (String k : keys) {
+ nodesCache.invalidate(k);
+ }
throw DocumentStoreException.convert(e);
}
} finally {
@@ -888,6 +889,35 @@ public class MongoDocumentStore implemen
}
}
+ /**
+ * Returns the {@link Document#MOD_COUNT} value of the documents with the
+ * given {@code keys}. The returned map will only contain entries for
+ * existing documents.
+ *
+ * @param keys the keys of the documents.
+ * @return map with key to {@link Document#MOD_COUNT} value mapping.
+ * @throws MongoException if the call fails
+ */
+ @Nonnull
+ private Map<String, Number> getModCounts(Iterable<String> keys)
+ throws MongoException {
+ QueryBuilder query = QueryBuilder.start(Document.ID).in(keys);
+ // Fetch only the modCount and id
+ final BasicDBObject fields = new BasicDBObject(Document.ID, 1);
+ fields.put(Document.MOD_COUNT, 1);
+
+ DBCursor cursor = nodes.find(query.get(), fields);
+ cursor.setReadPreference(ReadPreference.primary());
+
+ Map<String, Number> modCounts = Maps.newHashMap();
+ for (DBObject obj : cursor) {
+ String id = (String) obj.get(Document.ID);
+ Number modCount = (Number) obj.get(Document.MOD_COUNT);
+ modCounts.put(id, modCount);
+ }
+ return modCounts;
+ }
+
DocumentReadPreference getReadPreference(int maxCacheAge){
if(maxCacheAge >= 0 && maxCacheAge < maxReplicationLagMillis) {
return DocumentReadPreference.PRIMARY;
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=1729879&r1=1729878&r2=1729879&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 19:14:26 2016
@@ -1109,6 +1109,9 @@ public class RDBDocumentStore implements
for (String key : chunkedIds) {
cachedDocs.put(key, nodesCache.getIfPresent(key));
}
+ for (String id : chunkedIds) {
+ nodesCache.invalidate(id);
+ }
}
Connection connection = null;
@@ -1131,23 +1134,8 @@ public class RDBDocumentStore implements
if (!seenQueryContext.contains(qc)) {
qc.addKeys(chunkedIds);
}
- }
- for (Entry<String, NodeDocument> entry :
cachedDocs.entrySet()) {
- T oldDoc = castAsT(entry.getValue());
- String id = entry.getKey();
- Lock lock = locks.acquire(id);
- try {
- if (oldDoc == null) {
- // make sure concurrently loaded document is
- // invalidated
- nodesCache.invalidate(id);
- } else {
- addUpdateCounters(update);
- T newDoc = createNewDocument(collection,
oldDoc, update);
-
nodesCache.replaceCachedDocument((NodeDocument) oldDoc, (NodeDocument) newDoc);
- }
- } finally {
- lock.unlock();
+ for (String id : chunkedIds) {
+ nodesCache.invalidate(id);
}
}
} else {
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1729879&r1=1729878&r2=1729879&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Thu Feb 11 19:14:26 2016
@@ -404,33 +404,32 @@ public class BasicDocumentStoreTest exte
}
@Test
- public void testModifyDeletedOnce() {
- // https://issues.apache.org/jira/browse/OAK-3852
- String id = this.getClass().getName() + ".testModifyDeletedOnce";
+ public void testModifyModified() {
+ // https://issues.apache.org/jira/browse/OAK-2940
+ String id = this.getClass().getName() + ".testModifyModified";
// create a test node
UpdateOp up = new UpdateOp(id, true);
up.set("_id", id);
- up.set(NodeDocument.DELETED_ONCE, Boolean.FALSE);
+ up.set("_modified", 1000L);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
removeMe.add(id);
+
+ // update with "max" operation
+ up = new UpdateOp(id, false);
+ up.set("_id", id);
+ up.max("_modified", 2000L);
+ super.ds.update(Collection.NODES, Collections.singletonList(id), up);
NodeDocument nd = super.ds.find(Collection.NODES, id, 0);
- assertNotNull(nd);
- Boolean dovalue = (Boolean)nd.get(NodeDocument.DELETED_ONCE);
- if (dovalue != null) {
- // RDB persistence does not distinguish null and false
- assertEquals(dovalue.booleanValue(), Boolean.FALSE);
- }
+ assertEquals(((Number)nd.get("_modified")).longValue(), 2000L);
- // update
+ // update with "set" operation
up = new UpdateOp(id, false);
up.set("_id", id);
- up.set(NodeDocument.DELETED_ONCE, Boolean.TRUE);
+ up.set("_modified", 1500L);
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
nd = super.ds.find(Collection.NODES, id, 0);
- assertNotNull(nd);
- assertNotNull(nd.get(NodeDocument.DELETED_ONCE));
-
assertEquals(((Boolean)nd.get(NodeDocument.DELETED_ONCE)).booleanValue(),
Boolean.TRUE);
+ assertEquals(((Number)nd.get("_modified")).longValue(), 1500L);
}
@Test
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1729879&r1=1729878&r2=1729879&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Thu Feb 11 19:14:26 2016
@@ -20,12 +20,25 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MultiDocumentStoreTest extends AbstractMultiDocumentStoreTest {
+ private static final Logger LOG =
LoggerFactory.getLogger(MultiDocumentStoreTest.class);
+
public MultiDocumentStoreTest(DocumentStoreFixture dsf) {
super(dsf);
}
@@ -42,7 +55,7 @@ public class MultiDocumentStoreTest exte
UpdateOp up = new UpdateOp(id, true);
up.set("_id", id);
- up.set("_foo", 0l);
+ up.set("_foo", 0);
assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
removeMe.add(id);
@@ -51,7 +64,7 @@ public class MultiDocumentStoreTest exte
for (int i = 0; i < increments; i++) {
up = new UpdateOp(id, true);
up.set("_id", id);
- up.increment("_foo", 1l);
+ up.increment("_foo", 1);
if (i % 2 == 0) {
super.ds1.update(Collection.NODES,
Collections.singletonList(id), up);
}
@@ -66,82 +79,6 @@ public class MultiDocumentStoreTest exte
}
@Test
- public void testInterleavedUpdate2() {
- String id = this.getClass().getName() + ".testInterleavedUpdate2";
-
- // remove if present
- NodeDocument nd1 = super.ds1.find(Collection.NODES, id);
- if (nd1 != null) {
- super.ds1.remove(Collection.NODES, id);
- }
-
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- up.set("_modified", 1L);
- assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
- removeMe.add(id);
-
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- Number n = nd1.getModCount();
- if (n != null) {
- // Document store uses modCount
- int n1 = n.intValue();
-
- // get the document into ds2's cache
- NodeDocument nd2 = super.ds2.find(Collection.NODES, id, 0);
- int n2 = nd2.getModCount().intValue();
- assertEquals(n1, n2);
-
- UpdateOp upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("foo", "bar");
- upds1.set("_modified", 2L);
- super.ds1.update(Collection.NODES, Collections.singletonList(id),
upds1);
- nd1 = super.ds1.find(Collection.NODES, id);
- int oldn1 = n1;
- n1 = nd1.getModCount().intValue();
- assertEquals(oldn1 + 1, n1);
- assertEquals("bar", nd1.get("foo"));
-
- // modify in DS2
- UpdateOp upds2 = new UpdateOp(id, true);
- upds2.set("_id", id);
- upds2.set("foo", "qux");
- upds2.set("_modified", 3L);
- super.ds2.update(Collection.NODES, Collections.singletonList(id),
upds2);
- nd2 = super.ds2.find(Collection.NODES, id);
- n2 = nd2.getModCount().intValue();
- assertEquals(oldn1 + 1, n2);
- assertEquals("qux", nd2.get("foo"));
-
- // both stores are now at the same modCount with different contents
- upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("foo", "barbar");
- upds1.max("_modified", 0L);
- NodeDocument prev = super.ds1.findAndUpdate(Collection.NODES,
upds1);
- // prev document should contain mod from DS2
- assertEquals("qux", prev.get("foo"));
- assertEquals(oldn1 + 2, prev.getModCount().intValue());
- assertEquals(3L, prev.getModified().intValue());
-
- // the new document must not have a _modified time smaller than
- // before the update
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- assertEquals(super.dsname + ": _modified value must never ever get
smaller", 3L, nd1.getModified().intValue());
-
- // verify that _modified can indeed be *set* to a smaller value,
see
- // https://issues.apache.org/jira/browse/OAK-2940
- upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("_modified", 0L);
- super.ds1.findAndUpdate(Collection.NODES, upds1);
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- assertEquals(super.dsname + ": _modified value must be set to 0",
0L, nd1.getModified().intValue());
- }
- }
-
- @Test
public void testInvalidateCache() {
// use a "proper" ID because otherwise Mongo's cache invalidation will
fail
// see OAK-2588
@@ -209,6 +146,162 @@ public class MultiDocumentStoreTest exte
assertTrue(nd1.getLastCheckTime() > ds1checktime);
}
+ @Test
+ public void testChangeVisibility() {
+ String id = this.getClass().getName() + ".testChangeVisibility";
+
+ super.ds1.remove(Collection.NODES, id);
+
+ UpdateOp up = new UpdateOp(id, true);
+ up.set("_id", id);
+ up.set("_foo", 0);
+ up.set("_bar", 0);
+ assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
+ removeMe.add(id);
+ NodeDocument orig = super.ds1.find(Collection.NODES, id);
+
+ // only run test if DS supports modcount
+ if (orig.getModCount() != null) {
+ long origMc = orig.getModCount().longValue();
+
+ UpdateOp up2 = new UpdateOp(id, false);
+ up2.set("_id", id);
+ up2.increment("_foo", 1L);
+ super.ds2.update(Collection.NODES, Collections.singletonList(id),
up2);
+ NodeDocument ds2doc = super.ds2.find(Collection.NODES, id);
+ long ds2Mc = ds2doc.getModCount().longValue();
+ assertTrue("_modCount needs to be > " + origMc + " but was " +
ds2Mc, ds2Mc > origMc);
+
+ UpdateOp up1 = new UpdateOp(id, false);
+ up1.set("_id", id);
+ up1.increment("_bar", 1L);
+ super.ds1.update(Collection.NODES, Collections.singletonList(id),
up1);
+
+ NodeDocument ds1doc = super.ds1.find(Collection.NODES, id);
+ long ds1Mc = ds1doc.getModCount().longValue();
+ assertTrue("_modCount needs to be > " + ds2Mc + " but was " +
ds1Mc, ds1Mc > ds2Mc);
+ }
+ }
+
+ @Test
+ public void concurrentUpdate() throws Exception {
+ String id = Utils.getIdFromPath("/foo");
+ ds1.remove(Collection.NODES, id);
+ ds2.invalidateCache();
+ removeMe.add(id);
+ UpdateOp op = new UpdateOp(id, true);
+ op.set(Document.ID, id);
+ ds1.create(Collection.NODES, Collections.singletonList(op));
+
+ List<Exception> exceptions = Collections.synchronizedList(new
ArrayList<Exception>());
+ List<Thread> threads = Lists.newArrayList();
+ threads.add(new Thread(new Updater(ds1, id, exceptions)));
+ threads.add(new Thread(new Updater(ds2, id, exceptions)));
+ Reader r = new Reader(id, exceptions, ds1, ds2);
+ Thread reader = new Thread(r);
+ for (Thread t : threads) {
+ t.start();
+ }
+ reader.start();
+ for (Thread t : threads) {
+ t.join();
+ }
+ r.terminate();
+ reader.join();
+ for (Exception e : exceptions) {
+ throw e;
+ }
+ }
+
+ private static final class Reader implements Runnable {
+
+ private final String id;
+ private final List<Exception> exceptions;
+ private final List<DocumentStore> stores;
+ private volatile boolean terminate = false;
+ private final Map<Long, NodeDocument> docs = Maps.newHashMap();
+
+ public Reader(String id, List<Exception> exceptions, DocumentStore...
stores) {
+ this.id = id;
+ this.exceptions = exceptions;
+ this.stores = Lists.newArrayList(stores);
+ }
+
+ void terminate() {
+ terminate = true;
+ }
+
+ @Override
+ public void run() {
+ Random random = new Random();
+ while (!terminate) {
+ try {
+ DocumentStore ds =
stores.get(random.nextInt(stores.size()));
+ NodeDocument d = ds.find(Collection.NODES, id);
+ long modCount = d.getModCount().longValue();
+ NodeDocument seen = docs.get(modCount);
+ if (seen == null) {
+ docs.put(modCount, d);
+ } else {
+ Map<String, Object> expected = getPropertyValues(seen);
+ Map<String, Object> actual = getPropertyValues(d);
+ assertEquals(expected, actual);
+ }
+ Thread.sleep(random.nextInt(1));
+ } catch (AssertionError e) {
+ exceptions.add(new Exception(e.getMessage()));
+ break;
+ } catch (Exception e) {
+ exceptions.add(e);
+ break;
+ }
+ }
+ }
+
+ static Map<String, Object> getPropertyValues(NodeDocument doc) {
+ Map<String, Object> props = Maps.newHashMap();
+ for (String k : doc.keySet()) {
+ if (Utils.isPropertyName(k)) {
+ props.put(k, doc.get(k));
+ }
+ }
+ return props;
+ }
+ }
+
+ private static final class Updater implements Runnable {
+
+ private final DocumentStore ds;
+ private final String id;
+ private final List<Exception> exceptions;
+ private long counter = 0;
+
+ public Updater(DocumentStore ds, String id, List<Exception>
exceptions) {
+ this.ds = ds;
+ this.id = id;
+ this.exceptions = exceptions;
+ }
+
+ @Override
+ public void run() {
+ String p = Thread.currentThread().getName();
+ for (int i = 0; i < 1000; i++) {
+ UpdateOp op = new UpdateOp(id, false);
+ op.set(p, counter++);
+ try {
+ ds.update(Collection.NODES, Collections.singletonList(id),
op);
+ } catch (Exception e) {
+ if (ds instanceof RDBDocumentStore
+ && e.getMessage().contains("race?")) {
+ LOG.warn(e.toString());
+ } else {
+ exceptions.add(e);
+ }
+ }
+ }
+ }
+ }
+
private static long letTimeElapse() {
long ts = System.currentTimeMillis();
while (System.currentTimeMillis() == ts) {
