diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 59bc01e..1ffec8a 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ 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; } } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java index b054813..daef083 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java +++ 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 diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java index f3f2968..09749d0 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java +++ 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); }}; /**