From 59d133ef95f0802ebe92bbc78787f4fec3dd2b94 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 22 Sep 2021 12:17:36 -0700 Subject: [PATCH] Amend HBASE-26274 Create an option to reintroduce BlockCache to mapreduce job Compliation fixes for CombinedBlockCache and TestClientSideRegionScanner. Signed-off-by: Andrew Purtell --- .../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java | 2 +- .../hadoop/hbase/client/TestClientSideRegionScanner.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java index 160421e6563..4a494c887ad 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java @@ -57,7 +57,7 @@ public class CombinedBlockCache implements ResizableBlockCache, HeapSize { @Override public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) { - boolean metaBlock = buf.getBlockType().getCategory() != BlockCategory.DATA; + boolean metaBlock = buf.getBlockType().getCategory() != BlockType.BlockCategory.DATA; if (metaBlock) { l1Cache.cacheBlock(cacheKey, buf, inMemory); } else { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientSideRegionScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientSideRegionScanner.java index 859e36f00cb..8757e7df68b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientSideRegionScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientSideRegionScanner.java @@ -25,7 +25,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseClassTestRule; -import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.hfile.BlockCache; @@ -45,7 +45,7 @@ public class TestClientSideRegionScanner { public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestClientSideRegionScanner.class); - private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private Configuration conf; private Path rootDir;