hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-18945 Make a IA.LimitedPrivate interface for CellComparator - addendum fixes compilation for branch-2
Date Tue, 17 Oct 2017 23:31:02 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 16ccd55c4 -> 998bc32ec


HBASE-18945 Make a IA.LimitedPrivate interface for CellComparator - 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/998bc32e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/998bc32e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/998bc32e

Branch: refs/heads/branch-2
Commit: 998bc32ec9bd89d61a0d918b2955f84772492f03
Parents: 16ccd55
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Oct 17 16:30:53 2017 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Oct 17 16:30:53 2017 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java  | 2 +-
 .../org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/998bc32e/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 7b0dfc5..e533041 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
@@ -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 {

http://git-wip-us.apache.org/repos/asf/hbase/blob/998bc32e/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java
index 3ba5198..2fb1e7a 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java
@@ -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());


Mime
View raw message