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 ch...@apache.org on 2015/06/01 08:02:06 UTC
svn commit: r1682820 - 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/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/...
Author: chetanm
Date: Mon Jun 1 06:02:06 2015
New Revision: 1682820
URL: http://svn.apache.org/r1682820
Log:
OAK-2868 - Bypass CommitQueue for branch commits
Merging 1679232
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 1 06:02:06 2015
@@ -1,2 +1,2 @@
-/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,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,1609081,1609
165,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,1627503,1
627586,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,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,1641541,1641596-164159
9,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,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,1656394,1656400,1656425,165
6427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383,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,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,
1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673431,1673644,1673662-1673663,1673695,1674046,1674065,1674075,1674107,1674150,1675054,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1677579,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494
+/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,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,1609081,1609
165,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,1627503,1
627586,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,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,1641541,1641596-164159
9,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,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,1656394,1656400,1656425,165
6427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383,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,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,
1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673431,1673644,1673662-1673663,1673695,1674046,1674065,1674075,1674107,1674150,1675054,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1677579,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java?rev=1682820&r1=1682819&r2=1682820&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java Mon Jun 1 06:02:06 2015
@@ -26,11 +26,7 @@ import java.util.TreeSet;
import java.util.concurrent.CountDownLatch;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher;
-import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,20 +34,13 @@ import org.slf4j.LoggerFactory;
* <code>CommitQueue</code> ensures a sequence of commits consistent with the
* commit revision even if commits did not complete in this sequence.
*/
-class CommitQueue {
+abstract class CommitQueue {
static final Logger LOG = LoggerFactory.getLogger(CommitQueue.class);
- private final DocumentNodeStore store;
-
private final SortedMap<Revision, Entry> commits = new TreeMap<Revision, Entry>(StableRevisionComparator.INSTANCE);
- private final ChangeDispatcher dispatcher;
-
- CommitQueue(DocumentNodeStore store, ChangeDispatcher dispatcher) {
- this.store = store;
- this.dispatcher = dispatcher;
- }
+ protected abstract Revision newRevision();
@Nonnull
Revision createRevision() {
@@ -65,7 +54,7 @@ class CommitQueue {
Revision rev = null;
synchronized (this) {
for (int i = 0; i < num; i++) {
- rev = store.newRevision();
+ rev = newRevision();
revs.add(rev);
}
commits.put(rev, new Entry(rev));
@@ -74,23 +63,26 @@ class CommitQueue {
return revs;
}
- void done(@Nonnull Commit commit, boolean isBranch, @Nullable CommitInfo info) {
- checkNotNull(commit);
- if (isBranch) {
- try {
- commit.applyToCache(commit.getBaseRevision(), true);
- } finally {
- removeCommit(commit.getRevision());
- }
- } else {
- afterTrunkCommit(commit, info);
- }
+ void done(@Nonnull Revision revision, @Nonnull Callback c) {
+ checkNotNull(revision);
+ waitUntilHeadOfQueue(revision, c);
}
void canceled(@Nonnull Revision rev) {
removeCommit(rev);
}
+ boolean contains(@Nonnull Revision revision) {
+ synchronized (this) {
+ return commits.containsKey(checkNotNull(revision));
+ }
+ }
+
+ interface Callback {
+
+ void headOfQueue(@Nonnull Revision revision);
+ }
+
//------------------------< internal >--------------------------------------
private void removeCommit(@Nonnull Revision rev) {
@@ -105,10 +97,9 @@ class CommitQueue {
}
}
- private void afterTrunkCommit(@Nonnull Commit commit,
- @Nullable CommitInfo info) {
+ private void waitUntilHeadOfQueue(@Nonnull Revision rev,
+ @Nonnull Callback c) {
assert !commits.isEmpty();
- Revision rev = commit.getRevision();
boolean isHead;
Entry commitEntry;
@@ -124,14 +115,7 @@ class CommitQueue {
commits.remove(rev);
try {
LOG.debug("removed {}, head is now {}", rev, commits.isEmpty() ? null : commits.firstKey());
- // remember before revision
- Revision before = store.getHeadRevision();
- // apply changes to cache based on before revision
- commit.applyToCache(before, false);
- // update head revision
- store.setHeadRevision(rev);
- NodeState root = store.getRoot();
- dispatcher.contentChanged(root, info);
+ c.headOfQueue(rev);
} finally {
// notify next if there is any
notifyHead();
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1682820&r1=1682819&r2=1682820&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Mon Jun 1 06:02:06 2015
@@ -446,7 +446,12 @@ public final class DocumentNodeStore
getRevisionComparator().add(headRevision, Revision.newRevision(0));
dispatcher = new ChangeDispatcher(getRoot());
- commitQueue = new CommitQueue(this, dispatcher);
+ commitQueue = new CommitQueue() {
+ @Override
+ protected Revision newRevision() {
+ return DocumentNodeStore.this.newRevision();
+ }
+ };
batchCommitQueue = new BatchCommitQueue(store, revisionComparator);
backgroundReadThread = new Thread(
new BackgroundReadOperation(this, isDisposed),
@@ -582,19 +587,11 @@ public final class DocumentNodeStore
if (base == null) {
base = headRevision;
}
- backgroundOperationLock.readLock().lock();
- boolean success = false;
- Commit c;
- try {
- checkOpen();
- c = new Commit(this, commitQueue.createRevision(), base, branch);
- success = true;
- } finally {
- if (!success) {
- backgroundOperationLock.readLock().unlock();
- }
+ if (base.isBranch()) {
+ return newBranchCommit(base, branch);
+ } else {
+ return newTrunkCommit(base);
}
- return c;
}
/**
@@ -627,19 +624,37 @@ public final class DocumentNodeStore
return c;
}
- void done(@Nonnull Commit c, boolean isBranch, @Nullable CommitInfo info) {
- try {
- commitQueue.done(c, isBranch, info);
- } finally {
- backgroundOperationLock.readLock().unlock();
+ void done(final @Nonnull Commit c, boolean isBranch, final @Nullable CommitInfo info) {
+ if (commitQueue.contains(c.getRevision())) {
+ try {
+ commitQueue.done(c.getRevision(), new CommitQueue.Callback() {
+ @Override
+ public void headOfQueue(@Nonnull Revision revision) {
+ // remember before revision
+ Revision before = getHeadRevision();
+ // apply changes to cache based on before revision
+ c.applyToCache(before, false);
+ // update head revision
+ setHeadRevision(c.getRevision());
+ dispatcher.contentChanged(getRoot(), info);
+ }
+ });
+ } finally {
+ backgroundOperationLock.readLock().unlock();
+ }
+ } else {
+ // branch commit
+ c.applyToCache(c.getBaseRevision(), isBranch);
}
}
void canceled(Commit c) {
- try {
- commitQueue.canceled(c.getRevision());
- } finally {
- backgroundOperationLock.readLock().unlock();
+ if (commitQueue.contains(c.getRevision())) {
+ try {
+ commitQueue.canceled(c.getRevision());
+ } finally {
+ backgroundOperationLock.readLock().unlock();
+ }
}
}
@@ -1863,6 +1878,36 @@ public final class DocumentNodeStore
//-----------------------------< internal >---------------------------------
+ @Nonnull
+ private Commit newTrunkCommit(@Nonnull Revision base) {
+ checkArgument(!checkNotNull(base).isBranch(),
+ "base must not be a branch revision: " + base);
+
+ backgroundOperationLock.readLock().lock();
+ boolean success = false;
+ Commit c;
+ try {
+ checkOpen();
+ c = new Commit(this, commitQueue.createRevision(), base, null);
+ success = true;
+ } finally {
+ if (!success) {
+ backgroundOperationLock.readLock().unlock();
+ }
+ }
+ return c;
+ }
+
+ @Nonnull
+ private Commit newBranchCommit(@Nonnull Revision base,
+ @Nullable DocumentNodeStoreBranch branch) {
+ checkArgument(checkNotNull(base).isBranch(),
+ "base must be a branch revision: " + base);
+
+ checkOpen();
+ return new Commit(this, newRevision(), base, branch);
+ }
+
/**
* Checks if this store is still open and throws an
* {@link IllegalStateException} if it is already disposed (or a dispose
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java?rev=1682820&r1=1682819&r2=1682820&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java Mon Jun 1 06:02:06 2015
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -26,30 +25,36 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
+import static java.util.Collections.synchronizedList;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
/**
* Tests for {@link CommitQueue}.
*/
public class CommitQueueTest {
+ private static final Logger LOG = LoggerFactory.getLogger(CommitQueueTest.class);
+
private static final int NUM_WRITERS = 10;
private static final int COMMITS_PER_WRITER = 100;
+ private List<Exception> exceptions = synchronizedList(new ArrayList<Exception>());
+
@Test
public void concurrentCommits() throws Exception {
final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
AtomicBoolean running = new AtomicBoolean(true);
- final List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
Closeable observer = store.addObserver(new Observer() {
private Revision before = new Revision(0, 0, store.getClusterId());
@@ -58,7 +63,7 @@ public class CommitQueueTest {
public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo info) {
DocumentNodeState after = (DocumentNodeState) root;
Revision r = after.getRevision();
- System.out.println("seen: " + r);
+ LOG.debug("seen: {}", r);
if (r.compareRevisionTime(before) < 0) {
exceptions.add(new Exception(
"Inconsistent revision sequence. Before: " +
@@ -106,46 +111,103 @@ public class CommitQueueTest {
running.set(false);
observer.close();
store.dispose();
- for (Exception e : exceptions) {
- throw e;
- }
+ assertNoExceptions();
}
- // OAK-2867
@Test
- public void doneFailsWithException() throws Exception {
- final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
- final CommitQueue commits = new CommitQueue(store,
- new ChangeDispatcher(store.getRoot()));
- Revision r = commits.createRevision();
- Commit c = new Commit(store, r, store.getHeadRevision(),
- store.createBranch(store.getRoot())) {
+ public void concurrentCommits2() throws Exception {
+ final CommitQueue queue = new CommitQueue() {
@Override
- public void applyToCache(Revision before, boolean isBranchCommit) {
- throw new RuntimeException("applyToCache");
+ protected Revision newRevision() {
+ return Revision.newRevision(1);
}
};
- try {
- commits.done(c, true, null);
- fail("must fail with RuntimeException");
- } catch (Exception e) {
- assertEquals("applyToCache", e.getMessage());
+ final CommitQueue.Callback c = new CommitQueue.Callback() {
+ private Revision before = Revision.newRevision(1);
+
+ @Override
+ public void headOfQueue(@Nonnull Revision r) {
+ LOG.debug("seen: {}", r);
+ if (r.compareRevisionTime(before) < 0) {
+ exceptions.add(new Exception(
+ "Inconsistent revision sequence. Before: " +
+ before + ", after: " + r));
+ }
+ before = r;
+ }
+ };
+
+ // perform commits with multiple threads
+ List<Thread> writers = new ArrayList<Thread>();
+ for (int i = 0; i < NUM_WRITERS; i++) {
+ final Random random = new Random(i);
+ writers.add(new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ for (int i = 0; i < COMMITS_PER_WRITER; i++) {
+ Revision r = queue.createRevision();
+ try {
+ Thread.sleep(0, random.nextInt(1000));
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ if (random.nextInt(5) == 0) {
+ // cancel 20% of the commits
+ queue.canceled(r);
+ } else {
+ queue.done(r, c);
+ }
+ }
+ } catch (Exception e) {
+ exceptions.add(e);
+ }
+ }
+ }));
}
+ for (Thread t : writers) {
+ t.start();
+ }
+ for (Thread t : writers) {
+ t.join();
+ }
+ assertNoExceptions();
+ }
+
+ // OAK-2868
+ @Test
+ public void branchCommitMustNotBlockTrunkCommit() throws Exception {
+ final DocumentNodeStore ds = new DocumentMK.Builder().getNodeStore();
+
+ // simulate start of a branch commit
+ Commit c = ds.newCommit(ds.getHeadRevision().asBranchRevision(), null);
Thread t = new Thread(new Runnable() {
@Override
public void run() {
- Commit c = new Commit(store, commits.createRevision(),
- store.getHeadRevision(), null);
- commits.done(c, false, null);
+ try {
+ NodeBuilder builder = ds.getRoot().builder();
+ builder.child("foo");
+ ds.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ } catch (CommitFailedException e) {
+ exceptions.add(e);
+ }
}
});
t.start();
+
t.join(3000);
assertFalse("Commit did not succeed within 3 seconds", t.isAlive());
- store.dispose();
+ ds.canceled(c);
+ ds.dispose();
+ assertNoExceptions();
}
+ private void assertNoExceptions() throws Exception {
+ if (!exceptions.isEmpty()) {
+ throw exceptions.get(0);
+ }
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1682820&r1=1682819&r2=1682820&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Mon Jun 1 06:02:06 2015
@@ -46,6 +46,7 @@ import org.apache.jackrabbit.oak.api.Blo
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.io.LazyInputStream;
import org.apache.jackrabbit.oak.plugins.index.IndexEditor;
@@ -117,6 +118,8 @@ public class LuceneIndexEditor implement
private final PathFilter.Result pathFilterResult;
+ private long extractedTextSize;
+
LuceneIndexEditor(NodeState root, NodeBuilder definition,
IndexUpdateCallback updateCallback,@Nullable IndexCopier indexCopier) throws CommitFailedException {
this.parent = null;
@@ -207,6 +210,7 @@ public class LuceneIndexEditor implement
if (context.getIndexedNodes() > 0) {
log.debug("{} => Indexed {} nodes, done.", context.getDefinition().getIndexName(), context.getIndexedNodes());
}
+ log.info("Extrcated text size {}", IOUtils.humanReadableByteCount(extractedTextSize));
}
}
@@ -784,6 +788,8 @@ public class LuceneIndexEditor implement
}
}
String result = handler.toString();
+ extractedTextSize += result.length();
+ log.info("Extrcated text size {}", IOUtils.humanReadableByteCount(extractedTextSize));
context.recordTextExtractionStats(System.currentTimeMillis() - start, size);
return result;
}