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 2017/03/03 12:48:07 UTC
svn commit: r1785283 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document:
SplitDocumentCleanUp.java VersionGCSupport.java
Author: reschke
Date: Fri Mar 3 12:48:07 2017
New Revision: 1785283
URL: http://svn.apache.org/viewvc?rev=1785283&view=rev
Log:
OAK-5876: SplitDocumentCleanup should implement Closeable
Let SplitDocumentCleanup should implement Closeable, delegate close to NodeDocument iterable, let VersionGCSupport close SplitDocumentCleanUp
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java?rev=1785283&r1=1785282&r2=1785283&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java Fri Mar 3 12:48:07 2017
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.io.Closeable;
+import java.io.IOException;
import java.util.List;
import com.google.common.base.Function;
@@ -35,7 +37,7 @@ import static org.apache.jackrabbit.oak.
/**
* Implements a split document cleanup.
*/
-public class SplitDocumentCleanUp {
+public class SplitDocumentCleanUp implements Closeable {
private static final Logger LOG = LoggerFactory.getLogger(SplitDocumentCleanUp.class);
@@ -79,7 +81,7 @@ public class SplitDocumentCleanUp {
mainId, splitId);
return;
}
-
+
String splitDocPath = splitDoc.getPath();
int slashIdx = splitDocPath.lastIndexOf('/');
int height = Integer.parseInt(splitDocPath.substring(slashIdx + 1));
@@ -127,4 +129,9 @@ public class SplitDocumentCleanUp {
NodeDocument.setStalePrevious(update, rev, height);
store.findAndUpdate(NODES, update);
}
+
+ @Override
+ public void close() throws IOException {
+ Utils.closeIfCloseable(splitDocGarbage);
+ }
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java?rev=1785283&r1=1785282&r2=1785283&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java Fri Mar 3 12:48:07 2017
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument.SplitDocType;
import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import com.google.common.base.Predicate;
@@ -50,9 +51,13 @@ public class VersionGCSupport {
public void deleteSplitDocuments(Set<SplitDocType> gcTypes,
long oldestRevTimeStamp,
VersionGCStats stats) {
- stats.splitDocGCCount += createCleanUp(gcTypes, oldestRevTimeStamp, stats)
- .disconnect()
- .deleteSplitDocuments();
+ SplitDocumentCleanUp cu = createCleanUp(gcTypes, oldestRevTimeStamp, stats);
+ try {
+ stats.splitDocGCCount += cu.disconnect().deleteSplitDocuments();
+ }
+ finally {
+ Utils.closeIfCloseable(cu);
+ }
}
protected SplitDocumentCleanUp createCleanUp(Set<SplitDocType> gcTypes,