svn commit: r767637 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java

[cd...@apache.org]

Author: cdouglas
Date: Wed Apr 22 19:54:07 2009
New Revision: 767637

URL: http://svn.apache.org/viewvc?rev=767637&view=rev
Log:
HADOOP-5688. Fix HftpFileSystem checksum path construction. Contributed by Tsz Wo (Nicholas) Sze

Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
    hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=767637&r1=767636&r2=767637&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Apr 22 19:54:07 2009
@@ -1,5 +1,12 @@
 Hadoop Change Log
 
+Release 0.20.1 - Unreleased
+
+  BUG FIXES
+
+    HADOOP-5688. Fix HftpFileSystem checksum path construction. (Tsz Wo
+    (Nicholas) Sze via cdouglas)
+
 Release 0.20.0 - 2009-04-15
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=767637&r1=767636&r2=767637&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java (original)
+++ hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java Wed Apr 22 19:54:07 2009
@@ -273,7 +273,7 @@
       filechecksum = MD5MD5CRC32FileChecksum.valueOf(attrs);
     }
 
-    private FileChecksum getFileChecksum(Path f) throws IOException {
+    private FileChecksum getFileChecksum(String f) throws IOException {
       final HttpURLConnection connection = openConnection(
           "/fileChecksum" + f, "ugi=" + ugi);
       try {
@@ -299,7 +299,8 @@
 
   /** {@inheritDoc} */
   public FileChecksum getFileChecksum(Path f) throws IOException {
-    return new ChecksumParser().getFileChecksum(f);
+    final String s = makeQualified(f).toUri().getPath();
+    return new ChecksumParser().getFileChecksum(s);
   }
 
   @Override

Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java?rev=767637&r1=767636&r2=767637&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java (original)
+++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java Wed Apr 22 19:54:07 2009
@@ -162,6 +162,10 @@
       final FileChecksum hftpfoocs = hftp.getFileChecksum(foo);
       System.out.println("hftpfoocs=" + hftpfoocs);
 
+      final Path qualified = new Path(hftpuri + dir, "foo" + n);
+      final FileChecksum qfoocs = hftp.getFileChecksum(qualified);
+      System.out.println("qfoocs=" + qfoocs);
+
       //write another file
       final Path bar = new Path(dir, "bar" + n);
       {
@@ -179,6 +183,9 @@
 
         assertEquals(hftpfoocs.hashCode(), barhashcode);
         assertEquals(hftpfoocs, barcs);
+
+        assertEquals(qfoocs.hashCode(), barhashcode);
+        assertEquals(qfoocs, barcs);
       }
     }
   }