Author: alexparvulescu Date: Thu Jun 23 14:45:43 2016 New Revision: 1749908
URL: http://svn.apache.org/viewvc?rev=1749908&view=rev Log: OAK-4493 Offline compaction persisted mode - merged r1749899 Modified: jackrabbit/oak/branches/1.4/ (props changed) jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java Propchange: jackrabbit/oak/branches/1.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 23 14:45:43 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 +/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 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java?rev=1749908&r1=1749907&r2=1749908&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java (original) +++ jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java Thu Jun 23 14:45:43 2016 @@ -56,6 +56,15 @@ public class Compactor { /** Logger instance */ private static final Logger log = LoggerFactory.getLogger(Compactor.class); + private static boolean eagerFlush = Boolean + .getBoolean("oak.compaction.eagerFlush"); + + static { + if (eagerFlush) { + log.debug("Eager flush enabled."); + } + } + /** * Locks down the RecordId persistence structure */ @@ -245,7 +254,12 @@ public class Compactor { progress.onNode(); try { - NodeBuilder child = EMPTY_NODE.builder(); + NodeBuilder child; + if (eagerFlush) { + child = builder.setChildNode(name); + } else { + child = EMPTY_NODE.builder(); + } boolean success = new CompactDiff(child, path, name).diff(EMPTY_NODE, after); if (success) { SegmentNodeState state = writer.writeNode(child.getNodeState());
