You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/07/22 23:36:27 UTC
[3/6] hbase git commit: HBASE-16272 Overflow in ServerName's
compareTo method (Huaxiang Sun)
HBASE-16272 Overflow in ServerName's compareTo method (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ad91bfd0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ad91bfd0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ad91bfd0
Branch: refs/heads/branch-1.3
Commit: ad91bfd0a88f761dcc07924403ddbde491868f4c
Parents: 7811d28
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri Jul 22 15:28:04 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri Jul 22 15:34:51 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/ServerName.java | 3 ++-
.../apache/hadoop/hbase/io/hfile/LruBlockCache.java | 7 +++----
.../hadoop/hbase/io/hfile/bucket/BucketCache.java | 13 +++++--------
.../apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 2 +-
.../java/org/apache/hadoop/hbase/util/HBaseFsck.java | 2 +-
5 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ad91bfd0/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
index 5ccdd35..eef8bee 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
@@ -289,7 +289,8 @@ public class ServerName implements Comparable<ServerName>, Serializable {
if (compare != 0) return compare;
compare = this.getPort() - other.getPort();
if (compare != 0) return compare;
- return (int)(this.getStartcode() - other.getStartcode());
+
+ return Long.compare(this.getStartcode(), other.getStartcode());
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/ad91bfd0/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 28c4c22..74e56fb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -740,8 +740,7 @@ public class LruBlockCache implements ResizableBlockCache, HeapSize {
}
public int compareTo(BlockBucket that) {
- if(this.overflow() == that.overflow()) return 0;
- return this.overflow() > that.overflow() ? 1 : -1;
+ return Long.compare(this.overflow(), that.overflow());
}
@Override
@@ -978,13 +977,13 @@ public class LruBlockCache implements ResizableBlockCache, HeapSize {
public int compareTo(CachedBlock other) {
int diff = this.getFilename().compareTo(other.getFilename());
if (diff != 0) return diff;
- diff = (int)(this.getOffset() - other.getOffset());
+ diff = Long.compare(this.getOffset(), other.getOffset());
if (diff != 0) return diff;
if (other.getCachedTime() < 0 || this.getCachedTime() < 0) {
throw new IllegalStateException("" + this.getCachedTime() + ", " +
other.getCachedTime());
}
- return (int)(other.getCachedTime() - this.getCachedTime());
+ return Long.compare(other.getCachedTime(), this.getCachedTime());
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/ad91bfd0/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 94db0d2..c0a9e17 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -1076,9 +1076,7 @@ public class BucketCache implements BlockCache, HeapSize {
@Override
public int compare(BucketEntry o1, BucketEntry o2) {
- long accessCounter1 = o1.accessCounter;
- long accessCounter2 = o2.accessCounter;
- return accessCounter1 < accessCounter2 ? 1 : accessCounter1 == accessCounter2 ? 0 : -1;
+ return Long.compare(o2.accessCounter, o1.accessCounter);
}
};
@@ -1199,9 +1197,7 @@ public class BucketCache implements BlockCache, HeapSize {
@Override
public int compareTo(BucketEntryGroup that) {
- if (this.overflow() == that.overflow())
- return 0;
- return this.overflow() > that.overflow() ? 1 : -1;
+ return Long.compare(this.overflow(), that.overflow());
}
@Override
@@ -1348,13 +1344,14 @@ public class BucketCache implements BlockCache, HeapSize {
public int compareTo(CachedBlock other) {
int diff = this.getFilename().compareTo(other.getFilename());
if (diff != 0) return diff;
- diff = (int)(this.getOffset() - other.getOffset());
+
+ diff = Long.compare(this.getOffset(), other.getOffset());
if (diff != 0) return diff;
if (other.getCachedTime() < 0 || this.getCachedTime() < 0) {
throw new IllegalStateException("" + this.getCachedTime() + ", " +
other.getCachedTime());
}
- return (int)(other.getCachedTime() - this.getCachedTime());
+ return Long.compare(other.getCachedTime(), this.getCachedTime());
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/ad91bfd0/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
index 7574965..a516973 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
@@ -140,7 +140,7 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs
long deadlineB = priority.getDeadline(callB.getHeader(), callB.param);
deadlineA = callA.timestamp + Math.min(deadlineA, maxDelay);
deadlineB = callB.timestamp + Math.min(deadlineB, maxDelay);
- return (int)(deadlineA - deadlineB);
+ return Long.compare(deadlineA, deadlineB);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/ad91bfd0/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 2473d0a..11bd235 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -3421,7 +3421,7 @@ public class HBaseFsck extends Configured implements Closeable {
final Comparator<Cell> comp = new Comparator<Cell>() {
@Override
public int compare(Cell k1, Cell k2) {
- return (int)(k1.getTimestamp() - k2.getTimestamp());
+ return Long.compare(k1.getTimestamp(), k2.getTimestamp());
}
};