You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/11/29 06:12:08 UTC
svn commit: r1207756 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src...
Author: tomwhite
Date: Tue Nov 29 05:12:07 2011
New Revision: 1207756
URL: http://svn.apache.org/viewvc?rev=1207756&view=rev
Log:
Merge -r 1207754:1207755 from trunk to branch-0.23. Fixes: MAPREDUCE-3433
Added:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
- copied unchanged from r1207755, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestCounters.java
Removed:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCounters.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1207756&r1=1207755&r2=1207756&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Nov 29 05:12:07 2011
@@ -143,6 +143,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3468. Changed ant based infrastructure to use 0.23.1 version.
(sseth via acmurthy)
+ MAPREDUCE-3433. Finding counters by legacy group name returns empty
+ counters. (tomwhite)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java?rev=1207756&r1=1207755&r2=1207756&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java Tue Nov 29 05:12:07 2011
@@ -194,15 +194,16 @@ public abstract class AbstractCounters<C
* @return the group
*/
public synchronized G getGroup(String groupName) {
- boolean isFGroup = isFrameworkGroup(groupName);
- G group = isFGroup ? fgroups.get(groupName) : groups.get(groupName);
+ String newGroupName = filterGroupName(groupName);
+ boolean isFGroup = isFrameworkGroup(newGroupName);
+ G group = isFGroup ? fgroups.get(newGroupName) : groups.get(newGroupName);
if (group == null) {
- group = groupFactory.newGroup(filterGroupName(groupName), limits);
+ group = groupFactory.newGroup(newGroupName, limits);
if (isFGroup) {
- fgroups.put(groupName, group);
+ fgroups.put(newGroupName, group);
} else {
limits.checkGroups(groups.size() + 1);
- groups.put(groupName, group);
+ groups.put(newGroupName, group);
}
}
return group;