uses newInputStreamStatisitics()

Author: ahmarsuhail

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/common/EmptyPrefetchingStatistics.java

@@ -27,14 +27,14 @@
 
  public final class EmptyPrefetchingStatistics implements PrefetchingStatistics {
 
-   private static final EmptyPrefetchingStatistics emptyPrefetchingStatistics =
+   private static final EmptyPrefetchingStatistics EMPTY_PREFETCHING_STATISTICS =
        new EmptyPrefetchingStatistics();
 
    private EmptyPrefetchingStatistics() {
    }
 
    public static EmptyPrefetchingStatistics getInstance() {
-     return emptyPrefetchingStatistics;
+     return EMPTY_PREFETCHING_STATISTICS;
    }
 
   @Override

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/common/TestBlockCache.java

@@ -59,7 +59,7 @@ public void testArgChecks() throws Exception {
   @Test
   public void testPutAndGet() throws Exception {
     BlockCache cache =
-        new SingleFilePerBlockCache(EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS);
+        new SingleFilePerBlockCache(new EmptyS3AStatisticsContext().newInputStreamStatistics());
 
     ByteBuffer buffer1 = ByteBuffer.allocate(BUFFER_SIZE);
     for (byte i = 0; i < BUFFER_SIZE; i++) {

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/common/TestBufferPool.java

@@ -34,13 +34,11 @@ public class TestBufferPool extends AbstractHadoopTestBase {
 
   private static final int POOL_SIZE = 2;
   private static final int BUFFER_SIZE = 10;
-
+  private final S3AInputStreamStatistics s3AInputStreamStatistics =
+      new EmptyS3AStatisticsContext().newInputStreamStatistics();
 
   @Test
   public void testArgChecks() throws Exception {
-    S3AInputStreamStatistics s3AInputStreamStatistics =
-        new EmptyS3AStatisticsContext().newInputStreamStatistics();
-
     // Should not throw.
     BufferPool pool = new BufferPool(POOL_SIZE, BUFFER_SIZE, s3AInputStreamStatistics);
 
@@ -87,8 +85,7 @@ public void testArgChecks() throws Exception {
 
   @Test
   public void testGetAndRelease() {
-    BufferPool pool = new BufferPool(POOL_SIZE, BUFFER_SIZE,
-        EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS);
+    BufferPool pool = new BufferPool(POOL_SIZE, BUFFER_SIZE, s3AInputStreamStatistics);
     assertInitialState(pool, POOL_SIZE);
 
     int count = 0;
@@ -135,8 +132,7 @@ public void testRelease() throws Exception {
   private void testReleaseHelper(BufferData.State stateBeforeRelease, boolean expectThrow)
       throws Exception {
 
-    BufferPool pool = new BufferPool(POOL_SIZE, BUFFER_SIZE,
-        EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS);
+    BufferPool pool = new BufferPool(POOL_SIZE, BUFFER_SIZE, s3AInputStreamStatistics);
     assertInitialState(pool, POOL_SIZE);
 
     BufferData data = this.acquire(pool, 1);

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/read/Fakes.java

@@ -39,6 +39,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.common.BlockCache;
 import org.apache.hadoop.fs.common.BlockData;
+import org.apache.hadoop.fs.common.EmptyPrefetchingStatistics;
 import org.apache.hadoop.fs.common.ExecutorServiceFuturePool;
 import org.apache.hadoop.fs.common.SingleFilePerBlockCache;
 import org.apache.hadoop.fs.common.Validate;
@@ -284,7 +285,7 @@ public static class TestS3FilePerBlockCache extends SingleFilePerBlockCache {
     private final int writeDelay;
 
     public TestS3FilePerBlockCache(int readDelay, int writeDelay) {
-      super(EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS);
+      super(new EmptyS3AStatisticsContext().newInputStreamStatistics());
       this.files = new ConcurrentHashMap<>();
       this.readDelay = readDelay;
       this.writeDelay = writeDelay;
@@ -339,7 +340,7 @@ public TestS3CachingBlockManager(
         BlockData blockData,
         int bufferPoolSize) {
       super(futurePool, reader, blockData, bufferPoolSize,
-          EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS);
+          new EmptyS3AStatisticsContext().newInputStreamStatistics());
     }
 
     @Override

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/read/TestS3CachingBlockManager.java

@@ -44,7 +44,7 @@ public class TestS3CachingBlockManager extends AbstractHadoopTestBase {
   private final ExecutorService threadPool = Executors.newFixedThreadPool(4);
   private final ExecutorServiceFuturePool futurePool = new ExecutorServiceFuturePool(threadPool);
   private final S3AInputStreamStatistics streamStatistics =
-      EmptyS3AStatisticsContext.EMPTY_INPUT_STREAM_STATISTICS;
+      new EmptyS3AStatisticsContext().newInputStreamStatistics();
 
   private final BlockData blockData = new BlockData(FILE_SIZE, BLOCK_SIZE);