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 zj...@apache.org on 2015/05/09 02:42:12 UTC

[18/50] hadoop git commit: HADOOP-6842. "hadoop fs -text" does not give a useful text representation of MapWritable objects

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


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

Branch: refs/heads/YARN-2928
Commit: deec508796232dc73f2c60d5a8a0f0992c71f598
Parents: 758b6d4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri May 8 11:56:59 2015 -0500
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:48 2015 -0700

----------------------------------------------------------------------
 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/deec5087/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 f4b9246..432c6b6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -479,6 +479,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.
     (Brahma Reddy Battula via harsh)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/deec5087/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/deec5087/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());
+  }
 }