Author: alexparvulescu Date: Thu Jun 30 07:04:26 2016 New Revision: 1750748
URL: http://svn.apache.org/viewvc?rev=1750748&view=rev Log: OAK-3797 SegmentTracker#collectBlobReferences should retain fewer SegmentId instances - merged r1748722 Modified: jackrabbit/oak/branches/1.4/ (props changed) jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Propchange: jackrabbit/oak/branches/1.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 30 07:04:26 2016 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746345,1746696,1746981,1747341-1747342,1747492,1747512,1748505,1748553,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626 +/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746345,1746696,1746981,1747341-1747342,1747492,1747512,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1750748&r1=1750747&r2=1750748&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java (original) +++ jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Thu Jun 30 07:04:26 2016 @@ -24,6 +24,7 @@ import java.io.IOException; import java.security.SecureRandom; import java.util.Queue; import java.util.Set; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; @@ -289,20 +290,25 @@ public class SegmentTracker { */ public void collectBlobReferences(ReferenceCollector collector) { try { - Set<SegmentId> processed = newHashSet(); - Queue<SegmentId> queue = newArrayDeque(getReferencedSegmentIds()); + Set<UUID> processed = newHashSet(); + for (SegmentId sid : getReferencedSegmentIds()) { + if (sid.isDataSegmentId()) { + processed.add(sid.asUUID()); + } + } + Queue<UUID> queue = newArrayDeque(processed); writer.flush(); // force the current segment to have root record info while (!queue.isEmpty()) { - SegmentId id = queue.remove(); - if (id.isDataSegmentId() && processed.add(id)) { - Segment segment = id.getSegment(); - - segment.collectBlobReferences(collector); - - for (SegmentId refid : segment.getReferencedIds()) { - if (refid.isDataSegmentId() && !processed.contains(refid)) { - queue.add(refid); - } + UUID uid = queue.remove(); + SegmentId id = getSegmentId(uid.getMostSignificantBits(), + uid.getLeastSignificantBits()); + Segment segment = id.getSegment(); + segment.collectBlobReferences(collector); + for (SegmentId refid : segment.getReferencedIds()) { + UUID rid = refid.asUUID(); + if (refid.isDataSegmentId() && !processed.contains(rid)) { + queue.add(rid); + processed.add(rid); } } }
