You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/01/19 06:05:51 UTC
svn commit: r1435487 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase: client/
filter/ io/hfile/ mapred/ master/ regionserver/compactions/
Author: stack
Date: Sat Jan 19 05:05:50 2013
New Revision: 1435487
URL: http://svn.apache.org/viewvc?rev=1435487&view=rev
Log:
HBASE-7601 Fix 8 remaining EQ findbug warnings from hbase-server.
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Action.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Increment.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/NullComparator.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CachedBlock.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Action.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Action.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Action.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Action.java Sat Jan 19 05:05:50 2013
@@ -28,7 +28,7 @@ import org.apache.hadoop.classification.
*/
@InterfaceAudience.Public
@InterfaceStability.Stable
-public class Action<R> implements Comparable {
+public class Action<R> implements Comparable<R> {
private Row action;
private int originalIndex;
@@ -77,4 +77,12 @@ public class Action<R> implements Compar
public int compareTo(Object o) {
return action.compareTo(((Action) o).getAction());
}
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null || getClass() != obj.getClass()) return false;
+ Action<?> other = (Action<?>) obj;
+ return compareTo(other) == 0;
+ }
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java Sat Jan 19 05:05:50 2013
@@ -18,6 +18,7 @@
*/
package org.apache.hadoop.hbase.client;
+
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.HConstants;
@@ -418,8 +419,20 @@ public class Get extends OperationWithAt
}
//Row
+ @Override
public int compareTo(Row other) {
return Bytes.compareTo(this.getRow(), other.getRow());
}
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ Row other = (Row) obj;
+ return compareTo(other) == 0;
+ }
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Increment.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Increment.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Increment.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Increment.java Sat Jan 19 05:05:50 2013
@@ -274,4 +274,16 @@ public class Increment implements Row {
public int compareTo(Row i) {
return Bytes.compareTo(this.getRow(), i.getRow());
}
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ Row other = (Row) obj;
+ return compareTo(other) == 0;
+ }
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/NullComparator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/NullComparator.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/NullComparator.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/NullComparator.java Sat Jan 19 05:05:50 2013
@@ -44,6 +44,11 @@ public class NullComparator extends Byte
}
@Override
+ public boolean equals(Object obj) {
+ return obj == null;
+ }
+
+ @Override
public int compareTo(byte[] value, int offset, int length) {
throw new UnsupportedOperationException();
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CachedBlock.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CachedBlock.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CachedBlock.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CachedBlock.java Sat Jan 19 05:05:50 2013
@@ -96,11 +96,24 @@ public class CachedBlock implements Heap
return size;
}
+ @Override
public int compareTo(CachedBlock that) {
if(this.accessTime == that.accessTime) return 0;
return this.accessTime < that.accessTime ? 1 : -1;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ CachedBlock other = (CachedBlock) obj;
+ return compareTo(other) == 0;
+ }
+
public Cacheable getBuffer() {
return this.buf;
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java Sat Jan 19 05:05:50 2013
@@ -106,7 +106,20 @@ public class TableSplit implements Input
Bytes.toStringBinary(m_startRow) + "," + Bytes.toStringBinary(m_endRow);
}
+ @Override
public int compareTo(TableSplit o) {
return Bytes.compareTo(getStartRow(), o.getStartRow());
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == null || !(o instanceof TableSplit)) {
+ return false;
+ }
+ TableSplit other = (TableSplit)o;
+ return Bytes.equals(m_tableName, other.m_tableName) &&
+ Bytes.equals(m_startRow, other.m_startRow) &&
+ Bytes.equals(m_endRow, other.m_endRow) &&
+ m_regionLocation.equals(other.m_regionLocation);
+ }
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java Sat Jan 19 05:05:50 2013
@@ -117,6 +117,18 @@ public class RegionPlan implements Compa
}
@Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ RegionPlan other = (RegionPlan) obj;
+ return compareTo(other) == 0;
+ }
+
+ @Override
public String toString() {
return "hri=" + this.hri.getRegionNameAsString() + ", src=" +
(this.source == null? "": this.source.toString()) +
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java?rev=1435487&r1=1435486&r2=1435487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java Sat Jan 19 05:05:50 2013
@@ -174,6 +174,11 @@ public class CompactionRequest implement
return this.hashCode() - request.hashCode();
}
+ @Override
+ public boolean equals(Object obj) {
+ return (this == obj);
+ }
+
/** Gets the HRegion for the request */
public HRegion getHRegion() {
return r;