hadoop git commit: MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary null strings. Contributed by Akira AJISAKA.

2015-05-04 Thread ozawa 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 5b27d9e07 - 1035f550b


MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary 
null strings. Contributed by Akira AJISAKA.

(cherry picked from commit 3ba18362f2a4b83635b89aa0adc5ebaf27d9ca83)


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

Branch: refs/heads/branch-2
Commit: 1035f550b9019ed7fe6479dc37a4858aafa33d12
Parents: 5b27d9e
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Mon May 4 15:02:21 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Mon May 4 15:02:40 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt   |  3 +++
 .../hadoop/mapreduce/util/CountersStrings.java | 17 ++---
 .../org/apache/hadoop/mapred/TestCounters.java |  3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1035f550/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 963da70..84c5f85 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -107,6 +107,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster
 logs. (Rohit Agarwal via gera)
 
+MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs
+unnecessary null strings. (Akira AJISAKA via ozawa)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1035f550/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
index ce799f5..ac16c12 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
@@ -151,25 +151,12 @@ public class CountersStrings {
   public static C extends Counter, G extends CounterGroupBaseC,
  T extends AbstractCountersC, G
   String toEscapedCompactString(T counters) {
-String[] groupsArray;
-int length = 0;
+StringBuilder builder = new StringBuilder();
 synchronized(counters) {
-  groupsArray = new String[counters.countCounters()];
-  int i = 0;
-  // First up, obtain the escaped string for each group so that we can
-  // determine the buffer length apriori.
   for (G group : counters) {
-String escapedString = toEscapedCompactString(group);
-groupsArray[i++] = escapedString;
-length += escapedString.length();
+builder.append(toEscapedCompactString(group));
   }
 }
-
-// Now construct the buffer
-StringBuilder builder = new StringBuilder(length);
-for (String group : groupsArray) {
-  builder.append(group);
-}
 return builder.toString();
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1035f550/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
index 46e7221..5e2763e 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.mapred;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -84,6 +85,8 @@ public class TestCounters {
*/
   private void

hadoop git commit: MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary null strings. Contributed by Akira AJISAKA.

2015-05-04 Thread ozawa 
Repository: hadoop
Updated Branches:
  refs/heads/trunk a319771d1 - 3ba18362f


MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary 
null strings. Contributed by Akira AJISAKA.


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

Branch: refs/heads/trunk
Commit: 3ba18362f2a4b83635b89aa0adc5ebaf27d9ca83
Parents: a319771
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Mon May 4 15:02:21 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Mon May 4 15:02:21 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt   |  3 +++
 .../hadoop/mapreduce/util/CountersStrings.java | 17 ++---
 .../org/apache/hadoop/mapred/TestCounters.java |  3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 2d87444..062042c 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -359,6 +359,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster
 logs. (Rohit Agarwal via gera)
 
+MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs
+unnecessary null strings. (Akira AJISAKA via ozawa)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
index ce799f5..ac16c12 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
@@ -151,25 +151,12 @@ public class CountersStrings {
   public static C extends Counter, G extends CounterGroupBaseC,
  T extends AbstractCountersC, G
   String toEscapedCompactString(T counters) {
-String[] groupsArray;
-int length = 0;
+StringBuilder builder = new StringBuilder();
 synchronized(counters) {
-  groupsArray = new String[counters.countCounters()];
-  int i = 0;
-  // First up, obtain the escaped string for each group so that we can
-  // determine the buffer length apriori.
   for (G group : counters) {
-String escapedString = toEscapedCompactString(group);
-groupsArray[i++] = escapedString;
-length += escapedString.length();
+builder.append(toEscapedCompactString(group));
   }
 }
-
-// Now construct the buffer
-StringBuilder builder = new StringBuilder(length);
-for (String group : groupsArray) {
-  builder.append(group);
-}
 return builder.toString();
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
index 46e7221..5e2763e 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.mapred;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -84,6 +85,8 @@ public class TestCounters {
*/
   private void testCounter(Counters counter) throws ParseException {
 String

[21/33] hadoop git commit: MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary null strings. Contributed by Akira AJISAKA.

2015-05-04 Thread jitendra 
MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary 
null strings. Contributed by Akira AJISAKA.


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

Branch: refs/heads/HDFS-7240
Commit: 3ba18362f2a4b83635b89aa0adc5ebaf27d9ca83
Parents: a319771
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Mon May 4 15:02:21 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Mon May 4 15:02:21 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt   |  3 +++
 .../hadoop/mapreduce/util/CountersStrings.java | 17 ++---
 .../org/apache/hadoop/mapred/TestCounters.java |  3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 2d87444..062042c 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -359,6 +359,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster
 logs. (Rohit Agarwal via gera)
 
+MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs
+unnecessary null strings. (Akira AJISAKA via ozawa)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
index ce799f5..ac16c12 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
@@ -151,25 +151,12 @@ public class CountersStrings {
   public static C extends Counter, G extends CounterGroupBaseC,
  T extends AbstractCountersC, G
   String toEscapedCompactString(T counters) {
-String[] groupsArray;
-int length = 0;
+StringBuilder builder = new StringBuilder();
 synchronized(counters) {
-  groupsArray = new String[counters.countCounters()];
-  int i = 0;
-  // First up, obtain the escaped string for each group so that we can
-  // determine the buffer length apriori.
   for (G group : counters) {
-String escapedString = toEscapedCompactString(group);
-groupsArray[i++] = escapedString;
-length += escapedString.length();
+builder.append(toEscapedCompactString(group));
   }
 }
-
-// Now construct the buffer
-StringBuilder builder = new StringBuilder(length);
-for (String group : groupsArray) {
-  builder.append(group);
-}
 return builder.toString();
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ba18362/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
index 46e7221..5e2763e 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.mapred;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -84,6 +85,8 @@ public class TestCounters {
*/
   private void testCounter(Counters counter) throws ParseException {
 String compactEscapedString = counter.makeEscapedCompactString();
+

[42/50] [abbrv] hadoop git commit: MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary null strings. Contributed by Akira AJISAKA.

2015-05-04 Thread zjshen 
MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs unnecessary 
null strings. Contributed by Akira AJISAKA.


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

Branch: refs/heads/YARN-2928
Commit: 62d72e26fd55ab8e2152ae17f0e99509bd76250a
Parents: 195d746
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Mon May 4 15:02:21 2015 +0900
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon May 4 12:59:00 2015 -0700

--
 hadoop-mapreduce-project/CHANGES.txt   |  3 +++
 .../hadoop/mapreduce/util/CountersStrings.java | 17 ++---
 .../org/apache/hadoop/mapred/TestCounters.java |  3 +++
 3 files changed, 8 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/62d72e26/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 1b23ee2..86477c3 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -377,6 +377,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster
 logs. (Rohit Agarwal via gera)
 
+MAPREDUCE-5905. CountersStrings.toEscapedCompactStrings outputs
+unnecessary null strings. (Akira AJISAKA via ozawa)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/62d72e26/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
index ce799f5..ac16c12 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/CountersStrings.java
@@ -151,25 +151,12 @@ public class CountersStrings {
   public static C extends Counter, G extends CounterGroupBaseC,
  T extends AbstractCountersC, G
   String toEscapedCompactString(T counters) {
-String[] groupsArray;
-int length = 0;
+StringBuilder builder = new StringBuilder();
 synchronized(counters) {
-  groupsArray = new String[counters.countCounters()];
-  int i = 0;
-  // First up, obtain the escaped string for each group so that we can
-  // determine the buffer length apriori.
   for (G group : counters) {
-String escapedString = toEscapedCompactString(group);
-groupsArray[i++] = escapedString;
-length += escapedString.length();
+builder.append(toEscapedCompactString(group));
   }
 }
-
-// Now construct the buffer
-StringBuilder builder = new StringBuilder(length);
-for (String group : groupsArray) {
-  builder.append(group);
-}
 return builder.toString();
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/62d72e26/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
index 46e7221..5e2763e 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.mapred;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -84,6 +85,8 @@ public class TestCounters {
*/
   private void testCounter(Counters counter) throws ParseException {
 String compactEscapedString = counter.makeEscapedCompactString();
+