Author: reschke
Date: Mon Oct 24 16:02:51 2016
New Revision: 1766426
URL: http://svn.apache.org/viewvc?rev=1766426&view=rev
Log:
OAK-4988: JournalGarbageCollector: re-order method signature (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/DocumentNodeStoreService.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 16:02:51 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,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,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,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071
+/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,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,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,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Mon Oct 24 16:02:51 2016
@@ -762,7 +762,7 @@ public class DocumentNodeStoreService {
@Override
public void run() {
- nodeStore.getJournalGarbageCollector().gc(journalGCMaxAge,
journalGCBatchSize, TimeUnit.MILLISECONDS);
+ nodeStore.getJournalGarbageCollector().gc(journalGCMaxAge,
TimeUnit.MILLISECONDS, journalGCBatchSize);
}
};
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
Mon Oct 24 16:02:51 2016
@@ -69,10 +69,11 @@ public class JournalGarbageCollector {
* maxRevisionAge.
*
* @param maxRevisionAge entries older than this age will be removed
- * @param unit the timeunit for maxRevisionAge
+ * @param unit the {@linkplain TimeUnit} for maxRevisionAge
+ * @param batchSize size of batch for removal
* @return the number of entries that have been removed
*/
- public int gc(long maxRevisionAge, int batchSize, TimeUnit unit) {
+ public int gc(long maxRevisionAge, TimeUnit unit, int batchSize) {
DocumentStore ds = ns.getDocumentStore();
Revision keep = ns.getCheckpoints().getOldestRevisionToKeep();
long maxRevisionAgeInMillis = unit.toMillis(maxRevisionAge);
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
Mon Oct 24 16:02:51 2016
@@ -39,6 +39,6 @@ public class JournalGCIT extends Abstra
.getNodeStore();
JournalGarbageCollector jgc = ns1.getJournalGarbageCollector();
- assertEquals(0, jgc.gc(1, 10, TimeUnit.HOURS));
+ assertEquals(0, jgc.gc(1, TimeUnit.HOURS, 10));
}
}
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
Mon Oct 24 16:02:51 2016
@@ -62,7 +62,7 @@ public class JournalGCTest {
c.waitUntil(c.getTime() + TimeUnit.HOURS.toMillis(2));
// instruct journal collector to remove entries older than one hour
- ns.getJournalGarbageCollector().gc(1, 10, TimeUnit.HOURS);
+ ns.getJournalGarbageCollector().gc(1, TimeUnit.HOURS, 10);
// must not remove existing entry, because checkpoint is still valid
entry = ns.getDocumentStore().find(JOURNAL, JournalEntry.asId(head));
@@ -70,7 +70,7 @@ public class JournalGCTest {
ns.release(cp);
- ns.getJournalGarbageCollector().gc(1, 10, TimeUnit.HOURS);
+ ns.getJournalGarbageCollector().gc(1, TimeUnit.HOURS, 10);
// now journal GC can remove the entry
entry = ns.getDocumentStore().find(JOURNAL, JournalEntry.asId(head));
assertNull(entry);
@@ -91,7 +91,7 @@ public class JournalGCTest {
ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
ns.runBackgroundOperations();
- assertEquals(0, jgc.gc(1, 10, TimeUnit.HOURS));
+ assertEquals(0, jgc.gc(1, TimeUnit.HOURS, 10));
// current time, but without the increment done by getTime()
long now = c.getTime() - 1;
@@ -105,7 +105,7 @@ public class JournalGCTest {
// must collect all journal entries. the first created when
// DocumentNodeStore was initialized and the second created
// by the background update
- assertEquals(2, jgc.gc(1, 10, TimeUnit.HOURS));
+ assertEquals(2, jgc.gc(1, TimeUnit.HOURS, 10));
// current time, but without the increment done by getTime()
now = c.getTime() - 1;
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
Mon Oct 24 16:02:51 2016
@@ -186,15 +186,15 @@ public class JournalTest extends Abstrac
JournalGarbageCollector gc = new JournalGarbageCollector(ns1);
// first clean up
Thread.sleep(100); // OAK-2979 : wait 100ms before doing the cleanup
- gc.gc(1, 100, TimeUnit.MILLISECONDS);
+ gc.gc(1, TimeUnit.MILLISECONDS, 100);
Thread.sleep(100); // sleep just quickly
- assertEquals(0, gc.gc(1, 100, TimeUnit.DAYS));
- assertEquals(0, gc.gc(6, 100, TimeUnit.HOURS));
- assertEquals(0, gc.gc(1, 100, TimeUnit.HOURS));
- assertEquals(0, gc.gc(10, 100, TimeUnit.MINUTES));
- assertEquals(0, gc.gc(1, 100, TimeUnit.MINUTES));
- assertEquals(0, gc.gc(1, 100, TimeUnit.SECONDS));
- assertEquals(0, gc.gc(1, 100, TimeUnit.MILLISECONDS));
+ assertEquals(0, gc.gc(1, TimeUnit.DAYS, 100));
+ assertEquals(0, gc.gc(6, TimeUnit.HOURS, 100));
+ assertEquals(0, gc.gc(1, TimeUnit.HOURS, 100));
+ assertEquals(0, gc.gc(10, TimeUnit.MINUTES, 100));
+ assertEquals(0, gc.gc(1, TimeUnit.MINUTES, 100));
+ assertEquals(0, gc.gc(1, TimeUnit.SECONDS, 100));
+ assertEquals(0, gc.gc(1, TimeUnit.MILLISECONDS, 100));
// create some entries that can be deleted thereupon
mk1.commit("/", "+\"regular1\": {}", null, null);
@@ -202,16 +202,16 @@ public class JournalTest extends Abstrac
mk1.commit("/", "+\"regular3\": {}", null, null);
mk1.commit("/regular2", "+\"regular4\": {}", null, null);
Thread.sleep(100); // sleep 100millis
- assertEquals(0, gc.gc(5, 100, TimeUnit.SECONDS));
- assertEquals(0, gc.gc(1, 100, TimeUnit.MILLISECONDS));
+ assertEquals(0, gc.gc(5, TimeUnit.SECONDS, 100));
+ assertEquals(0, gc.gc(1, TimeUnit.MILLISECONDS, 100));
ns1.runBackgroundOperations();
mk1.commit("/", "+\"regular5\": {}", null, null);
ns1.runBackgroundOperations();
mk1.commit("/", "+\"regular6\": {}", null, null);
ns1.runBackgroundOperations();
Thread.sleep(100); // sleep 100millis
- assertEquals(0, gc.gc(5, 100, TimeUnit.SECONDS));
- assertEquals(3, gc.gc(1, 100, TimeUnit.MILLISECONDS));
+ assertEquals(0, gc.gc(5, TimeUnit.SECONDS, 100));
+ assertEquals(3, gc.gc(1, TimeUnit.MILLISECONDS, 100));
}
@Test
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1766426&r1=1766425&r2=1766426&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
Mon Oct 24 16:02:51 2016
@@ -200,7 +200,7 @@ public class JournalIT extends AbstractJ
JournalGarbageCollector gc = new JournalGarbageCollector(ns1);
clock.getTimeIncreasing();
clock.getTimeIncreasing();
- gc.gc(0, 100, TimeUnit.MILLISECONDS); // cleanup everything that might
still be there
+ gc.gc(0, TimeUnit.MILLISECONDS, 100); // cleanup everything that might
still be there
// create entries as parametrized:
for(int i=offset; i<size+offset; i++) {
@@ -210,7 +210,7 @@ public class JournalIT extends AbstractJ
ns1.runBackgroundOperations();
}
Thread.sleep(100); // sleep 100millis
- assertEquals(size, gc.gc(0, 100, TimeUnit.MILLISECONDS)); // should
now be able to clean up everything
+ assertEquals(size, gc.gc(0, TimeUnit.MILLISECONDS, 100)); // should
now be able to clean up everything
}
protected DocumentMK createMK(int clusterId, int asyncDelay) {
