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-19052 FixedFileTrailer should recognize CellComparatorImpl class in branch-1.x
Date Mon, 23 Oct 2017 14:43:35 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 11a4eb9af -> 795f48c31


HBASE-19052 FixedFileTrailer should recognize CellComparatorImpl class in branch-1.x


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/795f48c3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/795f48c3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/795f48c3

Branch: refs/heads/branch-1
Commit: 795f48c31178dfe350ced0ba39b284ed9e9ca5fe
Parents: 11a4eb9
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Oct 23 07:43:26 2017 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Oct 23 07:43:26 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/795f48c3/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
index ade67b5..2a3a47d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
@@ -571,13 +571,13 @@ public class FixedFileTrailer {
         comparatorClassName = KeyValue.META_COMPARATOR.getClass().getName();
       } else if (comparatorClassName.equals(KeyValue.RAW_COMPARATOR.getLegacyKeyComparatorName()))
{
         comparatorClassName = KeyValue.RAW_COMPARATOR.getClass().getName();
-      } else if (comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator")) {
+      } else if (comparatorClassName.equals("org.apache.hadoop.hbase.CellComparatorImpl"))
{
         // 2.0 based comparators found in class name. Convert it to corresponding Comparators
in 1.x
-        // branch. Refer to HBASE-16189
+        // branch. Refer to HBASE-19052
         comparatorClassName = KeyValue.COMPARATOR.getClass().getName();
       } else if ((comparatorClassName
-          .equals("org.apache.hadoop.hbase.CellComparator$MetaCellComparator"))) {
-        // Refer to HBASE-16189. Fallback to 1.x comparators
+          .equals("org.apache.hadoop.hbase.CellComparatorImpl$MetaCellComparator"))) {
+        // Refer to HBASE-19052. Fallback to 1.x comparators
         comparatorClassName = KeyValue.META_COMPARATOR.getClass().getName();
       }
 


Mime
View raw message