Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-8440. Merging change r1501424 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501435 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-07-09 18:26:08 +00:00
parent e9fff0bbba
commit 57366664dd
3 changed files with 21 additions and 15 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

@ -531,6 +531,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather
than throw EOF at end of file. (Zhijie Shen via acmurthy) than throw EOF at end of file. (Zhijie Shen via acmurthy)
HADOOP-8440. HarFileSystem.decodeHarURI fails for URIs whose host contains
numbers. (Ivan Mitic via cnauroth)
Release 2.0.5-alpha - 06/06/2013 Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

31
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
View File

@ -204,35 +204,36 @@ private URI decodeHarURI(URI rawURI, Configuration conf) throws IOException {
//create a path //create a path
return FileSystem.getDefaultUri(conf); return FileSystem.getDefaultUri(conf);
} }
String host = rawURI.getHost(); String authority = rawURI.getAuthority();
if (host == null) { if (authority == null) {
throw new IOException("URI: " + rawURI throw new IOException("URI: " + rawURI
+ " is an invalid Har URI since host==null." + " is an invalid Har URI since authority==null."
+ " Expecting har://<scheme>-<host>/<path>."); + " Expecting har://<scheme>-<host>/<path>.");
} }
int i = host.indexOf('-');
int i = authority.indexOf('-');
if (i < 0) { if (i < 0) {
throw new IOException("URI: " + rawURI throw new IOException("URI: " + rawURI
+ " is an invalid Har URI since '-' not found." + " is an invalid Har URI since '-' not found."
+ " Expecting har://<scheme>-<host>/<path>."); + " Expecting har://<scheme>-<host>/<path>.");
} }
final String underLyingScheme = host.substring(0, i);
i++;
final String underLyingHost = i == host.length()? null: host.substring(i);
int underLyingPort = rawURI.getPort();
String auth = (underLyingHost == null && underLyingPort == -1)?
null:(underLyingHost+
(underLyingPort == -1 ? "" : ":"+underLyingPort));
URI tmp = null;
if (rawURI.getQuery() != null) { if (rawURI.getQuery() != null) {
// query component not allowed // query component not allowed
throw new IOException("query component in Path not supported " + rawURI); throw new IOException("query component in Path not supported " + rawURI);
} }
URI tmp = null;
try { try {
tmp = new URI(underLyingScheme, auth, rawURI.getPath(), // convert <scheme>-<host> to <scheme>://<host>
rawURI.getQuery(), rawURI.getFragment()); URI baseUri = new URI(authority.replaceFirst("-", "://"));
tmp = new URI(baseUri.getScheme(), baseUri.getAuthority(),
rawURI.getPath(), rawURI.getQuery(), rawURI.getFragment());
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
// do nothing should not happen throw new IOException("URI: " + rawURI
+ " is an invalid Har URI. Expecting har://<scheme>-<host>/<path>.");
} }
return tmp; return tmp;
} }

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java
View File

@ -33,6 +33,8 @@ public void testHarUri() {
checkInvalidPath("har://hdfs/foo.har", conf); checkInvalidPath("har://hdfs/foo.har", conf);
checkInvalidPath("har://-hdfs/foo.har", conf); checkInvalidPath("har://-hdfs/foo.har", conf);
checkInvalidPath("har://-/foo.har", conf); checkInvalidPath("har://-/foo.har", conf);
checkInvalidPath("har://127.0.0.1-/foo.har", conf);
checkInvalidPath("har://127.0.0.1/foo.har", conf);
} }
static void checkInvalidPath(String s, Configuration conf) { static void checkInvalidPath(String s, Configuration conf) {