From 1d567c25d0c97603f35ab5c789217df8ec6893d7 Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@HW14116.local>
Date: Tue, 11 Sep 2018 15:12:59 -0700
Subject: [PATCH] HDDS-416. Remove currentPosition from ChunkInputStreamEntry.
 Contributed by Lokesh Jain.

---
 .../hadoop/ozone/client/io/ChunkGroupInputStream.java  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java
index 9283f190e74..742cfcc538b 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java
@@ -71,7 +71,7 @@ public class ChunkGroupInputStream extends InputStream implements Seekable {
   }
 
   @VisibleForTesting
-  public long getRemainingOfIndex(int index) {
+  public long getRemainingOfIndex(int index) throws IOException {
     return streamEntries.get(index).getRemaining();
   }
 
@@ -206,31 +206,27 @@ public class ChunkGroupInputStream extends InputStream implements Seekable {
 
     private final ChunkInputStream chunkInputStream;
     private final long length;
-    private long currentPosition;
 
     public ChunkInputStreamEntry(ChunkInputStream chunkInputStream,
         long length) {
       this.chunkInputStream = chunkInputStream;
       this.length = length;
-      this.currentPosition = 0;
     }
 
-    synchronized long getRemaining() {
-      return length - currentPosition;
+    synchronized long getRemaining() throws IOException {
+      return length - getPos();
     }
 
     @Override
     public synchronized int read(byte[] b, int off, int len)
         throws IOException {
       int readLen = chunkInputStream.read(b, off, len);
-      currentPosition += readLen;
       return readLen;
     }
 
     @Override
     public synchronized int read() throws IOException {
       int data = chunkInputStream.read();
-      currentPosition += 1;
       return data;
     }