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 iv...@apache.org on 2013/09/25 07:22:26 UTC
svn commit: r1526110 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/fs/HarFileSystem.java
src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
Author: ivanmi
Date: Wed Sep 25 05:22:25 2013
New Revision: 1526110
URL: http://svn.apache.org/r1526110
Log:
HADOOP-9776. Merging change r1526109 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1526110&r1=1526109&r2=1526110&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Sep 25 05:22:25 2013
@@ -108,6 +108,9 @@ Release 2.1.2 - UNRELEASED
BUG FIXES
+ HADOOP-9776. HarFileSystem.listStatus() returns invalid authority if port
+ number is empty. (Shanyu Zhao via ivanmi)
+
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java?rev=1526110&r1=1526109&r2=1526110&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java Wed Sep 25 05:22:25 2013
@@ -283,8 +283,9 @@ public class HarFileSystem extends Filte
private String getHarAuth(URI underLyingUri) {
String auth = underLyingUri.getScheme() + "-";
if (underLyingUri.getHost() != null) {
- auth += underLyingUri.getHost() + ":";
+ auth += underLyingUri.getHost();
if (underLyingUri.getPort() != -1) {
+ auth += ":";
auth += underLyingUri.getPort();
}
}
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java?rev=1526110&r1=1526109&r2=1526110&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java Wed Sep 25 05:22:25 2013
@@ -221,6 +221,17 @@ public class TestHarFileSystemBasics {
hfs.initialize(uri, new Configuration());
}
+ @Test
+ public void testPositiveListFilesNotEndInColon() throws Exception {
+ // re-initialize the har file system with host name
+ // make sure the qualified path name does not append ":" at the end of host name
+ final URI uri = new URI("har://file-localhost" + harPath.toString());
+ harFileSystem.initialize(uri, conf);
+ Path p1 = new Path("har://file-localhost" + harPath.toString());
+ Path p2 = harFileSystem.makeQualified(p1);
+ assertTrue(p2.toUri().toString().startsWith("har://file-localhost/"));
+ }
+
// ========== Negative:
@Test