Repository: hbase Updated Branches: refs/heads/branch-1 b59d93159 -> a181dff8e
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/a181dff8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a181dff8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a181dff8 Branch: refs/heads/branch-1 Commit: a181dff8e0d0a0972698d7271ec2348d5283c958 Parents: b59d931 Author: stack <[email protected]> Authored: Wed Jul 2 10:07:36 2014 -0700 Committer: stack <[email protected]> Committed: Wed Jul 2 10:07:36 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/a181dff8/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/a181dff8/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<FileStatus>() { @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/a181dff8/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<FileStatus>() { @Override public int compare(FileStatus left, FileStatus right) { - return -left.compareTo(right); + return right.compareTo(left); }}; /**
