You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 05:36:26 UTC
svn commit: r1079110 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt
src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
Author: omalley
Date: Tue Mar 8 04:36:25 2011
New Revision: 1079110
URL: http://svn.apache.org/viewvc?rev=1079110&view=rev
Log:
commit 20633ab81234dab458787584edc75d680e01dee8
Author: Thomas White <to...@apache.org>
Date: Thu Oct 28 17:16:59 2010 +0000
HADOOP-6663. BlockDecompressorStream get EOF exception when decompressing the file compressed from empty file. Contributed by Kang Xiao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1028390 13f79535-47bb-0310-9956-ffa450edef68
Added:
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
Modified:
hadoop/common/branches/yahoo-merge/CHANGES.txt
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079110&r1=1079109&r2=1079110&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar 8 04:36:25 2011
@@ -285,6 +285,9 @@ Trunk (unreleased changes)
HADOOP-7006. Fix 'fs -getmerge' command to not be a no-op.
(Chris Nauroth via cutting)
+ HADOOP-6663. BlockDecompressorStream get EOF exception when decompressing
+ the file compressed from empty file. (Kang Xiao via tomwhite)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java?rev=1079110&r1=1079109&r2=1079110&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java Tue Mar 8 04:36:25 2011
@@ -75,6 +75,12 @@ public class BlockDecompressorStream ext
return -1;
}
noUncompressedBytes = 0;
+ // EOF if originalBlockSize is 0
+ // This will occur only when decompressing previous compressed empty file
+ if (originalBlockSize == 0) {
+ eof = true;
+ return -1;
+ }
}
int n = 0;
Added: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java?rev=1079110&view=auto
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java (added)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java Tue Mar 8 04:36:25 2011
@@ -0,0 +1,234 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.io.compress;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TestBlockDecompressorStream {
+
+ private byte[] buf;
+ private ByteArrayInputStream bytesIn;
+ private ByteArrayOutputStream bytesOut;
+
+ @Test
+ public void testRead() throws IOException {
+ // compress empty stream
+ bytesOut = new ByteArrayOutputStream();
+ BlockCompressorStream blockCompressorStream =
+ new BlockCompressorStream(bytesOut,
+ new FakeCompressor(), 1024, 0);
+ // close without any write
+ blockCompressorStream.close();
+
+ // check compressed output
+ buf = bytesOut.toByteArray();
+ assertEquals("empty file compressed output size is not 4", 4, buf.length);
+
+ // use compressed output as input for decompression
+ bytesIn = new ByteArrayInputStream(buf);
+
+ // get decompression stream
+ BlockDecompressorStream blockDecompressorStream =
+ new BlockDecompressorStream(bytesIn, new FakeDecompressor(), 1024);
+ try {
+ assertEquals("return value is not -1",
+ -1 , blockDecompressorStream.read());
+ } catch (IOException e) {
+ fail("unexpected IOException : " + e);
+ }
+ }
+}
+
+/**
+ * A fake compressor
+ * Its input and output is the same.
+ */
+class FakeCompressor implements Compressor{
+
+ private boolean finish;
+ private boolean finished;
+ int nread;
+ int nwrite;
+
+ byte [] userBuf;
+ int userBufOff;
+ int userBufLen;
+
+ @Override
+ public int compress(byte[] b, int off, int len) throws IOException {
+ int n = Math.min(len, userBufLen);
+ if (userBuf != null && b != null)
+ System.arraycopy(userBuf, userBufOff, b, off, n);
+ userBufOff += n;
+ userBufLen -= n;
+ nwrite += n;
+
+ if (finish && userBufLen <= 0)
+ finished = true;
+
+ return n;
+ }
+
+ @Override
+ public void end() {
+ // nop
+ }
+
+ @Override
+ public void finish() {
+ finish = true;
+ }
+
+ @Override
+ public boolean finished() {
+ return finished;
+ }
+
+ @Override
+ public long getBytesRead() {
+ return nread;
+ }
+
+ @Override
+ public long getBytesWritten() {
+ return nwrite;
+ }
+
+ @Override
+ public boolean needsInput() {
+ return userBufLen <= 0;
+ }
+
+ @Override
+ public void reset() {
+ finish = false;
+ finished = false;
+ nread = 0;
+ nwrite = 0;
+ userBuf = null;
+ userBufOff = 0;
+ userBufLen = 0;
+ }
+
+ @Override
+ public void setDictionary(byte[] b, int off, int len) {
+ // nop
+ }
+
+ @Override
+ public void setInput(byte[] b, int off, int len) {
+ nread += len;
+ userBuf = b;
+ userBufOff = off;
+ userBufLen = len;
+ }
+
+ @Override
+ public void reinit(Configuration conf) {
+ // nop
+ }
+
+}
+
+/**
+ * A fake decompressor, just like FakeCompressor
+ * Its input and output is the same.
+ */
+class FakeDecompressor implements Decompressor {
+
+ private boolean finish;
+ private boolean finished;
+ int nread;
+ int nwrite;
+
+ byte [] userBuf;
+ int userBufOff;
+ int userBufLen;
+
+ @Override
+ public int decompress(byte[] b, int off, int len) throws IOException {
+ int n = Math.min(len, userBufLen);
+ if (userBuf != null && b != null)
+ System.arraycopy(userBuf, userBufOff, b, off, n);
+ userBufOff += n;
+ userBufLen -= n;
+ nwrite += n;
+
+ if (finish && userBufLen <= 0)
+ finished = true;
+
+ return n;
+ }
+
+ @Override
+ public void end() {
+ // nop
+ }
+
+ @Override
+ public boolean finished() {
+ return finished;
+ }
+
+ @Override
+ public boolean needsDictionary() {
+ return false;
+ }
+
+ @Override
+ public boolean needsInput() {
+ return userBufLen <= 0;
+ }
+
+ @Override
+ public void reset() {
+ finish = false;
+ finished = false;
+ nread = 0;
+ nwrite = 0;
+ userBuf = null;
+ userBufOff = 0;
+ userBufLen = 0;
+ }
+
+ @Override
+ public void setDictionary(byte[] b, int off, int len) {
+ // nop
+ }
+
+ @Override
+ public void setInput(byte[] b, int off, int len) {
+ nread += len;
+ userBuf = b;
+ userBufOff = off;
+ userBufLen = len;
+ }
+
+ @Override
+ public int getRemaining() {
+ return 0;
+ }
+
+}
\ No newline at end of file