Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 030D311DC6 for ; Wed, 2 Jul 2014 17:08:16 +0000 (UTC) Received: (qmail 67155 invoked by uid 500); 2 Jul 2014 17:08:15 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 67111 invoked by uid 500); 2 Jul 2014 17:08:15 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 67102 invoked by uid 99); 2 Jul 2014 17:08:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2014 17:08:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7BA9A994038; Wed, 2 Jul 2014 17:08:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-11413 [findbugs] RV: Negating the result of compareTo()/compare() (Mike Drob) Date: Wed, 2 Jul 2014 17:08:15 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/0.98 c8d1d7cef -> 1b2a05c94 HBASE-11413 [findbugs] RV: Negating the result of compareTo()/compare() (Mike Drob) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b2a05c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b2a05c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b2a05c9 Branch: refs/heads/0.98 Commit: 1b2a05c9446cab8e616f6988ea6d176043fd8e57 Parents: c8d1d7c Author: stack Authored: Wed Jul 2 10:07:16 2014 -0700 Committer: stack Committed: Wed Jul 2 10:07:16 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 6 +++--- .../org/apache/hadoop/hbase/migration/NamespaceUpgrade.java | 2 +- .../java/org/apache/hadoop/hbase/util/FSTableDescriptors.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1b2a05c9/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 59bc01e..1ffec8a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -294,10 +294,10 @@ public class CatalogJanitor extends Chore { // Compare start keys. result = Bytes.compareTo(left.getStartKey(), right.getStartKey()); if (result != 0) return result; - // Compare end keys. - result = rowEndKeyComparator.compare(left.getEndKey(), right.getEndKey()); + // Compare end keys, but flip the operands so parent comes first + result = rowEndKeyComparator.compare(right.getEndKey(), left.getEndKey()); - return -result; // Flip the result so parent comes first. + return result; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b2a05c9/hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java index b054813..daef083 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java @@ -524,7 +524,7 @@ public class NamespaceUpgrade implements Tool { new Comparator() { @Override public int compare(FileStatus left, FileStatus right) { - return -left.compareTo(right); + return right.compareTo(left); }}; // logic culled from FSTableDescriptors http://git-wip-us.apache.org/repos/asf/hbase/blob/1b2a05c9/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java index f3f2968..09749d0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java @@ -378,7 +378,7 @@ public class FSTableDescriptors implements TableDescriptors { new Comparator() { @Override public int compare(FileStatus left, FileStatus right) { - return -left.compareTo(right); + return right.compareTo(left); }}; /**