svn commit: r1753449 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java

[am...@apache.org]

Author: amitj
Date: Wed Jul 20 05:49:46 2016
New Revision: 1753449

URL: http://svn.apache.org/viewvc?rev=1753449&view=rev
Log:
OAK-4200:  [BlobGC] Improve collection times of blobs available

Using method introduced with OAK-4565 for adding metadata record for blob ids

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java?rev=1753449&r1=1753448&r2=1753449&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java Wed Jul 20 05:49:46 2016
@@ -46,7 +46,6 @@ import static com.google.common.base.Cha
 import static com.google.common.base.Predicates.alwaysTrue;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.io.Files.asByteSource;
 import static com.google.common.io.Files.fileTreeTraverser;
 import static com.google.common.io.Files.move;
 import static com.google.common.io.Files.newWriter;
@@ -258,7 +257,6 @@ public class BlobIdTracker implements Cl
      * @throws IOException
      */
     private void snapshot() throws IOException {
-        InputStream inputStream = null;
         try {
             if (!SKIP_TRACKER) {
                 Stopwatch watch = Stopwatch.createStarted();
@@ -266,16 +264,14 @@ public class BlobIdTracker implements Cl
                 LOG.debug("Completed snapshot in [{}]", watch.elapsed(TimeUnit.MILLISECONDS));
 
                 watch = Stopwatch.createStarted();
-                inputStream = asByteSource(store.getBlobRecordsFile()).openBufferedStream();
-                datastore.addMetadataRecord(inputStream, (prefix + instanceId + mergedFileSuffix));
+                datastore.addMetadataRecord(store.getBlobRecordsFile(),
+                    (prefix + instanceId + mergedFileSuffix));
                 LOG.info("Added blob id metadata record in DataStore in [{}]",
                     watch.elapsed(TimeUnit.MILLISECONDS));
             }
         } catch (Exception e) {
             LOG.error("Error taking snapshot", e);
             throw new IOException("Snapshot error", e);
-        } finally {
-            closeQuietly(inputStream);
         }
     }