svn commit: r1800669 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file: FileStore.java tar/TarFiles.java

[frm]

Author: frm
Date: Mon Jul  3 12:42:46 2017
New Revision: 1800669

URL: http://svn.apache.org/viewvc?rev=1800669&view=rev
Log:
OAK-6405 - Replace usages of FileStoreStats with FileStoreMonitor

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1800669&r1=1800668&r2=1800669&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 Mon Jul  3 12:42:46 2017
@@ -225,7 +225,7 @@ public class FileStore extends AbstractF
                 .withMemoryMapping(memoryMapping)
                 .withTarRecovery(recovery)
                 .withIOMonitor(ioMonitor)
-                .withFileStoreStats(stats)
+                .withFileStoreMonitor(stats)
                 .withMaxFileSize(builder.getMaxFileSize() * MB)
                 .build();
         this.stats.init(this.tarFiles.size());

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java?rev=1800669&r1=1800668&r2=1800669&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
 Mon Jul  3 12:42:46 2017
@@ -50,7 +50,6 @@ import javax.annotation.Nonnull;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-import org.apache.jackrabbit.oak.segment.file.FileStoreStats;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -111,7 +110,7 @@ public class TarFiles implements Closeab
 
         private IOMonitor ioMonitor;
 
-        private FileStoreStats fileStoreStats;
+        private FileStoreMonitor fileStoreMonitor;
 
         private long maxFileSize;
 
@@ -141,8 +140,8 @@ public class TarFiles implements Closeab
             return this;
         }
 
-        public Builder withFileStoreStats(FileStoreStats fileStoreStats) {
-            this.fileStoreStats = checkNotNull(fileStoreStats);
+        public Builder withFileStoreMonitor(FileStoreMonitor fileStoreStats) {
+            this.fileStoreMonitor = checkNotNull(fileStoreStats);
             return this;
         }
 
@@ -161,7 +160,7 @@ public class TarFiles implements Closeab
             checkState(directory != null, "Directory not specified");
             checkState(tarRecovery != null, "TAR recovery strategy not 
specified");
             checkState(ioMonitor != null, "I/O monitor not specified");
-            checkState(readOnly || fileStoreStats != null, "File store 
statistics not specified");
+            checkState(readOnly || fileStoreMonitor != null, "File store 
statistics not specified");
             checkState(readOnly || maxFileSize != 0, "Max file size not 
specified");
             return new TarFiles(this);
         }
@@ -307,7 +306,7 @@ public class TarFiles implements Closeab
         if (indices.length > 0) {
             writeNumber = indices[indices.length - 1] + 1;
         }
-        writer = new TarWriter(builder.directory, builder.fileStoreStats, 
writeNumber, builder.ioMonitor);
+        writer = new TarWriter(builder.directory, builder.fileStoreMonitor, 
writeNumber, builder.ioMonitor);
     }
 
     @Override