svn commit: r1577621 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment: SegmentIdFactory.java SegmentStore.java file/FileStore.java http/HttpStore.java memory/MemoryStore.java

[jukka]

Author: jukka
Date: Fri Mar 14 17:49:14 2014
New Revision: 1577621

URL: http://svn.apache.org/r1577621
Log:
OAK-631: SegmentMK: Implement garbage collection

Add SegmentStore.gc()

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactory.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/HttpStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactory.java?rev=1577621&r1=1577620&r2=1577621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactory.java
 Fri Mar 14 17:49:14 2014
@@ -73,7 +73,7 @@ public class SegmentIdFactory {
      *
      * @return referenced segment identifiers
      */
-    synchronized Set<SegmentId> getReferencedSegmentIds() {
+    public synchronized Set<SegmentId> getReferencedSegmentIds() {
         Set<SegmentId> set = newHashSetWithExpectedSize(uuids.size());
 
         for (int i = 0; i < uuids.size(); i++) {

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentStore.java?rev=1577621&r1=1577620&r2=1577621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentStore.java
 Fri Mar 14 17:49:14 2014
@@ -81,4 +81,9 @@ public interface SegmentStore {
     @CheckForNull
     BlobStore getBlobStore();
 
+    /**
+     * Triggers removal of segments that are no longer referenceable.
+     */
+    void gc();
+
 }

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1577621&r1=1577620&r2=1577621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 Fri Mar 14 17:49:14 2014
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
@@ -394,4 +395,11 @@ public class FileStore implements Segmen
     public BlobStore getBlobStore() {
         return blobStore;
     }
+
+    @Override
+    public void gc() {
+        System.gc();
+        Set<SegmentId> ids = factory.getReferencedSegmentIds();
+        // TODO reclaim unreferenced segments
+    }
 }
\ No newline at end of file

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/HttpStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/HttpStore.java?rev=1577621&r1=1577620&r2=1577621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/HttpStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/HttpStore.java
 Fri Mar 14 17:49:14 2014
@@ -169,4 +169,9 @@ public class HttpStore implements Segmen
         return null;
     }
 
+    @Override
+    public void gc() {
+        // TODO: distributed gc
+    }
+
 }

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java?rev=1577621&r1=1577620&r2=1577621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
 Fri Mar 14 17:49:14 2014
@@ -129,4 +129,10 @@ public class MemoryStore implements Segm
         return null;
     }
 
+    @Override
+    public void gc() {
+        System.gc();
+        segments.keySet().retainAll(factory.getReferencedSegmentIds());
+    }
+
 }