You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/08/25 09:05:44 UTC
svn commit: r1697580 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Tue Aug 25 07:05:44 2015
New Revision: 1697580
URL: http://svn.apache.org/r1697580
Log:
OAK-3259: Optimize NodeDocument.getNewestRevision()
Merged revisions 1697373,1697410 from trunk
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 25 07:05:44 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500
-/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,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,1609064,1609
081,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,1627479,1
627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,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,1641350,1641352,164154
1,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,1656033,1656303,165
6394,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,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,
1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,1685023,1685370,1685552,1685589-16855
90,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916
+/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,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,1609064,1609
081,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,1627479,1
627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,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,1641350,1641352,164154
1,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,1656033,1656303,165
6394,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,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,
1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,1685023,1685370,1685552,1685589-16855
90,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697373,1697410
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1697580&r1=1697579&r2=1697580&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Tue Aug 25 07:05:44 2015
@@ -25,6 +25,7 @@ import java.util.NavigableMap;
import java.util.Queue;
import java.util.Set;
import java.util.SortedMap;
+import java.util.SortedSet;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@ -53,11 +54,13 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator.REVERSE;
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.isRevisionNewer;
@@ -724,9 +727,7 @@ public final class NodeDocument extends
"_revisions {}, _commitRoot {}",
changeRev, getId(), getLocalRevisions(), getLocalCommitRoot());
}
- it = filter(Iterables.mergeSorted(
- ImmutableList.of(getValueMap(REVISIONS).keySet(), getValueMap(COMMIT_ROOT).keySet()),
- revisions.comparator()), predicate).iterator();
+ it = filter(getAllChanges(), predicate).iterator();
if (it.hasNext()) {
newestRev = it.next();
}
@@ -1070,7 +1071,7 @@ public final class NodeDocument extends
@Nonnull
public Iterable<UpdateOp> split(@Nonnull RevisionContext context,
@Nonnull Revision head) {
- return SplitOperations.forDocument(this, context, head);
+ return SplitOperations.forDocument(this, context, head, NUM_REVS_THRESHOLD);
}
/**
@@ -1124,8 +1125,8 @@ public final class NodeDocument extends
if (!includeStale) {
stale = getLocalMap(STALE_PREV);
}
- NavigableMap<Revision, Range> transformed = new TreeMap<Revision, Range>(
- StableRevisionComparator.REVERSE);
+ NavigableMap<Revision, Range> transformed =
+ new TreeMap<Revision, Range>(REVERSE);
for (Map.Entry<Revision, String> entry : map.entrySet()) {
Range r = Range.fromEntry(entry.getKey(), entry.getValue());
if (String.valueOf(r.height).equals(stale.get(r.high))) {
@@ -1197,6 +1198,7 @@ public final class NodeDocument extends
NodeDocument getPreviousDocument(String prevId){
//Use the maxAge variant such that in case of Mongo call for
//previous doc are directed towards replicas first
+ LOG.trace("get previous document {}", prevId);
return store.find(Collection.NODES, prevId, Integer.MAX_VALUE);
}
@@ -1226,6 +1228,53 @@ public final class NodeDocument extends
};
}
+ /**
+ * Returns previous leaf documents. Those are the previous documents with
+ * a type {@code !=} {@link SplitDocType#INTERMEDIATE}. The documents are
+ * returned in descending order based on the most recent change recorded
+ * in the previous document. A change is defined as an entry in either the
+ * {@link #REVISIONS} or {@link #COMMIT_ROOT} map.
+ *
+ * @return the leaf documents in descending order.
+ */
+ @Nonnull
+ Iterator<NodeDocument> getPreviousDocLeaves() {
+ if (getPreviousRanges().isEmpty()) {
+ return Iterators.emptyIterator();
+ }
+ // create a mutable copy
+ final NavigableMap<Revision, Range> ranges = Maps.newTreeMap(getPreviousRanges());
+ return new AbstractIterator<NodeDocument>() {
+ @Override
+ protected NodeDocument computeNext() {
+ NodeDocument next;
+ for (;;) {
+ Map.Entry<Revision, Range> topEntry = ranges.pollFirstEntry();
+ if (topEntry == null) {
+ // no more ranges
+ next = endOfData();
+ break;
+ }
+ NodeDocument prev = getPreviousDoc(topEntry.getKey(), topEntry.getValue());
+ if (prev == null) {
+ // move on to next range
+ continue;
+ }
+ if (topEntry.getValue().getHeight() == 0) {
+ // this is a leaf
+ next = prev;
+ break;
+ } else {
+ // replace intermediate entry with its previous ranges
+ ranges.putAll(prev.getPreviousRanges());
+ }
+ }
+ return next;
+ }
+ };
+ }
+
+ @CheckForNull
private NodeDocument getPreviousDoc(Revision rev, Range range){
int h = range.height;
String prevId = Utils.getPreviousIdFor(getMainPath(), rev, h);
@@ -1273,6 +1322,96 @@ public final class NodeDocument extends
}
/**
+ * Returns an {@link Iterable} of {@link Revision} of all changes performed
+ * on this document. This covers all entries for {@link #REVISIONS} and
+ * {@link #COMMIT_ROOT} including previous documents. The revisions are
+ * returned in descending stable revision order using
+ * {@link StableRevisionComparator#REVERSE}.
+ *
+ * @return revisions of all changes performed on this document.
+ */
+ Iterable<Revision> getAllChanges() {
+ final SortedSet<Revision> stack = Sets.newTreeSet(REVERSE);
+ // initialize with local revisions and commitRoot entries
+ stack.addAll(getLocalCommitRoot().keySet());
+ stack.addAll(getLocalRevisions().keySet());
+ if (getPreviousRanges().isEmpty()) {
+ return stack;
+ }
+ return new Iterable<Revision>() {
+ @Override
+ public Iterator<Revision> iterator() {
+ final Iterator<NodeDocument> previousDocs = getPreviousDocLeaves();
+ return new AbstractIterator<Revision>() {
+ private NodeDocument nextDoc;
+ private Revision nextRevision;
+ @Override
+ protected Revision computeNext() {
+ if (stack.isEmpty()) {
+ return endOfData();
+ }
+ Revision next = stack.first();
+ stack.remove(next);
+ fillStackIfNeeded();
+ return next;
+ }
+
+ private void fillStackIfNeeded() {
+ for (;;) {
+ fetchNextDoc();
+
+ // no more changes to compare with
+ if (nextDoc == null) {
+ return;
+ }
+
+ // check if current top revision is still newer than
+ // most recent revision of next document
+ if (!stack.isEmpty()) {
+ Revision top = stack.first();
+ if (top.compareRevisionTimeThenClusterId(nextRevision) > 0) {
+ return;
+ }
+ }
+
+ // if we get here, we need to pull in changes
+ // from nextDoc
+ Iterables.addAll(stack, nextDoc.getAllChanges());
+ nextDoc = null;
+ nextRevision = null;
+ }
+ }
+
+ /**
+ * Fetch the next document if {@code nextDoc} is
+ * {@code null} and there are more documents.
+ */
+ private void fetchNextDoc() {
+ for (;;) {
+ if (nextDoc != null) {
+ break;
+ }
+ if (!previousDocs.hasNext()) {
+ // no more previous docs
+ break;
+ }
+ nextDoc = previousDocs.next();
+ Iterator<Revision> changes = nextDoc.getAllChanges().iterator();
+ if (changes.hasNext()) {
+ nextRevision = changes.next();
+ break;
+ } else {
+ // empty document, try next
+ nextDoc = null;
+ }
+ }
+ }
+ };
+ }
+ };
+ }
+
+ /**
* Returns the local value map for the given key.
*
* @param key the key.
@@ -1777,7 +1916,7 @@ public final class NodeDocument extends
case JsopReader.STRING:
return json.getToken();
case '{':
- TreeMap<Revision, Object> map = new TreeMap<Revision, Object>(StableRevisionComparator.REVERSE);
+ TreeMap<Revision, Object> map = new TreeMap<Revision, Object>(REVERSE);
while (true) {
if (json.matches('}')) {
break;
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java?rev=1697580&r1=1697579&r2=1697580&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java Tue Aug 25 07:05:44 2015
@@ -44,7 +44,6 @@ import static com.google.common.base.Pre
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.COMMIT_ROOT;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.DOC_SIZE_THRESHOLD;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.IGNORE_ON_SPLIT;
-import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.NUM_REVS_THRESHOLD;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.PREV_SPLIT_FACTOR;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.REVISIONS;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.SPLIT_RATIO;
@@ -72,6 +71,7 @@ class SplitOperations {
private final String id;
private final Revision headRevision;
private final RevisionContext context;
+ private final int numRevsThreshold;
private Revision high;
private Revision low;
private int numValues;
@@ -86,12 +86,14 @@ class SplitOperations {
private SplitOperations(@Nonnull NodeDocument doc,
@Nonnull RevisionContext context,
- @Nonnull Revision headRevision) {
+ @Nonnull Revision headRevision,
+ int numRevsThreshold) {
this.doc = checkNotNull(doc);
this.context = checkNotNull(context);
this.path = doc.getPath();
this.id = doc.getId();
this.headRevision = checkNotNull(headRevision);
+ this.numRevsThreshold = numRevsThreshold;
}
/**
@@ -106,6 +108,7 @@ class SplitOperations {
* @param context the revision context.
* @param headRevision the head revision before the document was retrieved
* from the document store.
+ * @param numRevsThreshold only split off at least this number of revisions.
* @return list of update operations. An empty list indicates the document
* does not require a split.
* @throws IllegalArgumentException if the given document is a split
@@ -114,12 +117,13 @@ class SplitOperations {
@Nonnull
static List<UpdateOp> forDocument(@Nonnull NodeDocument doc,
@Nonnull RevisionContext context,
- @Nonnull Revision headRevision) {
+ @Nonnull Revision headRevision,
+ int numRevsThreshold) {
if (doc.isSplitDocument()) {
throw new IllegalArgumentException(
"Not a main document: " + doc.getId());
}
- return new SplitOperations(doc, context, headRevision).create();
+ return new SplitOperations(doc, context, headRevision, numRevsThreshold).create();
}
@@ -168,7 +172,7 @@ class SplitOperations {
SortedMap<Revision, Range> previous = doc.getPreviousRanges();
// only consider if there are enough commits,
// unless document is really big
- return doc.getLocalRevisions().size() + doc.getLocalCommitRoot().size() > NUM_REVS_THRESHOLD
+ return doc.getLocalRevisions().size() + doc.getLocalCommitRoot().size() > numRevsThreshold
|| doc.getMemory() >= DOC_SIZE_THRESHOLD
|| previous.size() >= PREV_SPLIT_FACTOR
|| !doc.getStalePrev().isEmpty();
@@ -302,7 +306,7 @@ class SplitOperations {
UpdateOp main = null;
// check if we have enough data to split off
if (high != null && low != null
- && (numValues >= NUM_REVS_THRESHOLD
+ && (numValues >= numRevsThreshold
|| doc.getMemory() > DOC_SIZE_THRESHOLD)) {
// enough changes to split off
// move to another document
@@ -336,7 +340,7 @@ class SplitOperations {
setSplitDocProps(doc, oldDoc, old, high);
// only split if enough of the data can be moved to old document
if (oldDoc.getMemory() > doc.getMemory() * SPLIT_RATIO
- || numValues >= NUM_REVS_THRESHOLD) {
+ || numValues >= numRevsThreshold) {
splitOps.add(old);
} else {
main = null;
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java?rev=1697580&r1=1697579&r2=1697580&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java Tue Aug 25 07:05:44 2015
@@ -670,7 +670,7 @@ public class DocumentSplitTest extends B
doc.put(NodeDocument.ID, Utils.getIdFromPath("/test"));
doc.put(NodeDocument.SD_TYPE, NodeDocument.SplitDocType.DEFAULT.type);
Revision head = mk.getNodeStore().getHeadRevision();
- SplitOperations.forDocument(doc, DummyRevisionContext.INSTANCE, head);
+ SplitOperations.forDocument(doc, DummyRevisionContext.INSTANCE, head, NUM_REVS_THRESHOLD);
}
@Test
@@ -779,7 +779,7 @@ public class DocumentSplitTest extends B
for (String id : ns.getSplitCandidates()) {
Revision head = ns.getHeadRevision();
NodeDocument doc = store.find(NODES, id);
- List<UpdateOp> ops = SplitOperations.forDocument(doc, rc, head);
+ List<UpdateOp> ops = SplitOperations.forDocument(doc, rc, head, NUM_REVS_THRESHOLD);
Set<Revision> removed = Sets.newHashSet();
Set<Revision> added = Sets.newHashSet();
for (UpdateOp op : ops) {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1697580&r1=1697579&r2=1697580&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Tue Aug 25 07:05:44 2015
@@ -16,10 +16,31 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Test;
+import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for {@link NodeDocument}.
*/
@@ -41,4 +62,270 @@ public class NodeDocumentTest {
Revision head = DummyRevisionContext.INSTANCE.getHeadRevision();
doc.split(DummyRevisionContext.INSTANCE, head);
}
+
+ @Test
+ public void getAllChanges() throws Exception {
+ final int NUM_CHANGES = 200;
+ DocumentNodeStore ns = createTestStore(NUM_CHANGES);
+ Revision previous = ns.newRevision();
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ for (Revision r : root.getAllChanges()) {
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ // NUM_CHANGES + one revision when node was created
+ assertEquals(NUM_CHANGES + 1, Iterables.size(root.getAllChanges()));
+ ns.dispose();
+ }
+
+ @Test
+ public void getAllChangesAfterGC1() throws Exception {
+ int numChanges = 200;
+ DocumentNodeStore ns = createTestStore(numChanges);
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ // remove most recent previous doc
+ NodeDocument toRemove = root.getAllPreviousDocs().next();
+ int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
+ assertEquals(1, numDeleted);
+ numChanges -= Iterables.size(toRemove.getAllChanges());
+
+ root = getRootDocument(ns.getDocumentStore());
+ Revision previous = ns.newRevision();
+ for (Revision r : root.getAllChanges()) {
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ // numChanges + one revision when node was created
+ assertEquals(numChanges + 1, Iterables.size(root.getAllChanges()));
+ ns.dispose();
+ }
+
+ @Test
+ public void getAllChangesAfterGC2() throws Exception {
+ int numChanges = 200;
+ DocumentNodeStore ns = createTestStore(numChanges);
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ // remove oldest previous doc
+ NodeDocument toRemove = Iterators.getLast(root.getAllPreviousDocs());
+ int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
+ assertEquals(1, numDeleted);
+ numChanges -= Iterables.size(toRemove.getAllChanges());
+
+ root = getRootDocument(ns.getDocumentStore());
+ Revision previous = ns.newRevision();
+ for (Revision r : root.getAllChanges()) {
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ // numChanges + one revision when node was created
+ assertEquals(numChanges + 1, Iterables.size(root.getAllChanges()));
+ ns.dispose();
+ }
+
+ @Test
+ public void getAllChangesCluster() throws Exception {
+ final int NUM_CLUSTER_NODES = 3;
+ final int NUM_CHANGES = 500;
+ DocumentStore store = new MemoryDocumentStore();
+ List<DocumentNodeStore> docStores = Lists.newArrayList();
+ for (int i = 0; i < NUM_CLUSTER_NODES; i++) {
+ DocumentNodeStore ns = new DocumentMK.Builder()
+ .setDocumentStore(store)
+ .setAsyncDelay(0).getNodeStore();
+ docStores.add(ns);
+ }
+ Random r = new Random(42);
+ for (int i = 0; i < NUM_CHANGES; i++) {
+ // randomly pick a clusterNode
+ int clusterIdx = r.nextInt(NUM_CLUSTER_NODES);
+ DocumentNodeStore ns = docStores.get(clusterIdx);
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.setProperty("p-" + clusterIdx, i);
+ merge(ns, builder);
+ if (r.nextFloat() < 0.2) {
+ Revision head = ns.getHeadRevision();
+ for (UpdateOp op : SplitOperations.forDocument(
+ getRootDocument(store), ns, head, 2)) {
+ store.createOrUpdate(NODES, op);
+ }
+ }
+ }
+ DocumentNodeStore ns = docStores.get(0);
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ Revision previous = ns.newRevision();
+ for (Revision rev : root.getAllChanges()) {
+ assertTrue(previous.compareRevisionTimeThenClusterId(rev) > 0);
+ previous = rev;
+ }
+ // numChanges + one revision when node was created
+ assertEquals(NUM_CHANGES + 1, Iterables.size(root.getAllChanges()));
+
+ for (DocumentNodeStore dns : docStores) {
+ dns.dispose();
+ }
+ }
+
+ @Test
+ public void getPreviousDocLeaves() throws Exception {
+ DocumentNodeStore ns = createTestStore(200);
+ Revision previous = ns.newRevision();
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ Iterator<NodeDocument> it = root.getPreviousDocLeaves();
+ while (it.hasNext()) {
+ NodeDocument leaf = it.next();
+ Revision r = leaf.getAllChanges().iterator().next();
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ ns.dispose();
+ }
+
+ @Test
+ public void getPreviousDocLeavesAfterGC1() throws Exception {
+ DocumentNodeStore ns = createTestStore(200);
+ Revision previous = ns.newRevision();
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ int numLeaves = Iterators.size(root.getPreviousDocLeaves());
+ // remove most recent previous doc
+ NodeDocument toRemove = root.getAllPreviousDocs().next();
+ int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
+ assertEquals(1, numDeleted);
+
+ root = getRootDocument(ns.getDocumentStore());
+ assertEquals(numLeaves - 1, Iterators.size(root.getPreviousDocLeaves()));
+ Iterator<NodeDocument> it = root.getPreviousDocLeaves();
+ while (it.hasNext()) {
+ NodeDocument leaf = it.next();
+ Revision r = leaf.getAllChanges().iterator().next();
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ ns.dispose();
+ }
+
+ @Test
+ public void getPreviousDocLeavesAfterGC2() throws Exception {
+ DocumentNodeStore ns = createTestStore(200);
+ Revision previous = ns.newRevision();
+ NodeDocument root = getRootDocument(ns.getDocumentStore());
+ int numLeaves = Iterators.size(root.getPreviousDocLeaves());
+ // remove oldest previous doc
+ NodeDocument toRemove = Iterators.getLast(root.getAllPreviousDocs());
+ int numDeleted = new SplitDocumentCleanUp(ns.store, new VersionGCStats(),
+ Collections.singleton(toRemove)).disconnect().deleteSplitDocuments();
+ assertEquals(1, numDeleted);
+
+ root = getRootDocument(ns.getDocumentStore());
+ assertEquals(numLeaves - 1, Iterators.size(root.getPreviousDocLeaves()));
+ Iterator<NodeDocument> it = root.getPreviousDocLeaves();
+ while (it.hasNext()) {
+ NodeDocument leaf = it.next();
+ Revision r = leaf.getAllChanges().iterator().next();
+ assertTrue(previous.compareRevisionTime(r) > 0);
+ previous = r;
+ }
+ ns.dispose();
+ }
+
+ @Test
+ public void getNewestRevisionTooExpensive() throws Exception {
+ final int NUM_CHANGES = 200;
+ final Set<String> prevDocCalls = Sets.newHashSet();
+ DocumentStore store = new MemoryDocumentStore() {
+ @Override
+ public <T extends Document> T find(Collection<T> collection,
+ String key) {
+ if (Utils.getPathFromId(key).startsWith("p")) {
+ prevDocCalls.add(key);
+ }
+ return super.find(collection, key);
+ }
+ };
+ DocumentNodeStore ns = new DocumentMK.Builder()
+ .setDocumentStore(store)
+ .setAsyncDelay(0).getNodeStore();
+ // create test data
+ for (int i = 0; i < NUM_CHANGES; i++) {
+ NodeBuilder builder = ns.getRoot().builder();
+ if (builder.hasChildNode("test")) {
+ builder.child("test").remove();
+ builder.child("foo").remove();
+ } else {
+ builder.child("test");
+ builder.child("foo");
+ }
+ merge(ns, builder);
+ if (Math.random() < 0.2) {
+ Revision head = ns.getHeadRevision();
+ NodeDocument doc = ns.getDocumentStore().find(
+ NODES, Utils.getIdFromPath("/test"));
+ for (UpdateOp op : SplitOperations.forDocument(
+ doc, ns, head, 2)) {
+ store.createOrUpdate(NODES, op);
+ }
+ }
+ }
+ NodeDocument doc = ns.getDocumentStore().find(
+ NODES, Utils.getIdFromPath("/test"));
+ // get most recent previous doc
+ NodeDocument prev = doc.getAllPreviousDocs().next();
+ // simulate a change revision within the range of
+ // the most recent previous document
+ Iterable<Revision> changes = prev.getAllChanges();
+ Revision changeRev = new Revision(Iterables.getLast(changes).getTimestamp(), 1000, ns.getClusterId());
+ // reset calls to previous documents
+ prevDocCalls.clear();
+ doc.getNewestRevision(ns, changeRev, new CollisionHandler() {
+ @Override
+ void concurrentModification(Revision other) {
+ // ignore
+ }
+ });
+ // must not read all previous docs
+ assertTrue("too many calls for previous documents: " + prevDocCalls,
+ prevDocCalls.size() <= 4);
+
+ ns.dispose();
+ }
+
+ private DocumentNodeStore createTestStore(int numChanges) throws Exception {
+ return createTestStore(new MemoryDocumentStore(), numChanges);
+ }
+
+ private DocumentNodeStore createTestStore(DocumentStore store,
+ int numChanges) throws Exception {
+ DocumentNodeStore ns = new DocumentMK.Builder()
+ .setDocumentStore(store)
+ .setAsyncDelay(0).getNodeStore();
+ for (int i = 0; i < numChanges; i++) {
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.setProperty("p", i);
+ merge(ns, builder);
+ if (Math.random() < 0.2) {
+ Revision head = ns.getHeadRevision();
+ for (UpdateOp op : SplitOperations.forDocument(
+ getRootDocument(store), ns, head, 2)) {
+ store.createOrUpdate(NODES, op);
+ }
+ }
+ }
+ return ns;
+ }
+
+ private void merge(NodeStore store, NodeBuilder builder)
+ throws CommitFailedException {
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ }
+
+ private static NodeDocument getRootDocument(DocumentStore store) {
+ String rootId = Utils.getIdFromPath("/");
+ NodeDocument root = store.find(Collection.NODES, rootId);
+ if (root == null) {
+ throw new IllegalStateException("missing root document");
+ }
+ return root;
+ }
}