Repository: hadoop Updated Branches: refs/heads/ozone-0.2 54ec2366e -> f1165d216
HDDS-416. Remove currentPosition from ChunkInputStreamEntry. Contributed by Lokesh Jain. (cherry picked from commit 1d567c25d0c97603f35ab5c789217df8ec6893d7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f1165d21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f1165d21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f1165d21 Branch: refs/heads/ozone-0.2 Commit: f1165d21665356d66178159f99d56d999e5e2697 Parents: 54ec236 Author: Xiaoyu Yao <[email protected]> Authored: Tue Sep 11 15:12:59 2018 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Tue Sep 11 15:30:53 2018 -0700 ---------------------------------------------------------------------- .../hadoop/ozone/client/io/ChunkGroupInputStream.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1165d21/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java ---------------------------------------------------------------------- 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 9283f19..742cfcc 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; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
