Repository: hbase Updated Branches: refs/heads/branch-1.4 0667db734 -> 737b5a5f9
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/737b5a5f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/737b5a5f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/737b5a5f Branch: refs/heads/branch-1.4 Commit: 737b5a5f9f69692f3b4b94aa8189dcdf6c0f31b3 Parents: 0667db7 Author: tedyu <[email protected]> Authored: Mon Oct 23 08:07:50 2017 -0700 Committer: tedyu <[email protected]> Committed: Mon Oct 23 08:07:50 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/737b5a5f/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(); }
