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 re...@apache.org on 2016/05/17 14:17:03 UTC
svn commit: r1744277 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
Author: reschke
Date: Tue May 17 14:17:03 2016
New Revision: 1744277
URL: http://svn.apache.org/viewvc?rev=1744277&view=rev
Log:
OAK-4372: VersionGarbageCollector - avoid unnecessary copying of NodeDocuments into Lists (ported to 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 14:17:03 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,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343
+/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,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1744277&r1=1744276&r2=1744277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java Tue May 17 14:17:03 2016
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-import static com.google.common.collect.ImmutableList.copyOf;
import static com.google.common.collect.Iterators.partition;
import static java.util.Collections.singletonMap;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -226,8 +225,9 @@ public class VersionGarbageCollector {
String id = doc.getId() + "/" + doc.getModified();
addDocument(id);
// Collect id of all previous docs also
- for (NodeDocument prevDoc : copyOf(doc.getAllPreviousDocs())) {
- addPreviousDocument(prevDoc.getId());
+ Iterator<NodeDocument> it = doc.getAllPreviousDocs();
+ while (it.hasNext()) {
+ addPreviousDocument(it.next().getId());
}
}
}
@@ -279,8 +279,9 @@ public class VersionGarbageCollector {
}
private void concurrentModification(NodeDocument doc) {
- for (NodeDocument prevDoc : copyOf(doc.getAllPreviousDocs())) {
- exclude.add(prevDoc.getId());
+ Iterator<NodeDocument> it = doc.getAllPreviousDocs();
+ while (it.hasNext()) {
+ exclude.add(it.next().getId());
}
}