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 ba...@apache.org on 2016/09/27 12:01:52 UTC
svn commit: r1762461 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
Author: baedke
Date: Tue Sep 27 12:01:52 2016
New Revision: 1762461
URL: http://svn.apache.org/viewvc?rev=1762461&view=rev
Log:
OAK-4552: Checkpoints.getOldestRevisionToKeep() returns newest valid revision
Implement fix, enable test and update existing tests to match expectations.
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 27 12:01:52 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,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787
+/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,1752259,1752273-1752274,1752283,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755157,1756520,1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java?rev=1762461&r1=1762460&r2=1762461&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java Tue Sep 27 12:01:52 2016
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,15 +129,18 @@ class Checkpoints {
final long currentTime = nodeStore.getClock().getTime();
UpdateOp op = new UpdateOp(ID, false);
Revision lastAliveRevision = null;
- long oldestExpiryTime = 0;
for (Map.Entry<Revision, Info> e : checkpoints.entrySet()) {
- final long expiryTime = e.getValue().getExpiryTime();
+ long expiryTime = e.getValue().getExpiryTime();
if (currentTime > expiryTime) {
op.removeMapEntry(PROP_CHECKPOINT, e.getKey());
- } else if (expiryTime > oldestExpiryTime) {
- oldestExpiryTime = expiryTime;
- lastAliveRevision = e.getKey();
+ } else {
+ Revision cpRev = e.getKey();
+ RevisionVector rv = e.getValue().getCheckpoint();
+ if (rv != null) {
+ cpRev = rv.getRevision(cpRev.getClusterId());
+ }
+ lastAliveRevision = Utils.min(lastAliveRevision, cpRev);
}
}
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java?rev=1762461&r1=1762460&r2=1762461&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java Tue Sep 27 12:01:52 2016
@@ -36,6 +36,7 @@ import com.google.common.collect.Immutab
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
@@ -59,8 +60,9 @@ public class CheckpointsTest {
@Test
public void testCheckpointPurge() throws Exception {
long expiryTime = 1000;
- Revision r1 = Revision.fromString(store.checkpoint(expiryTime));
- assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep());
+ String r1 = store.getHeadRevision().toString();
+ store.checkpoint(expiryTime);
+ assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep().toString());
//Trigger expiry by forwarding the clock to future
clock.waitUntil(clock.getTime() + expiryTime + 1);
@@ -70,12 +72,12 @@ public class CheckpointsTest {
@Test
public void testCheckpointPurgeByCount() throws Exception {
long expiryTime = TimeUnit.HOURS.toMillis(1);
- Revision r1 = null;
+ String head = store.getHeadRevision().toString();
for(int i = 0; i < Checkpoints.CLEANUP_INTERVAL; i++){
- r1 = Revision.fromString(store.checkpoint(expiryTime));
+ store.checkpoint(expiryTime);
store.setRoot(new RevisionVector(Revision.newRevision(store.getClusterId())));
}
- assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep());
+ assertEquals(head, store.getCheckpoints().getOldestRevisionToKeep().toString());
assertEquals(Checkpoints.CLEANUP_INTERVAL, store.getCheckpoints().size());
//Trigger expiry by forwarding the clock to future
@@ -94,42 +96,51 @@ public class CheckpointsTest {
//Create CP with higher expiry first and then one with
//lower expiry
- Revision r2 = Revision.fromString(store.checkpoint(e2));
- Revision r1 = Revision.fromString(store.checkpoint(e1));
+ String r2 = store.getHeadRevision().toString();
+ String c2 = store.checkpoint(e2);
+
+ //Do some commit to change headRevision
+ NodeBuilder b2 = store.getRoot().builder();
+ b2.child("x");
+ store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ String c1 = store.checkpoint(e1);
clock.waitUntil(clock.getTime() + e1 + 1);
//The older checkpoint was for greater duration so checkpoint
//must not be GC
- assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep());
+ assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep().toString());
// after getOldestRevisionToKeep() only one must be remaining
assertEquals(1, store.getCheckpoints().size());
- assertNull(store.retrieve(r1.toString()));
- assertNotNull(store.retrieve(r2.toString()));
+ assertNull(store.retrieve(c1));
+ assertNotNull(store.retrieve(c2));
}
@Test
public void testGetOldestRevisionToKeep() throws Exception {
long et1 = 1000, et2 = et1 + 1000;
- Revision r1 = Revision.fromString(store.checkpoint(et1));
+ String r1 = store.getHeadRevision().toString();
+ Revision c1 = Revision.fromString(store.checkpoint(et1));
//Do some commit to change headRevision
NodeBuilder b2 = store.getRoot().builder();
b2.child("x");
store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- Revision r2 = Revision.fromString(store.checkpoint(et2));
- assertNotSame(r1, r2);
+ String r2 = store.getHeadRevision().toString();
+ Revision c2 = Revision.fromString(store.checkpoint(et2));
+ assertNotEquals(c1, c2);
- //r2 has the later expiry
- assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep());
+ // r1 is older
+ assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep().toString());
long starttime = clock.getTime();
//Trigger expiry by forwarding the clock to future e1
clock.waitUntil(starttime + et1 + 1);
- assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep());
+ assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep().toString());
//Trigger expiry by forwarding the clock to future e2
//This time no valid checkpoint
@@ -137,27 +148,53 @@ public class CheckpointsTest {
assertNull(store.getCheckpoints().getOldestRevisionToKeep());
}
+ // OAK-4552
+ @Test
+ public void testGetOldestRevisionToKeep2() throws Exception {
+ long lifetime = TimeUnit.HOURS.toMillis(1);
+
+ String r1 = store.getHeadRevision().toString();
+ String c1 = store.checkpoint(lifetime);
+
+ // Do some commit to change headRevision
+ NodeBuilder b2 = store.getRoot().builder();
+ b2.child("x");
+ store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ String r2 = store.getHeadRevision().toString();
+ String c2 = store.checkpoint(lifetime);
+ assertNotEquals(r1, r2);
+ assertNotEquals(c1, c2);
+
+ // r1 is older
+ assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep().toString());
+ }
+
@Test
public void checkpointRemove() throws Exception{
- long et1 = 1000, et2 = et1 + 1000;
- String cp1 = store.checkpoint(et1);
- Revision r1 = Revision.fromString(cp1);
+ long lifetime = TimeUnit.HOURS.toMillis(1);
+ String r1 = store.getHeadRevision().toString();
+ String cp1 = store.checkpoint(lifetime);
//Do some commit to change headRevision
NodeBuilder b2 = store.getRoot().builder();
b2.child("x");
store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- String cp2 = store.checkpoint(et2);
- Revision r2 = Revision.fromString(cp2);
+ String r2 = store.getHeadRevision().toString();
+ String cp2 = store.checkpoint(lifetime);
assertEquals(2, store.getCheckpoints().size());
- assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep());
+ assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep().toString());
- store.release(cp2);
+ store.release(cp1);
assertEquals(1, store.getCheckpoints().size());
- assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep());
+ assertEquals(r2, store.getCheckpoints().getOldestRevisionToKeep().toString());
+
+ store.release(cp2);
+ assertEquals(0, store.getCheckpoints().size());
+ assertNull(store.getCheckpoints().getOldestRevisionToKeep());
}
@Test