Author: acmurthy
Date: Tue Dec 16 14:14:46 2008
New Revision: 727191
URL: http://svn.apache.org/viewvc?rev=727191&view=rev
Log:
HADOOP-4879. Fix org.apache.hadoop.mapred.Counters to correctly define
Object.equals rather than depend on contentEquals api. Contributed by Owen
O'Malley.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Counters.java
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCounters.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=727191&r1=727190&r2=727191&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Dec 16 14:14:46 2008
@@ -456,6 +456,10 @@
HADOOP-4821. Usage description in the Quotas guide documentations are
incorrect. (Boris Shkolnik via hairong)
+ HADOOP-4879. Fix org.apache.hadoop.mapred.Counters to correctly define
+ Object.equals rather than depend on contentEquals api. (omalley via
+ acmurthy)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Counters.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Counters.java?rev=727191&r1=727190&r2=727191&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Counters.java
(original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Counters.java Tue Dec
16 14:14:46 2008
@@ -211,13 +211,20 @@
buf.append(GROUP_CLOSE); // group end
return buf.toString();
}
-
+
+ @Override
+ public int hashCode() {
+ return subcounters.hashCode();
+ }
+
/**
* Checks for (content) equality of Groups
*/
- synchronized boolean contentEquals(Group g) {
+ @Override
+ public synchronized boolean equals(Object obj) {
boolean isEqual = false;
- if (g != null) {
+ if (obj != null && obj instanceof Group) {
+ Group g = (Group) obj;
if (size() == g.size()) {
isEqual = true;
for (Map.Entry<String, Counter> entry : subcounters.entrySet()) {
@@ -671,17 +678,24 @@
return StringUtils.unEscapeString(string, StringUtils.ESCAPE_CHAR,
charsToEscape);
}
-
- synchronized boolean contentEquals(Counters counters) {
+
+ @Override
+ public synchronized int hashCode() {
+ return counters.hashCode();
+ }
+
+ @Override
+ public synchronized boolean equals(Object obj) {
boolean isEqual = false;
- if (counters != null) {
- if (size() == counters.size()) {
+ if (obj != null && obj instanceof Counters) {
+ Counters other = (Counters) obj;
+ if (size() == other.size()) {
isEqual = true;
for (Map.Entry<String, Group> entry : this.counters.entrySet()) {
String key = entry.getKey();
Group sourceGroup = entry.getValue();
- Group targetGroup = counters.getGroup(key);
- if (!sourceGroup.contentEquals(targetGroup)) {
+ Group targetGroup = other.getGroup(key);
+ if (!sourceGroup.equals(targetGroup)) {
isEqual = false;
break;
}
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCounters.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCounters.java?rev=727191&r1=727190&r2=727191&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCounters.java
(original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCounters.java Tue
Dec 16 14:14:46 2008
@@ -61,9 +61,10 @@
Counters recoveredCounter =
Counters.fromEscapedCompactString(compactEscapedString);
// Check for recovery from string
- assertTrue("Recovered counter does not match on content",
- counter.contentEquals(recoveredCounter));
-
+ assertEquals("Recovered counter does not match on content",
+ counter, recoveredCounter);
+ assertEquals("recovered counter has wrong hash code",
+ counter.hashCode(), recoveredCounter.hashCode());
}
public void testCounters() throws IOException {
