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 2008/08/13 23:58:02 UTC
svn commit: r685693 - in /hadoop/core/trunk: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java
Author: omalley
Date: Wed Aug 13 14:58:02 2008
New Revision: 685693
URL: http://svn.apache.org/viewvc?rev=685693&view=rev
Log:
HADOOP-3946. Rollback patch.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=685693&r1=685692&r2=685693&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Aug 13 14:58:02 2008
@@ -298,8 +298,6 @@
HADOOP-3773. Change Pipes to set the default map output key and value
types correctly. (Koji Noguchi via omalley)
- HADOOP-3946. Fix TestMapRed after hadoop-3664. (tomwhite via omalley)
-
Release 0.18.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java?rev=685693&r1=685692&r2=685693&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java Wed Aug 13 14:58:02 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.SequenceFile;
@@ -40,10 +39,12 @@
for (int i = 0; i < files.length; i++) {
FileStatus file = files[i];
if (file.isDir()) { // it's a MapFile
- Path dataFile = new Path(file.getPath(), MapFile.DATA_FILE_NAME);
- FileSystem fs = file.getPath().getFileSystem(job);
- // use the data file
- files[i] = fs.getFileStatus(dataFile);
+ files[i] = new FileStatus(file.getLen(), file.isDir(),
+ file.getReplication(), file.getBlockSize(),
+ file.getModificationTime(), file.getPermission(),
+ file.getOwner(), file.getGroup(),
+ // use the data file
+ new Path(file.getPath(), MapFile.DATA_FILE_NAME));
}
}
return files;