big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert HADOOP-9692.

Browse Source 
This reverts commit 381610da62.
This reverts commit b5ca649bff.
This commit is contained in:
Tsuyoshi Ozawa 2015-10-23 06:43:15 +09:00
parent cb282d5b89
commit 039a1f9e96
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -902,9 +902,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via wang) HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via wang)
HADOOP-9692. Improving log message when SequenceFile reader throws
EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong.
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp HADOOP-11785. Reduce the number of listStatus operation in distcp

15
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
View File

@ -1912,26 +1912,17 @@ protected FSDataInputStream openFile(FileSystem fs, Path file,
*/ */
private void init(boolean tempReader) throws IOException { private void init(boolean tempReader) throws IOException {
byte[] versionBlock = new byte[VERSION.length]; byte[] versionBlock = new byte[VERSION.length];
String exceptionMsg = this + " not a SequenceFile"; in.readFully(versionBlock);
// Try to read sequence file header.
try {
in.readFully(versionBlock);
} catch (EOFException e) {
throw new EOFException(exceptionMsg);
}
if ((versionBlock[0] != VERSION[0]) || if ((versionBlock[0] != VERSION[0]) ||
(versionBlock[1] != VERSION[1]) || (versionBlock[1] != VERSION[1]) ||
(versionBlock[2] != VERSION[2])) { (versionBlock[2] != VERSION[2]))
throw new IOException(this + " not a SequenceFile"); throw new IOException(this + " not a SequenceFile");
}
// Set 'version' // Set 'version'
version = versionBlock[3]; version = versionBlock[3];
if (version > VERSION[3]) { if (version > VERSION[3])
throw new VersionMismatchException(VERSION[3], version); throw new VersionMismatchException(VERSION[3], version);
}
if (version < BLOCK_COMPRESS_VERSION) { if (version < BLOCK_COMPRESS_VERSION) {
UTF8 className = new UTF8(); UTF8 className = new UTF8();

21
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
View File

@ -522,27 +522,6 @@ protected FSDataInputStream openFile(FileSystem fs, Path file, int bufferSize, l
assertTrue("InputStream for " + path + " should have been closed.", openedFile[0].isClosed()); assertTrue("InputStream for " + path + " should have been closed.", openedFile[0].isClosed());
} }
/**
* Test to makes sure zero length sequence file is handled properly while
* initializing.
*/
public void testInitZeroLengthSequenceFile() throws IOException {
Configuration conf = new Configuration();
LocalFileSystem fs = FileSystem.getLocal(conf);
// create an empty file (which is not a valid sequence file)
Path path = new Path(System.getProperty("test.build.data", ".") +
"/zerolength.seq");
fs.create(path).close();
try {
new SequenceFile.Reader(conf, SequenceFile.Reader.file(path));
fail("IOException expected.");
} catch (IOException expected) {
assertTrue(expected instanceof EOFException);
}
}
/** /**
* Test that makes sure createWriter succeeds on a file that was * Test that makes sure createWriter succeeds on a file that was
* already created * already created