svn commit: r1792587 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: VersionGCSupport.java VersionGarbageCollector.java

[mreutegg]

Author: mreutegg
Date: Tue Apr 25 08:20:46 2017
New Revision: 1792587

URL: http://svn.apache.org/viewvc?rev=1792587&view=rev
Log:
OAK-5898: Revision GC command line tool

Introduce VersionGCSupport.getDocumentStore() and use in VersionGarbageCollector

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java

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=1792587&r1=1792586&r2=1792587&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
 Tue Apr 25 08:20:46 2017
@@ -26,6 +26,8 @@ import static org.apache.jackrabbit.oak.
 
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 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;
@@ -82,6 +84,16 @@ public class VersionGCSupport {
         });
     }
 
+    /**
+     * Returns the underlying document store.
+     *
+     * @return the underlying document store.
+     */
+    @Nonnull
+    public DocumentStore getDocumentStore() {
+        return store;
+    }
+
     void deleteSplitDocuments(Set<SplitDocType> gcTypes,
                               RevisionVector sweepRevs,
                               long oldestRevTimeStamp,

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1792587&r1=1792586&r2=1792587&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
 Tue Apr 25 08:20:46 2017
@@ -107,7 +107,7 @@ public class VersionGarbageCollector {
                             VersionGCSupport gcSupport) {
         this.nodeStore = nodeStore;
         this.versionStore = gcSupport;
-        this.ds = nodeStore.getDocumentStore();
+        this.ds = gcSupport.getDocumentStore();
         this.options = new VersionGCOptions();
     }