svn commit: r1724373 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file: FileStore.java TarReader.java

[md...@apache.org]

Author: mduerig
Date: Wed Jan 13 09:12:14 2016
New Revision: 1724373

URL: http://svn.apache.org/viewvc?rev=1724373&view=rev
Log:
OAK-3873: Don't pass the compaction map to FileStore.cleanup
Remove the re. argument

Modified:
    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/file/TarReader.java

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=1724373&r1=1724372&r2=1724373&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 Wed Jan 13 09:12:14 2016
@@ -874,11 +874,10 @@ public class FileStore implements Segmen
 
         // Do actual cleanup outside of the lock to prevent blocking
         // concurrent writers for a long time
-        CompactionMap cm = tracker.getCompactionMap();
         LinkedList<File> toRemove = newLinkedList();
         Set<UUID> cleanedIds = newHashSet();
         for (TarReader reader : cleaned.keySet()) {
-            cleaned.put(reader, reader.cleanup(referencedIds, cm, cleanedIds));
+            cleaned.put(reader, reader.cleanup(referencedIds, cleanedIds));
             if (shutdown) {
                 gcMonitor.info("TarMK GC #{}: cleanup interrupted", gcCount);
                 break;
@@ -918,6 +917,7 @@ public class FileStore implements Segmen
             toRemove.addLast(file);
         }
 
+        CompactionMap cm = tracker.getCompactionMap();
         cm.remove(cleanedIds);
         long finalSize = size();
         approximateSize.set(finalSize);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java?rev=1724373&r1=1724372&r2=1724373&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java Wed Jan 13 09:12:14 2016
@@ -51,7 +51,6 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.oak.plugins.segment.CompactionMap;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentGraph.SegmentGraphVisitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -718,14 +717,12 @@ class TarReader implements Closeable {
      * for memory mapped files).
      * 
      * @param referencedIds the referenced segment ids (input and output).
-     * @param cm the compaction map
      * @param removed a set which will receive the uuids of all segments that
      *                have been cleaned.
      * @return this (if the file is kept as is), or the new generation file, or
      *         null if the file is fully garbage
      */
-    synchronized TarReader cleanup(Set<UUID> referencedIds, CompactionMap cm, Set<UUID> removed)
-            throws IOException {
+    synchronized TarReader cleanup(Set<UUID> referencedIds, Set<UUID> removed) throws IOException {
         String name = file.getName();
         log.debug("Cleaning up {}", name);