hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject hadoop git commit: HADOOP-6842. "hadoop fs -text" does not give a useful text representation of MapWritable objects
Date Fri, 08 May 2015 17:00:44 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d4d7d7bf2 -> eef8d70bb


HADOOP-6842. "hadoop fs -text" does not give a useful text representation of MapWritable objects

(cherry picked from commit cc17c83585f581d56e7c42b91464cd7a99e8cf90)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eef8d70b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eef8d70b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eef8d70b

Branch: refs/heads/branch-2
Commit: eef8d70bb0121efe8d8aafd2b80fb4c75ddad079
Parents: d4d7d7b
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Fri May 8 11:56:59 2015 -0500
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Fri May 8 12:00:31 2015 -0500

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt          |  3 +++
 .../src/main/java/org/apache/hadoop/io/MapWritable.java  |  5 +++++
 .../test/java/org/apache/hadoop/io/TestMapWritable.java  | 11 ++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef8d70b/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2c358bb..8623a3e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -19,6 +19,9 @@ Release 2.8.0 - UNRELEASED
 
   IMPROVEMENTS
 
+    HADOOP-6842. "hadoop fs -text" does not give a useful text representation
+    of MapWritable objects (Akira Ajisaka via bobby)
+
     HADOOP-11719. [Fsshell] Remove bin/hadoop reference from
     GenericOptionsParser default help text.
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef8d70b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
index fec168b..0379ec2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
@@ -189,4 +189,9 @@ public class MapWritable extends AbstractMapWritable
       instance.put(key, value);
     }
   }
+
+  @Override
+  public String toString() {
+    return instance.toString();
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eef8d70b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
index 9284949..4597b90 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
@@ -148,5 +148,14 @@ public class TestMapWritable extends TestCase {
 
     assertEquals(map1.hashCode(), map2.hashCode());
     assertFalse(map1.hashCode() == map3.hashCode());
-}
+  }
+
+  /** Verify text command outputs a useful representation for MapWritable. */
+  public void testToString() {
+    MapWritable map = new MapWritable();
+    final IntWritable key = new IntWritable(5);
+    final Text value = new Text("value");
+    map.put(key, value);
+    assertEquals("{5=value}", map.toString());
+  }
 }


Mime
View raw message