Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-25378 Legacy comparator in Hfile trailer will fail to load (#2756) 

Signed-off-by: stack <stack@apache.com>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
(cherry picked from commit 9bdac6cd17)
This commit is contained in:
Pankaj 2020-12-15 23:56:02 +05:30 committed by Pankaj Kumar
parent aebcb2f192
commit 50890acda7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
View File

@ -612,6 +612,8 @@ public class FixedFileTrailer {
comparatorKlass = CellComparatorImpl.class; comparatorKlass = CellComparatorImpl.class;
} else if (comparatorClassName.equals(KeyValue.META_COMPARATOR.getLegacyKeyComparatorName()) } else if (comparatorClassName.equals(KeyValue.META_COMPARATOR.getLegacyKeyComparatorName())
|| comparatorClassName.equals(KeyValue.META_COMPARATOR.getClass().getName()) || comparatorClassName.equals(KeyValue.META_COMPARATOR.getClass().getName())
|| (comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator$MetaCellComparator"))
|| (comparatorClassName.equals("org.apache.hadoop.hbase.CellComparatorImpl$MetaCellComparator"))
|| (comparatorClassName.equals("org.apache.hadoop.hbase.MetaCellComparator"))) { || (comparatorClassName.equals("org.apache.hadoop.hbase.MetaCellComparator"))) {
comparatorKlass = MetaCellComparator.class; comparatorKlass = MetaCellComparator.class;
} else if (comparatorClassName.equals("org.apache.hadoop.hbase.KeyValue$RawBytesComparator") } else if (comparatorClassName.equals("org.apache.hadoop.hbase.KeyValue$RawBytesComparator")

8
hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
View File

@ -130,6 +130,11 @@ public class TestFixedFileTrailer {
t.createComparator(KeyValue.META_COMPARATOR.getLegacyKeyComparatorName()).getClass()); t.createComparator(KeyValue.META_COMPARATOR.getLegacyKeyComparatorName()).getClass());
assertEquals(MetaCellComparator.class, assertEquals(MetaCellComparator.class,
t.createComparator(KeyValue.META_COMPARATOR.getClass().getName()).getClass()); t.createComparator(KeyValue.META_COMPARATOR.getClass().getName()).getClass());
assertEquals(MetaCellComparator.class,
t.createComparator("org.apache.hadoop.hbase.CellComparator$MetaCellComparator").getClass());
assertEquals(MetaCellComparator.class,
t.createComparator("org.apache.hadoop.hbase.CellComparatorImpl$MetaCellComparator")
.getClass());
assertEquals(MetaCellComparator.class, t.createComparator( assertEquals(MetaCellComparator.class, t.createComparator(
MetaCellComparator.META_COMPARATOR.getClass().getName()).getClass()); MetaCellComparator.META_COMPARATOR.getClass().getName()).getClass());
assertEquals(MetaCellComparator.META_COMPARATOR.getClass(), t.createComparator( assertEquals(MetaCellComparator.META_COMPARATOR.getClass(), t.createComparator(
@ -139,7 +144,8 @@ public class TestFixedFileTrailer {
assertNull(t.createComparator(Bytes.BYTES_RAWCOMPARATOR.getClass().getName())); assertNull(t.createComparator(Bytes.BYTES_RAWCOMPARATOR.getClass().getName()));
assertNull(t.createComparator("org.apache.hadoop.hbase.KeyValue$RawBytesComparator")); assertNull(t.createComparator("org.apache.hadoop.hbase.KeyValue$RawBytesComparator"));
} catch (IOException e) { } catch (IOException e) {
fail("Unexpected exception while testing FixedFileTrailer#createComparator()"); fail("Unexpected exception while testing FixedFileTrailer#createComparator(), "
+ e.getMessage());
} }
// Test an invalid comparatorClassName // Test an invalid comparatorClassName