From f7c47c196f28fd81f3afb521075d2706346267ab Mon Sep 17 00:00:00 2001 From: QilinCao Date: Wed, 31 May 2017 15:15:47 +0800 Subject: [PATCH] HBASE-18119 Improve HFile readability and modify ChecksumUtil log level --- .../java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java | 3 +-- .../test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java index a47cc12..94e98df 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java @@ -105,7 +105,7 @@ public class ChecksumUtil { int onDiskDataSizeWithHeader = buffer.getInt(HFileBlock.Header.ON_DISK_DATA_SIZE_WITH_HEADER_INDEX); if (LOG.isTraceEnabled()) { - LOG.info("dataLength=" + buffer.capacity() + LOG.trace("dataLength=" + buffer.capacity() + ", sizeWithHeader=" + onDiskDataSizeWithHeader + ", checksumType=" + cktype.getName() + ", file=" + pathName diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java index 0887ee8..4327ee9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java @@ -921,10 +921,9 @@ public class HFile { } } - public static void checkHFileVersion(final Configuration c) { int version = c.getInt(FORMAT_VERSION_KEY, MAX_FORMAT_VERSION); - if (version < MAX_FORMAT_VERSION || version > MAX_FORMAT_VERSION) { + if (version != MAX_FORMAT_VERSION) { throw new IllegalArgumentException("The setting for " + FORMAT_VERSION_KEY + " (in your hbase-*.xml files) is " + version + " which does not match " + MAX_FORMAT_VERSION + diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java index d209430..c53b066 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java @@ -168,6 +168,17 @@ public class TestHFile { } /** + * Test check hfile version + */ + @Test(expected=IllegalArgumentException.class) + public void testCheckHFileVersion(){ + Configuration conf = TEST_UTIL.getConfiguration(); + HFile.checkHFileVersion(conf); + conf.setInt(HFile.FORMAT_VERSION_KEY, HFile.MIN_FORMAT_VERSION); + HFile.checkHFileVersion(conf); + } + + /** * Create 0-length hfile and show that it fails */ @Test -- 1.9.1