Repository: hbase Updated Branches: refs/heads/branch-2 cfddfcf23 -> 50f30668b
HBASE-19160 expose CellComparator as IA.Public - addendum fixes compilation for branch-2 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/50f30668 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/50f30668 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/50f30668 Branch: refs/heads/branch-2 Commit: 50f30668b825cccd7c795e8b23217e2a68fdb02d Parents: cfddfcf Author: tedyu <yuzhih...@gmail.com> Authored: Mon Nov 6 11:32:26 2017 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Nov 6 11:32:26 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/50f30668/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java index fb3a1ef..eaa3343 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java @@ -165,7 +165,7 @@ public class Import extends Configured implements Tool { @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "EQ_COMPARETO_USE_OBJECT_EQUALS", justification = "This is wrong, yes, but we should be purging Writables, not fixing them") public int compareTo(KeyValueWritableComparable o) { - return CellComparatorImpl.COMPARATOR.compare(this.kv, ((KeyValueWritableComparable) o).kv); + return CellComparator.getInstance().compare(this.kv, o.kv); } public static class KeyValueWritableComparator extends WritableComparator {