Repository: hadoop Updated Branches: refs/heads/ozone-0.2 5d47072b4 -> 1b3f1b89a
HDDS-454. TestChunkStreams#testErrorReadGroupInputStream & TestChunkStreams#testReadGroupInputStream are failing. Contributed by chencan. (cherry picked from commit 5470de420b2660e3042a5fec566ecc6b0d8ff93a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1b3f1b89 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1b3f1b89 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1b3f1b89 Branch: refs/heads/ozone-0.2 Commit: 1b3f1b89a5ca9c3f73c2c052728eaa0dc520074a Parents: 5d47072 Author: Nanda kumar <[email protected]> Authored: Sat Sep 15 01:38:13 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Sat Sep 15 01:40:12 2018 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/ozone/om/TestChunkStreams.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1b3f1b89/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestChunkStreams.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestChunkStreams.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestChunkStreams.java index 7ce916a..7ff9d63 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestChunkStreams.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestChunkStreams.java @@ -121,6 +121,7 @@ public class TestChunkStreams { int tempOffset = offset; ChunkInputStream in = new ChunkInputStream(null, null, null, new ArrayList<>(), null) { + private long pos = 0; private ByteArrayInputStream in = new ByteArrayInputStream(buf, tempOffset, 100); @@ -131,7 +132,7 @@ public class TestChunkStreams { @Override public long getPos() throws IOException { - throw new UnsupportedOperationException(); + return pos; } @Override @@ -147,7 +148,9 @@ public class TestChunkStreams { @Override public int read(byte[] b, int off, int len) throws IOException { - return in.read(b, off, len); + int readLen = in.read(b, off, len); + pos += readLen; + return readLen; } }; inputStreams.add(in); @@ -175,6 +178,7 @@ public class TestChunkStreams { int tempOffset = offset; ChunkInputStream in = new ChunkInputStream(null, null, null, new ArrayList<>(), null) { + private long pos = 0; private ByteArrayInputStream in = new ByteArrayInputStream(buf, tempOffset, 100); @@ -185,7 +189,7 @@ public class TestChunkStreams { @Override public long getPos() throws IOException { - throw new UnsupportedOperationException(); + return pos; } @Override @@ -201,7 +205,9 @@ public class TestChunkStreams { @Override public int read(byte[] b, int off, int len) throws IOException { - return in.read(b, off, len); + int readLen = in.read(b, off, len); + pos += readLen; + return readLen; } }; inputStreams.add(in); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
