Author: alexparvulescu Date: Mon Sep 19 10:09:02 2016 New Revision: 1761414
URL: http://svn.apache.org/viewvc?rev=1761414&view=rev Log: OAK-4043 Oak run checkpoints needs to account for multiple index lanes - merged r1761412 Modified: jackrabbit/oak/branches/1.4/ (props changed) jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsHelper.java Propchange: jackrabbit/oak/branches/1.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 19 10:09:02 2016 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740625-1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886 ,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755157,1756520,1756580,1757119,1757166,1760340,1760373,1760387,1760661-1760662 +/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740625-1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886 ,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755157,1756520,1756580,1757119,1757166,1760340,1760373,1760387,1760661-1760662,1761412 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java?rev=1761414&r1=1761413&r2=1761414&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java (original) +++ jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java Mon Sep 19 10:09:02 2016 @@ -16,10 +16,12 @@ */ package org.apache.jackrabbit.oak.checkpoint; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; -import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -35,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sta import com.google.common.collect.Lists; import static org.apache.jackrabbit.oak.plugins.document.CheckpointsHelper.getCheckpoints; +import static org.apache.jackrabbit.oak.plugins.document.CheckpointsHelper.min; import static org.apache.jackrabbit.oak.plugins.document.CheckpointsHelper.removeOlderThan; /** @@ -120,13 +123,13 @@ public abstract class Checkpoints { public long removeUnreferenced() { SegmentNodeState head = store.getHead(); - String ref = getReferenceCheckpoint(head.getChildNode("root")); + Set<String> refs = getReferencedCheckpoints(head.getChildNode("root")); NodeBuilder builder = head.builder(); NodeBuilder cps = builder.getChildNode("checkpoints"); long cnt = 0; for (String c : cps.getChildNodeNames()) { - if (c.equals(ref)) { + if (refs.contains(c)) { continue; } cps.getChildNode(c).remove(); @@ -190,11 +193,11 @@ public abstract class Checkpoints { @Override public long removeUnreferenced() { - String ref = getReferenceCheckpoint(store.getRoot()); + Revision ref = min(getReferencedCheckpoints(store.getRoot())); if (ref == null) { return -1; } - return removeOlderThan(store, Revision.fromString(ref)); + return removeOlderThan(store, ref); } @Override @@ -209,18 +212,19 @@ public abstract class Checkpoints { } } - @CheckForNull - private static String getReferenceCheckpoint(NodeState root) { - String ref = null; - PropertyState refPS = root.getChildNode(":async").getProperty("async"); - if (refPS != null) { - ref = refPS.getValue(Type.STRING); - } - if (ref != null) { - System.out.println( - "Referenced checkpoint from /:async@async is " + ref); + @Nonnull + static Set<String> getReferencedCheckpoints(NodeState root) { + Set<String> cps = new HashSet<String>(); + for (PropertyState ps : root.getChildNode(":async").getProperties()) { + String name = ps.getName(); + if (name.endsWith("async") && ps.getType().equals(Type.STRING)) { + String ref = ps.getValue(Type.STRING); + System.out.println("Referenced checkpoint from /:async@" + name + + " is " + ref); + cps.add(ref); + } } - return ref; + return cps; } public static final class CP { Modified: jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsHelper.java?rev=1761414&r1=1761413&r2=1761414&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsHelper.java (original) +++ jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsHelper.java Mon Sep 19 10:09:02 2016 @@ -19,11 +19,13 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.Map; +import java.util.Set; import java.util.SortedMap; import com.google.common.collect.Maps; import static org.apache.jackrabbit.oak.plugins.document.Checkpoints.Info; +import org.apache.jackrabbit.oak.plugins.document.util.Utils; /** * Helper class to access package private functionality. @@ -69,4 +71,15 @@ public abstract class CheckpointsHelper } } + public static Revision min(Set<String> revs) { + if (revs == null || revs.isEmpty()) { + return null; + } + Revision r = null; + for (String cp : revs) { + r = Utils.min(r, Revision.fromString(cp)); + } + return r; + } + }
