HBASE-18945 Make a IA.LimitedPrivate interface for CellComparator - addendum fixes compilation for branch-2
This commit is contained in:
parent
16ccd55c43
commit
998bc32ec9
|
@ -164,7 +164,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 CellComparator.COMPARATOR.compare(this.kv, ((KeyValueWritableComparable) o).kv);
|
||||
return CellComparatorImpl.COMPARATOR.compare(this.kv, ((KeyValueWritableComparable) o).kv);
|
||||
}
|
||||
|
||||
public static class KeyValueWritableComparator extends WritableComparator {
|
||||
|
|
|
@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.mapreduce;
|
|||
import java.util.TreeSet;
|
||||
|
||||
import org.apache.yetus.audience.InterfaceAudience;
|
||||
import org.apache.hadoop.hbase.CellComparator;
|
||||
import org.apache.hadoop.hbase.CellComparatorImpl;
|
||||
import org.apache.hadoop.hbase.KeyValue;
|
||||
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
|
||||
import org.apache.hadoop.mapreduce.Reducer;
|
||||
|
@ -42,7 +42,7 @@ public class KeyValueSortReducer
|
|||
protected void reduce(ImmutableBytesWritable row, Iterable<KeyValue> kvs,
|
||||
Reducer<ImmutableBytesWritable, KeyValue, ImmutableBytesWritable, KeyValue>.Context context)
|
||||
throws java.io.IOException, InterruptedException {
|
||||
TreeSet<KeyValue> map = new TreeSet<>(CellComparator.COMPARATOR);
|
||||
TreeSet<KeyValue> map = new TreeSet<>(CellComparatorImpl.COMPARATOR);
|
||||
for (KeyValue kv: kvs) {
|
||||
try {
|
||||
map.add(kv.clone());
|
||||
|
|
Loading…
Reference in New Issue