Author: alexparvulescu Date: Fri Feb 20 20:50:24 2015 New Revision: 1661216
URL: http://svn.apache.org/r1661216 Log: OAK-2294 Corrupt repository after concurrent version operations - merged r1661158 and r1661146 Added: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersion.java - copied unchanged from r1661146, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersion.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java - copied, changed from r1661146, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java - copied unchanged from r1661146, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java Modified: jackrabbit/oak/branches/1.0/ (props changed) jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java Propchange: jackrabbit/oak/branches/1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 20 20:50:24 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,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,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,1609165,1609214,1609 488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,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,1627586,1627590,1627715,1627731,1628180,1628198,1 628262,1628447,1628608,1629688,1629840,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,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,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,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211 9,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,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1661069,1661122 +/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,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,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,1609165,1609214,1609 488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,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,1627586,1627590,1627715,1627731,1628180,1628198,1 628262,1628447,1628608,1629688,1629840,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,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,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,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211 9,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,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1661069,1661122,1661146,1661158 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java Fri Feb 20 20:50:24 2015 @@ -21,6 +21,7 @@ import static com.google.common.base.Pre import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Lists.newArrayListWithCapacity; import static com.google.common.collect.Maps.newConcurrentMap; +import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; import static org.apache.jackrabbit.oak.plugins.segment.SegmentWriter.BLOCK_SIZE; import java.io.IOException; @@ -44,14 +45,6 @@ import com.google.common.base.Charsets; public class Segment { /** - * Version of the segment storage format. - * <ul> - * <li>10 = all Oak versions released so far</li> - * </ul> - */ - public static final byte STORAGE_FORMAT_VERSION = 10; - - /** * Number of bytes used for storing a record identifier. One byte * is used for identifying the segment and two for the record offset * within that segment. @@ -109,6 +102,11 @@ public class Segment { private final ByteBuffer data; /** + * Version of the segment storage format. + */ + private final SegmentVersion version; + + /** * Referenced segment identifiers. Entries are initialized lazily in * {@link #getRefId(int)}. Set to {@code null} for bulk segments. */ @@ -129,19 +127,25 @@ public class Segment { private volatile long accessed = 0; public Segment(SegmentTracker tracker, SegmentId id, ByteBuffer data) { + this(tracker, id, data, V_11); + } + + public Segment(SegmentTracker tracker, SegmentId id, ByteBuffer data, SegmentVersion version) { this.tracker = checkNotNull(tracker); this.id = checkNotNull(id); this.data = checkNotNull(data); - if (id.isDataSegmentId()) { + byte segmentVersion = data.get(3); checkState(data.get(0) == '0' && data.get(1) == 'a' && data.get(2) == 'K' - && data.get(3) == STORAGE_FORMAT_VERSION); + && SegmentVersion.isValid(segmentVersion)); this.refids = new SegmentId[getRefCount()]; - refids[0] = id; + this.refids[0] = id; + this.version = SegmentVersion.fromByte(segmentVersion); } else { this.refids = null; + this.version = version; } } @@ -149,9 +153,9 @@ public class Segment { this.tracker = checkNotNull(tracker); this.id = tracker.newDataSegmentId(); this.data = ByteBuffer.wrap(checkNotNull(buffer)); - this.refids = new SegmentId[SEGMENT_REFERENCE_LIMIT + 1]; - refids[0] = id; + this.refids[0] = id; + this.version = SegmentVersion.fromByte(buffer[3]); } void access() { @@ -163,6 +167,10 @@ public class Segment { return accessed != 0; } + SegmentVersion getSegmentVersion() { + return version; + } + /** * Maps the given record offset to the respective position within the * internal {@link #data} array. The validity of a record with the given @@ -411,19 +419,41 @@ public class Segment { offset += Segment.RECORD_ID_BYTES; } - PropertyTemplate[] properties = - new PropertyTemplate[propertyCount]; - for (int i = 0; i < properties.length; i++) { + PropertyTemplate[] properties; + if (version.onOrAfter(V_11)) { + properties = readPropsV11(propertyCount, offset); + } else { + properties = readPropsV10(propertyCount, offset); + } + return new Template(primaryType, mixinTypes, properties, childName); + } + + private PropertyTemplate[] readPropsV10(int propertyCount, int offset) { + PropertyTemplate[] properties = new PropertyTemplate[propertyCount]; + for (int i = 0; i < propertyCount; i++) { RecordId propertyNameId = readRecordId(offset); offset += Segment.RECORD_ID_BYTES; byte type = readByte(offset++); - properties[i] = new PropertyTemplate( - i, readString(propertyNameId), + properties[i] = new PropertyTemplate(i, readString(propertyNameId), Type.fromTag(Math.abs(type), type < 0)); } + return properties; + } - return new Template( - primaryType, mixinTypes, properties, childName); + private PropertyTemplate[] readPropsV11(int propertyCount, int offset) { + PropertyTemplate[] properties = new PropertyTemplate[propertyCount]; + if (propertyCount > 0) { + RecordId id = readRecordId(offset); + ListRecord propertyNames = new ListRecord(id, properties.length); + offset += Segment.RECORD_ID_BYTES; + for (int i = 0; i < propertyCount; i++) { + byte type = readByte(offset++); + properties[i] = new PropertyTemplate(i, + readString(propertyNames.getEntry(i)), Type.fromTag( + Math.abs(type), type < 0)); + } + } + return properties; } long readLength(RecordId id) { Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java Fri Feb 20 20:50:24 2015 @@ -16,21 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.segment; -import java.util.Collections; -import java.util.List; - -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - -import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; -import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; -import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; -import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; -import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; - import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayListWithCapacity; @@ -46,8 +31,28 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; +import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName; +import java.util.Collections; +import java.util.List; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; +import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; +import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; +import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; + +/** + * A record of type "NODE". This class can read a node record from a segment. It + * currently doesn't cache data (but the template is fully loaded). + */ public class SegmentNodeState extends Record implements NodeState { private volatile RecordId templateId = null; @@ -130,17 +135,39 @@ public class SegmentNodeState extends Re template.getPropertyTemplate(name); if (propertyTemplate != null) { Segment segment = getSegment(); - int ids = 1 + propertyTemplate.getIndex(); - if (template.getChildName() != Template.ZERO_CHILD_NODES) { - ids++; + RecordId id; + if (getSegment().getSegmentVersion().onOrAfter(V_11)) { + id = getRecordIdV11(segment, template, propertyTemplate); + } else { + id = getRecordIdV10(segment, template, propertyTemplate); } - return new SegmentPropertyState( - segment.readRecordId(getOffset(0, ids)), propertyTemplate); + return new SegmentPropertyState(id, propertyTemplate); } else { return null; } } + private RecordId getRecordIdV10(Segment segment, Template template, + PropertyTemplate propertyTemplate) { + int ids = 1 + propertyTemplate.getIndex(); + if (template.getChildName() != Template.ZERO_CHILD_NODES) { + ids++; + } + return segment.readRecordId(getOffset(0, ids)); + } + + private RecordId getRecordIdV11(Segment segment, Template template, + PropertyTemplate propertyTemplate) { + int ids = 1; + if (template.getChildName() != Template.ZERO_CHILD_NODES) { + ids++; + } + RecordId rid = segment.readRecordId(getOffset(0, ids)); + ListRecord pIds = new ListRecord(rid, + template.getPropertyTemplates().length); + return pIds.getEntry(propertyTemplate.getIndex()); + } + @Override @Nonnull public Iterable<PropertyState> getProperties() { Template template = getTemplate(); @@ -163,10 +190,24 @@ public class SegmentNodeState extends Re if (template.getChildName() != Template.ZERO_CHILD_NODES) { ids++; } - for (int i = 0; i < propertyTemplates.length; i++) { - RecordId propertyId = segment.readRecordId(getOffset(0, ids++)); - list.add(new SegmentPropertyState( - propertyId, propertyTemplates[i])); + + if (segment.getSegmentVersion().onOrAfter(V_11)) { + if (propertyTemplates.length > 0) { + ListRecord pIds = new ListRecord( + segment.readRecordId(getOffset(0, ids)), + propertyTemplates.length); + for (int i = 0; i < propertyTemplates.length; i++) { + RecordId propertyId = pIds.getEntry(i); + list.add(new SegmentPropertyState(propertyId, + propertyTemplates[i])); + } + } + } else { + for (int i = 0; i < propertyTemplates.length; i++) { + RecordId propertyId = segment.readRecordId(getOffset(0, ids++)); + list.add(new SegmentPropertyState(propertyId, + propertyTemplates[i])); + } } return list; @@ -243,11 +284,13 @@ public class SegmentNodeState extends Re } Segment segment = getSegment(); - int ids = 1 + propertyTemplate.getIndex(); - if (template.getChildName() != Template.ZERO_CHILD_NODES) { - ids++; + RecordId id; + if (getSegment().getSegmentVersion().onOrAfter(V_11)) { + id = getRecordIdV11(segment, template, propertyTemplate); + } else { + id = getRecordIdV10(segment, template, propertyTemplate); } - return segment.readString(segment.readRecordId(getOffset(0, ids))); + return segment.readString(id); } /** @@ -284,12 +327,12 @@ public class SegmentNodeState extends Re } Segment segment = getSegment(); - int ids = 1 + propertyTemplate.getIndex(); - if (template.getChildName() != Template.ZERO_CHILD_NODES) { - ids++; + RecordId id; + if (getSegment().getSegmentVersion().onOrAfter(V_11)) { + id = getRecordIdV11(segment, template, propertyTemplate); + } else { + id = getRecordIdV10(segment, template, propertyTemplate); } - - RecordId id = segment.readRecordId(getOffset(0, ids)); segment = id.getSegment(); int size = segment.readInt(id.getOffset()); if (size == 0) { Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Fri Feb 20 20:50:24 2015 @@ -91,20 +91,25 @@ public class SegmentTracker { private long currentSize = 0; - public SegmentTracker(SegmentStore store, int cacheSizeMB) { + public SegmentTracker(SegmentStore store, int cacheSizeMB, + SegmentVersion version) { for (int i = 0; i < tables.length; i++) { tables[i] = new SegmentIdTable(this); } this.store = store; - this.writer = new SegmentWriter(store, this); + this.writer = new SegmentWriter(store, this, version); this.cacheSize = cacheSizeMB * MB; this.compactionMap = new AtomicReference<CompactionMap>( new CompactionMap(1, this)); } + public SegmentTracker(SegmentStore store, SegmentVersion version) { + this(store, DEFAULT_MEMORY_CACHE_SIZE, version); + } + public SegmentTracker(SegmentStore store) { - this(store, DEFAULT_MEMORY_CACHE_SIZE); + this(store, DEFAULT_MEMORY_CACHE_SIZE, SegmentVersion.V_11); } public SegmentWriter getWriter() { Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java Fri Feb 20 20:50:24 2015 @@ -38,7 +38,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.plugins.segment.Segment.MAX_SEGMENT_SIZE; import static org.apache.jackrabbit.oak.plugins.segment.Segment.RECORD_ID_BYTES; import static org.apache.jackrabbit.oak.plugins.segment.Segment.SEGMENT_REFERENCE_LIMIT; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.STORAGE_FORMAT_VERSION; +import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -81,12 +81,12 @@ public class SegmentWriter { static final int BLOCK_SIZE = 1 << 12; // 4kB - static byte[] createNewBuffer() { + static byte[] createNewBuffer(SegmentVersion v) { byte[] buffer = new byte[Segment.MAX_SEGMENT_SIZE]; buffer[0] = '0'; buffer[1] = 'a'; buffer[2] = 'K'; - buffer[3] = STORAGE_FORMAT_VERSION; + buffer[3] = SegmentVersion.asByte(v); buffer[4] = 0; // reserved buffer[5] = 0; // refcount return buffer; @@ -110,6 +110,7 @@ public class SegmentWriter { * avoid storing duplicates of frequently occurring data. * Should only be accessed from synchronized blocks to prevent corruption. */ + @SuppressWarnings("serial") private final Map<Object, RecordId> records = new LinkedHashMap<Object, RecordId>(15000, 0.75f, true) { @Override @@ -133,7 +134,7 @@ public class SegmentWriter { * The segment write buffer, filled from the end to the beginning * (see OAK-629). */ - private byte[] buffer = createNewBuffer(); + private byte[] buffer; /** * The number of bytes already written (or allocated). Counted from @@ -149,9 +150,16 @@ public class SegmentWriter { private Segment segment; - public SegmentWriter(SegmentStore store, SegmentTracker tracker) { + /** + * Version of the segment storage format. + */ + private final SegmentVersion version; + + public SegmentWriter(SegmentStore store, SegmentTracker tracker, SegmentVersion version) { this.store = store; this.tracker = tracker; + this.version = version; + this.buffer = createNewBuffer(version); this.segment = new Segment(tracker, buffer); segment.getSegmentId().setSegment(segment); } @@ -226,7 +234,7 @@ public class SegmentWriter { } tracker.setSegment(id, new Segment(tracker, id, data)); - buffer = createNewBuffer(); + buffer = createNewBuffer(version); roots.clear(); blobrefs.clear(); length = 0; @@ -390,7 +398,6 @@ public class SegmentWriter { } } - private synchronized RecordId writeListBucket(List<RecordId> bucket) { checkArgument(bucket.size() > 1); RecordId bucketId = prepare(RecordType.BUCKET, 0, bucket); @@ -912,7 +919,17 @@ public class SegmentWriter { propertyTypes[i] = (byte) type.tag(); } } - ids.addAll(Arrays.asList(propertyNames)); + + RecordId propNamesId = null; + if (segment.getSegmentVersion().onOrAfter(V_11)) { + if (propertyNames.length > 0) { + propNamesId = writeList(Arrays.asList(propertyNames)); + ids.add(propNamesId); + } + } else { + ids.addAll(Arrays.asList(propertyNames)); + } + checkState(propertyNames.length < (1 << 18)); head |= propertyNames.length; @@ -929,8 +946,16 @@ public class SegmentWriter { if (childNameId != null) { writeRecordId(childNameId); } + if (segment.getSegmentVersion().onOrAfter(V_11)) { + if (propNamesId != null) { + writeRecordId(propNamesId); + } + } for (int i = 0; i < propertyNames.length; i++) { - writeRecordId(propertyNames[i]); + if (!segment.getSegmentVersion().onOrAfter(V_11)) { + // V10 only + writeRecordId(propertyNames[i]); + } buffer[position++] = propertyTypes[i]; } @@ -1023,36 +1048,45 @@ public class SegmentWriter { ids.add(writeNode(state.getChildNode(template.getChildName())).getRecordId()); } + List<RecordId> pIds = Lists.newArrayList(); for (PropertyTemplate pt : template.getPropertyTemplates()) { String name = pt.getName(); PropertyState property = state.getProperty(name); if (property instanceof SegmentPropertyState && store.containsSegment(((SegmentPropertyState) property).getRecordId().getSegmentId())) { - ids.add(((SegmentPropertyState) property).getRecordId()); + pIds.add(((SegmentPropertyState) property).getRecordId()); } else if (before == null || !store.containsSegment(before.getRecordId().getSegmentId())) { - ids.add(writeProperty(property)); + pIds.add(writeProperty(property)); } else { // reuse previously stored property, if possible PropertyTemplate bt = beforeTemplate.getPropertyTemplate(name); if (bt == null) { - ids.add(writeProperty(property)); // new property + pIds.add(writeProperty(property)); // new property } else { SegmentPropertyState bp = beforeTemplate.getProperty( before.getRecordId(), bt.getIndex()); if (property.equals(bp)) { - ids.add(bp.getRecordId()); // no changes + pIds.add(bp.getRecordId()); // no changes } else if (bp.isArray() && bp.getType() != BINARIES) { // reuse entries from the previous list - ids.add(writeProperty(property, bp.getValueRecords())); + pIds.add(writeProperty(property, bp.getValueRecords())); } else { - ids.add(writeProperty(property)); + pIds.add(writeProperty(property)); } } } } + if (!pIds.isEmpty()) { + if (segment.getSegmentVersion().onOrAfter(V_11)) { + ids.add(writeList(pIds)); + } else { + ids.addAll(pIds); + } + } + synchronized (this) { RecordId recordId = prepare(RecordType.NODE, 0, ids); for (RecordId id : ids) { Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java Fri Feb 20 20:50:24 2015 @@ -22,6 +22,7 @@ import static com.google.common.base.Pre import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; import static org.apache.jackrabbit.oak.plugins.segment.Record.fastEquals; import static org.apache.jackrabbit.oak.plugins.segment.Segment.RECORD_ID_BYTES; +import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; import java.util.Arrays; import java.util.Collections; @@ -167,9 +168,16 @@ public class Template { if (childName != ZERO_CHILD_NODES) { offset += RECORD_ID_BYTES; } - offset += index * RECORD_ID_BYTES; - return new SegmentPropertyState( - segment.readRecordId(offset), properties[index]); + RecordId rid = null; + if (segment.getSegmentVersion().onOrAfter(V_11)) { + RecordId lid = segment.readRecordId(offset); + ListRecord props = new ListRecord(lid, properties.length); + rid = props.getEntry(index); + } else { + offset += index * RECORD_ID_BYTES; + rid = segment.readRecordId(offset); + } + return new SegmentPropertyState(rid, properties[index]); } MapRecord getChildNodeMap(RecordId recordId) { Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Fri Feb 20 20:50:24 2015 @@ -50,6 +50,7 @@ import java.util.regex.Pattern; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; + import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.plugins.blob.BlobStoreBlob; import org.apache.jackrabbit.oak.plugins.segment.CompactionMap; @@ -62,6 +63,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.segment.SegmentNotFoundException; import org.apache.jackrabbit.oak.plugins.segment.SegmentStore; import org.apache.jackrabbit.oak.plugins.segment.SegmentTracker; +import org.apache.jackrabbit.oak.plugins.segment.SegmentVersion; import org.apache.jackrabbit.oak.plugins.segment.SegmentWriter; import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -146,6 +148,11 @@ public class FileStore implements Segmen */ private final LinkedList<File> toBeRemoved = newLinkedList(); + /** + * Version of the segment storage format. + */ + private final SegmentVersion version = SegmentVersion.V_11; + public FileStore(BlobStore blobStore, File directory, int maxFileSizeMB, boolean memoryMapping) throws IOException { this(blobStore, directory, EMPTY_NODE, maxFileSizeMB, 0, memoryMapping); @@ -171,10 +178,12 @@ public class FileStore implements Segmen int maxFileSizeMB, int cacheSizeMB, boolean memoryMapping) throws IOException { checkNotNull(directory).mkdirs(); - if (cacheSizeMB > 0) { - this.tracker = new SegmentTracker(this, cacheSizeMB); + if (cacheSizeMB < 0) { + this.tracker = new SegmentTracker(this, 0, getVersion()); + } else if (cacheSizeMB > 0) { + this.tracker = new SegmentTracker(this, cacheSizeMB, getVersion()); } else { - this.tracker = new SegmentTracker(this); + this.tracker = new SegmentTracker(this, getVersion()); } this.blobStore = blobStore; this.directory = directory; @@ -509,7 +518,7 @@ public class FileStore implements Segmen log.info("TarMK compaction running, strategy={}", compactionStrategy); long start = System.currentTimeMillis(); - SegmentWriter writer = new SegmentWriter(this, tracker); + SegmentWriter writer = new SegmentWriter(this, tracker, getVersion()); final Compactor compactor = new Compactor(writer, compactionStrategy.cloneBinaries()); SegmentNodeState before = getHead(); long existing = before.getChildNode(SegmentNodeStore.CHECKPOINTS) @@ -585,6 +594,7 @@ public class FileStore implements Segmen flush(); writer.close(); + tracker.getWriter().dropCache(); List<TarReader> list = readers; readers = newArrayList(); @@ -771,4 +781,8 @@ public class FileStore implements Segmen } } } + + public SegmentVersion getVersion() { + return version; + } } Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java Fri Feb 20 20:50:24 2015 @@ -90,7 +90,7 @@ public class SegmentIdFactoryTest { @Test(expected = IllegalStateException.class) public void dataAIOOBE() { SegmentId id = factory.newDataSegmentId(); - byte[] buffer = SegmentWriter.createNewBuffer(); + byte[] buffer = SegmentWriter.createNewBuffer(SegmentVersion.V_11); ByteBuffer data = ByteBuffer.allocate(Segment.MAX_SEGMENT_SIZE); data.put(buffer); data.rewind(); Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java Fri Feb 20 20:50:24 2015 @@ -51,8 +51,8 @@ public class SegmentSizeTest { builder = EMPTY_NODE.builder(); builder.setProperty("foo", "bar"); builder.setProperty("baz", 123); - assertEquals(64, getSize(builder)); - assertEquals(12, getAmortizedSize(builder)); + assertEquals(80, getSize(builder)); + assertEquals(16, getAmortizedSize(builder)); builder = EMPTY_NODE.builder(); builder.child("foo"); @@ -127,15 +127,15 @@ public class SegmentSizeTest { deny.setProperty(PropertyStates.createProperty( "rep:privileges", ImmutableList.of("jcr:read"), Type.NAMES)); assertEquals(176, getSize(builder)); - assertEquals(28, getAmortizedSize(builder)); + assertEquals(32, getAmortizedSize(builder)); NodeBuilder allow = builder.child("allow"); allow.setProperty("jcr:primaryType", "rep:GrantACE"); allow.setProperty("rep:principalName", "administrators"); allow.setProperty(PropertyStates.createProperty( "rep:privileges", ImmutableList.of("jcr:all"), Type.NAMES)); - assertEquals(288, getSize(builder)); - assertEquals(72, getAmortizedSize(builder)); + assertEquals(320, getSize(builder)); + assertEquals(84, getAmortizedSize(builder)); NodeBuilder deny0 = builder.child("deny0"); deny0.setProperty("jcr:primaryType", "rep:DenyACE", Type.NAME); @@ -143,16 +143,16 @@ public class SegmentSizeTest { deny0.setProperty("rep:glob", "*/activities/*"); builder.setProperty(PropertyStates.createProperty( "rep:privileges", ImmutableList.of("jcr:read"), Type.NAMES)); - assertEquals(384, getSize(builder)); - assertEquals(108, getAmortizedSize(builder)); + assertEquals(416, getSize(builder)); + assertEquals(124, getAmortizedSize(builder)); NodeBuilder allow0 = builder.child("allow0"); allow0.setProperty("jcr:primaryType", "rep:GrantACE"); allow0.setProperty("rep:principalName", "user-administrators"); allow0.setProperty(PropertyStates.createProperty( "rep:privileges", ImmutableList.of("jcr:all"), Type.NAMES)); - assertEquals(432, getSize(builder)); - assertEquals(136, getAmortizedSize(builder)); + assertEquals(480, getSize(builder)); + assertEquals(160, getAmortizedSize(builder)); } @Test Copied: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java (from r1661146, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java?p2=jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java&r1=1661146&r2=1661216&rev=1661216&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java Fri Feb 20 20:50:24 2015 @@ -24,6 +24,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; @@ -31,12 +32,13 @@ import java.io.IOException; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.json.JsopDiff; +import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; 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.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; @@ -81,9 +83,43 @@ public class SegmentVersionTest { NodeState content = addTestContent(fileStoreV10).getChildNode("content"); NodeBuilder builder = content.builder(); builder.setChildNode("foo"); - JsopDiff diff = new JsopDiff(); - content.compareAgainstBaseState(builder.getNodeState(), diff); - assertEquals("-\"/foo\"", diff.toString()); + content.compareAgainstBaseState(builder.getNodeState(), new NodeStateDiff() { + @Override + public boolean propertyAdded(PropertyState after) { + fail(); + return false; + } + + @Override + public boolean propertyChanged(PropertyState before, PropertyState after) { + fail(); + return false; + } + + @Override + public boolean propertyDeleted(PropertyState before) { + fail(); + return false; + } + + @Override + public boolean childNodeAdded(String name, NodeState after) { + fail(); + return false; + } + + @Override + public boolean childNodeChanged(String name, NodeState before, NodeState after) { + fail(); + return false; + } + + @Override + public boolean childNodeDeleted(String name, NodeState before) { + assertEquals("foo", name); + return false; + } + }); } finally { fileStoreV10.close(); } Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java Fri Feb 20 20:50:24 2015 @@ -21,6 +21,7 @@ import static com.google.common.collect. import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; import java.io.ByteArrayInputStream; import java.io.File; @@ -139,7 +140,7 @@ public class FileStoreTest { store = new FileStore(directory, 1, false); head = store.getHead(); assertTrue(store.size() > largeBinarySize); - writer = new SegmentWriter(store, store.getTracker()); + writer = new SegmentWriter(store, store.getTracker(), V_11); compactor = new Compactor(writer); compacted = compactor.compact(EmptyNodeState.EMPTY_NODE, head); builder = head.builder(); Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java?rev=1661216&r1=1661215&r2=1661216&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java Fri Feb 20 20:50:24 2015 @@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.plugins.segment.file; -import static java.lang.String.valueOf; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -31,7 +30,6 @@ import java.util.concurrent.FutureTask; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.SegmentOverflowException; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -43,13 +41,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class SegmentReferenceLimitTestIT { + private static final Logger LOG = LoggerFactory.getLogger(SegmentReferenceLimitTestIT.class); private File directory; @Before public void setUp() throws IOException { - directory = File.createTempFile("FileStoreTest", "dir", new File("target")); + directory = File.createTempFile("SegmentReferenceLimitTestIT", "dir", new File("target")); directory.delete(); directory.mkdir(); } @@ -63,6 +62,12 @@ public class SegmentReferenceLimitTestIT } } + /** + * OAK-2294 Corrupt repository after concurrent version operations + * + * @see <a + * href="https://issues.apache.org/jira/browse/OAK-2294";>OAK-2294</a> + */ @Test public void corruption() throws IOException, CommitFailedException, ExecutionException, InterruptedException { FileStore fileStore = new FileStore(directory, 1, 0, false); @@ -72,19 +77,15 @@ public class SegmentReferenceLimitTestIT root.setChildNode("test"); nodeStore.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY); - FutureTask<Void> w1 = run(new Worker(nodeStore, "w1")); - FutureTask<Void> w2 = run(new Worker(nodeStore, "w2")); - FutureTask<Void> w3 = run(new Worker(nodeStore, "w3")); - FutureTask<Void> w4 = run(new Worker(nodeStore, "w4")); + List<FutureTask<Void>> l = new ArrayList<FutureTask<Void>>(); + for (int i = 0; i < 10; i++) { + l.add(run(new Worker(nodeStore, "w" + i))); + } try { - w1.get(); - w2.get(); - w3.get(); - w4.get(); - } catch (ExecutionException e) { - assertTrue(valueOf(e.getCause()), e.getCause() instanceof CommitFailedException); - assertTrue(valueOf(e.getCause()), e.getCause().getCause() instanceof SegmentOverflowException); + for (FutureTask<Void> w : l) { + w.get(); + } } finally { fileStore.close(); } @@ -107,11 +108,12 @@ public class SegmentReferenceLimitTestIT @Override public Void call() throws Exception { - for (int k = 0; ; k++) { + for (int k = 0; k < 400; k++) { NodeBuilder root = nodeStore.getRoot().builder(); root.getChildNode("test").setProperty(name + ' ' + k, name + " value " + k); nodeStore.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY); } + return null; } }
