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 cd...@apache.org on 2009/10/21 01:40:01 UTC
svn commit: r827838 - in /hadoop/common/branches/branch-0.21: CHANGES.txt
src/java/org/apache/hadoop/fs/HarFileSystem.java
Author: cdouglas
Date: Tue Oct 20 23:40:01 2009
New Revision: 827838
URL: http://svn.apache.org/viewvc?rev=827838&view=rev
Log:
HADOOP-6097. Fix Path conversion in makeQualified and reset LineReader byte
count at the start of each block in Hadoop archives. Contributed by Ben Slusky,
Tom White, and Mahadev Konar
Modified:
hadoop/common/branches/branch-0.21/CHANGES.txt
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/HarFileSystem.java
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=827838&r1=827837&r2=827838&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Tue Oct 20 23:40:01 2009
@@ -559,9 +559,6 @@
HADOOP-6224. Add a method to WritableUtils performing a bounded read of an
encoded String. (Jothi Padmanabhan via cdouglas)
- HADOOP-6231. Allow caching of filesystem instances to be disabled on a
- per-instance basis. (tomwhite)
-
HADOOP-6133. Add a caching layer to Configuration::getClassByName to
alleviate a performance regression introduced in a compatibility layer.
(Todd Lipcon via cdouglas)
@@ -898,10 +895,6 @@
HADOOP-5809. Fix job submission, broken by errant directory creation.
(Sreekanth Ramakrishnan and Jothi Padmanabhan via cdouglas)
- HADOOP-5759. Fix for IllegalArgumentException when
- CombineFileInputFormat is used as job InputFormat.
- (Amareshwari Sriramadasu via dhruba)
-
HADOOP-5635. Change distributed cache to work with other distributed file
systems. (Andrew Hitchcock via tomwhite)
@@ -1087,6 +1080,18 @@
HADOOP-6286. Fix bugs in related to URI handling in glob methods in
FileContext. (Boris Shkolnik via suresh)
+Release 0.20.2 - Unreleased
+
+ HADOOP-6231. Allow caching of filesystem instances to be disabled on a
+ per-instance basis. (tomwhite)
+
+ HADOOP-5759. Fix for IllegalArgumentException when CombineFileInputFormat
+ is used as job InputFormat. (Amareshwari Sriramadasu via dhruba)
+
+ HADOOP-6097. Fix Path conversion in makeQualified and reset LineReader byte
+ count at the start of each block in Hadoop archives. (Ben Slusky, Tom
+ White, and Mahadev Konar via cdouglas)
+
Release 0.20.1 - 2009-09-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/HarFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/HarFileSystem.java?rev=827838&r1=827837&r2=827838&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/HarFileSystem.java (original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/HarFileSystem.java Tue Oct 20 23:40:01 2009
@@ -302,19 +302,8 @@
}
URI tmpURI = fsPath.toUri();
- fsPath = new Path(tmpURI.getPath());
//change this to Har uri
- URI tmp = null;
- try {
- tmp = new URI(uri.getScheme(), harAuth, fsPath.toString(),
- tmpURI.getQuery(), tmpURI.getFragment());
- } catch(URISyntaxException ue) {
- LOG.error("Error in URI ", ue);
- }
- if (tmp != null) {
- return new Path(tmp.toString());
- }
- return null;
+ return new Path(uri.getScheme(), harAuth, tmpURI.getPath());
}
/**
@@ -426,12 +415,13 @@
// do nothing just a read.
}
FSDataInputStream aIn = fs.open(archiveIndex);
- LineReader aLin = new LineReader(aIn, getConf());
+ LineReader aLin;
String retStr = null;
// now start reading the real index file
- read = 0;
for (Store s: stores) {
+ read = 0;
aIn.seek(s.begin);
+ aLin = new LineReader(aIn, getConf());
while (read + s.begin < s.end) {
int tmp = aLin.readLine(line);
read += tmp;