svn commit: r548481 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/ClientProtocol.java src/java/org/apache/hadoop/dfs/DatanodeInfo.java

[cutting]

Author: cutting
Date: Mon Jun 18 13:39:33 2007
New Revision: 548481

URL: http://svn.apache.org/viewvc?view=rev&rev=548481
Log:
HADOOP-1459.  Fix so that, in HDFS, getFileCacheHints() returns hostnames 
instead of IP addresses.  Contributed by Dhruba.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/ClientProtocol.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DatanodeInfo.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=548481&r1=548480&r2=548481
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Mon Jun 18 13:39:33 2007
@@ -153,6 +153,9 @@
  48. HADOOP-1449.  Add some examples to contrib/data_join.
      (Senthil Subramanian via cutting)
 
+ 49. HADOOP-1459.  Fix so that, in HDFS, getFileCacheHints() returns
+     hostnames instead of IP addresses.  (Dhruba Borthakur via cutting)
+
 
 Release 0.13.0 - 2007-06-08
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/ClientProtocol.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/ClientProtocol.java?view=diff&rev=548481&r1=548480&r2=548481
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/ClientProtocol.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/ClientProtocol.java Mon 
Jun 18 13:39:33 2007
@@ -35,8 +35,9 @@
    *     getBlockLocations() added; 
    *     DFSFileInfo format changed;
    *     getHints() removed.
+   *     DatanodeInfo serialization has hostname.
    */
-  public static final long versionID = 12L;
+  public static final long versionID = 13L;
   
   ///////////////////////////////////////
   // File contents

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DatanodeInfo.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DatanodeInfo.java?view=diff&rev=548481&r1=548480&r2=548481
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DatanodeInfo.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DatanodeInfo.java Mon 
Jun 18 13:39:33 2007
@@ -288,6 +288,11 @@
     out.writeLong(lastUpdate);
     out.writeInt(xceiverCount);
     Text.writeString(out, location);
+    if (hostName == null) {
+      Text.writeString(out, "");
+    } else {
+      Text.writeString(out, hostName);
+    }
     WritableUtils.writeEnum(out, getAdminState());
   }
 
@@ -300,6 +305,7 @@
     this.lastUpdate = in.readLong();
     this.xceiverCount = in.readInt();
     this.location = Text.readString(in);
+    this.hostName = Text.readString(in);
     AdminStates newState = (AdminStates) WritableUtils.readEnum(in,
                                                                 
AdminStates.class);
     setAdminState(newState);