Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FD8F1747B for ; Mon, 23 Feb 2015 19:36:29 +0000 (UTC) Received: (qmail 95942 invoked by uid 500); 23 Feb 2015 19:36:01 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 95866 invoked by uid 500); 23 Feb 2015 19:36:01 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 92731 invoked by uid 99); 23 Feb 2015 19:35:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Feb 2015 19:35:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 13548E0F34; Mon, 23 Feb 2015 19:35:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhz@apache.org To: common-commits@hadoop.apache.org Date: Mon, 23 Feb 2015 19:36:29 -0000 Message-Id: In-Reply-To: <53370366e1214d6f81f01539107bdb02@git.apache.org> References: <53370366e1214d6f81f01539107bdb02@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] hadoop git commit: MAPREDUCE-6255. Fix JobCounter's format to use grouping separator. Contributed by Ryu Kobayashi. MAPREDUCE-6255. Fix JobCounter's format to use grouping separator. Contributed by Ryu Kobayashi. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4f8c978 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4f8c978 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4f8c978 Branch: refs/heads/HDFS-EC Commit: a4f8c978d4fb4e7ff67c4932a63c50ac88b7af74 Parents: ac5497c Author: Tsuyoshi Ozawa Authored: Fri Feb 13 16:09:54 2015 +0900 Committer: Zhe Zhang Committed: Mon Feb 16 10:29:49 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4f8c978/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 657b441..38982e4 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -288,6 +288,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-4431. mapred command should print the reason on killing already completed jobs. (devaraj via ozawa) + MAPREDUCE-6255. Fix JobCounter's format to use grouping separator. + (Ryu Kobayashi via ozawa) + OPTIMIZATIONS MAPREDUCE-6169. MergeQueue should release reference to the current item http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4f8c978/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java index 1b20c5d..568658e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java @@ -139,10 +139,10 @@ public class CountersBlock extends HtmlBlock { Counter mc = mg == null ? null : mg.findCounter(counter.getName()); Counter rc = rg == null ? null : rg.findCounter(counter.getName()); groupRow. - td(mc == null ? "0" : String.valueOf(mc.getValue())). - td(rc == null ? "0" : String.valueOf(rc.getValue())); + td(mc == null ? "0" : String.format("%,d", mc.getValue())). + td(rc == null ? "0" : String.format("%,d", rc.getValue())); } - groupRow.td(String.valueOf(counter.getValue()))._(); + groupRow.td(String.format("%,d", counter.getValue()))._(); } group._()._()._()._(); }