From 3d27eaad25a999c403216107a95de9dd06143361 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 25 Oct 2010 23:50:05 +0000 Subject: [PATCH] Reverting HADOOP-6663. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1027316 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 - .../io/compress/BlockDecompressorStream.java | 6 - .../compress/TestBlockDecompressorStream.java | 229 ------------------ 3 files changed, 238 deletions(-) delete mode 100644 src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java diff --git a/CHANGES.txt b/CHANGES.txt index e8ed7854e2..ff9a2447a4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -272,9 +272,6 @@ Trunk (unreleased changes) HADOOP-6933. TestListFiles is flaky. (Todd Lipcon via tomwhite) - HADOOP-6663. BlockDecompressorStream get EOF exception when decompressing - the file compressed from empty file. (Kang Xiao via tomwhite) - Release 0.21.1 - Unreleased IMPROVEMENTS diff --git a/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java b/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java index d4765731a2..f4177e45f2 100644 --- a/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java +++ b/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java @@ -75,12 +75,6 @@ protected int decompress(byte[] b, int off, int len) throws IOException { 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; diff --git a/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java b/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java deleted file mode 100644 index 3b55dcd3fd..0000000000 --- a/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java +++ /dev/null @@ -1,229 +0,0 @@ -/** - * 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; - } - -} \ No newline at end of file