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/04/06 21:23:09 UTC
[39/50] [abbrv] hadoop git commit: MAPREDUCE-4844. Counters /
AbstractCounters have constant references not declared final. (Brahma Reddy
Battula via gera)
MAPREDUCE-4844. Counters / AbstractCounters have constant references not declared final. (Brahma Reddy Battula via gera)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/def22772
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/def22772
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/def22772
Branch: refs/heads/YARN-2928
Commit: def2277201a7221c8937f25da13801fd56434c7b
Parents: 310c997
Author: Gera Shegalov <ge...@apache.org>
Authored: Fri Apr 3 10:24:02 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Apr 6 12:08:16 2015 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/mapred/Counters.java | 6 +++---
.../org/apache/hadoop/mapreduce/counters/AbstractCounters.java | 6 +++---
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/def22772/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 160c49c..c1eb6c3 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -321,6 +321,9 @@ Release 2.8.0 - UNRELEASED
causes counter limits are not reset correctly.
(Zhihai Xu via harsh)
+ MAPREDUCE-4844. Counters / AbstractCounters have constant references not
+ declared final. (Brahma Reddy Battula via gera)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/def22772/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java
index b9cb210..c9e0b9f 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java
@@ -62,9 +62,9 @@ import com.google.common.collect.Iterators;
public class Counters
extends AbstractCounters<Counters.Counter, Counters.Group> {
- public static int MAX_COUNTER_LIMIT = Limits.getCountersMax();
- public static int MAX_GROUP_LIMIT = Limits.getGroupsMax();
- private static HashMap<String, String> depricatedCounterMap =
+ public static final int MAX_COUNTER_LIMIT = Limits.getCountersMax();
+ public static final int MAX_GROUP_LIMIT = Limits.getGroupsMax();
+ private static final HashMap<String, String> depricatedCounterMap =
new HashMap<String, String>();
static {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/def22772/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
index dd81ebb..e6e74da 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
@@ -64,11 +64,11 @@ public abstract class AbstractCounters<C extends Counter,
/**
* A cache from enum values to the associated counter.
*/
- private Map<Enum<?>, C> cache = Maps.newIdentityHashMap();
+ private final Map<Enum<?>, C> cache = Maps.newIdentityHashMap();
//framework & fs groups
- private Map<String, G> fgroups = new ConcurrentSkipListMap<String, G>();
+ private final Map<String, G> fgroups = new ConcurrentSkipListMap<String, G>();
// other groups
- private Map<String, G> groups = new ConcurrentSkipListMap<String, G>();
+ private final Map<String, G> groups = new ConcurrentSkipListMap<String, G>();
private final CounterGroupFactory<C, G> groupFactory;
// For framework counter serialization without strings