Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1BF34DDF5 for ; Thu, 5 Jul 2012 18:09:33 +0000 (UTC) Received: (qmail 53640 invoked by uid 500); 5 Jul 2012 18:09:33 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 53589 invoked by uid 500); 5 Jul 2012 18:09:32 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 53581 invoked by uid 99); 5 Jul 2012 18:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 18:09:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 18:09:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AB9DC2388A56; Thu, 5 Jul 2012 18:09:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357776 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoo... Date: Thu, 05 Jul 2012 18:09:09 -0000 To: mapreduce-commits@hadoop.apache.org From: bobby@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120705180909.AB9DC2388A56@eris.apache.org> Author: bobby Date: Thu Jul 5 18:09:09 2012 New Revision: 1357776 URL: http://svn.apache.org/viewvc?rev=1357776&view=rev Log: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby) Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1357776&r1=1357775&r2=1357776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Jul 5 18:09:09 2012 @@ -635,6 +635,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby) + MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 + (Jason Lowe via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java?rev=1357776&r1=1357775&r2=1357776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java Thu Jul 5 18:09:09 2012 @@ -90,7 +90,23 @@ public class Counters } public synchronized String makeCompactString() { - return CountersStrings.toEscapedCompactString(this); + StringBuilder builder = new StringBuilder(); + boolean first = true; + for(Group group: this){ + for(Counter counter: group) { + if (first) { + first = false; + } else { + builder.append(','); + } + builder.append(group.getDisplayName()); + builder.append('.'); + builder.append(counter.getDisplayName()); + builder.append(':'); + builder.append(counter.getCounter()); + } + } + return builder.toString(); } /** Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java?rev=1357776&r1=1357775&r2=1357776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java Thu Jul 5 18:09:09 2012 @@ -224,6 +224,19 @@ public class TestCounters { iterator.next(); } + @Test + public void testMakeCompactString() { + final String GC1 = "group1.counter1:1"; + final String GC2 = "group2.counter2:3"; + Counters counters = new Counters(); + counters.incrCounter("group1", "counter1", 1); + assertEquals("group1.counter1:1", counters.makeCompactString()); + counters.incrCounter("group2", "counter2", 3); + String cs = counters.makeCompactString(); + assertTrue("Bad compact string", + cs.equals(GC1 + ',' + GC2) || cs.equals(GC2 + ',' + GC1)); + } + public static void main(String[] args) throws IOException { new TestCounters().testCounters(); }