You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by ki...@apache.org on 2013/07/17 23:57:54 UTC
svn commit: r1504296 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java
Author: kihwal
Date: Wed Jul 17 21:57:54 2013
New Revision: 1504296
URL: http://svn.apache.org/r1504296
Log:
HDFS-4943. WebHdfsFileSystem does not work when original file path has encoded chars. Contributed by Jerry He and Robert Parker.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1504296&r1=1504295&r2=1504296&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jul 17 21:57:54 2013
@@ -19,6 +19,9 @@ Release 0.23.10 - UNRELEASED
HDFS-4998. TestUnderReplicatedBlocks fails intermittently (kihwal)
+ HDFS-4943. WebHdfsFileSystem does not work when original file path has
+ encoded chars. (Jerry He and Robert Parker via kihwal)
+
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java?rev=1504296&r1=1504295&r2=1504296&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java Wed Jul 17 21:57:54 2013
@@ -324,7 +324,7 @@ public class WebHdfsFileSystem extends F
final Param<?,?>... parameters) throws IOException {
//initialize URI path and query
final String path = PATH_PREFIX
- + (fspath == null? "/": makeQualified(fspath).toUri().getPath());
+ + (fspath == null? "/": makeQualified(fspath).toUri().getRawPath());
final String query = op.toQueryString()
+ Param.toSortedString("&", getAuthParameters(op))
+ Param.toSortedString("&", parameters);
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java?rev=1504296&r1=1504295&r2=1504296&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsUrl.java Wed Jul 17 21:57:54 2013
@@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.web;
import java.io.IOException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
@@ -55,6 +56,23 @@ public class TestWebHdfsUrl {
UserGroupInformation.setConfiguration(new Configuration());
}
+
+ @Test(timeout=60000)
+ public void testEncodedPathUrl() throws IOException, URISyntaxException{
+ Configuration conf = new Configuration();
+
+ final WebHdfsFileSystem webhdfs = (WebHdfsFileSystem) FileSystem.get(
+ uri, conf);
+
+ // Construct a file path that contains percentage-encoded string
+ String pathName = "/hdtest010%2C60020%2C1371000602151.1371058984668";
+ Path fsPath = new Path(pathName);
+ URL encodedPathUrl = webhdfs.toUrl(PutOpParam.Op.CREATE, fsPath);
+ // We should get back the original file path after cycling back and decoding
+ Assert.assertEquals(WebHdfsFileSystem.PATH_PREFIX + pathName,
+ encodedPathUrl.toURI().getPath());
+ }
+
@Test(timeout=4000)
public void testSimpleAuthParamsInUrl() throws IOException {
Configuration conf = new Configuration();