You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2021/09/22 19:27:29 UTC
[hbase] 02/02: Amend HBASE-26274 Create an option to reintroduce
BlockCache to mapreduce job
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8c4ae33faafaaeb0306fcb1e7d7951c363b77a6d
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Wed Sep 22 12:17:36 2021 -0700
Amend HBASE-26274 Create an option to reintroduce BlockCache to mapreduce job
Compliation fixes for CombinedBlockCache and TestClientSideRegionScanner.
Signed-off-by: Andrew Purtell <ap...@apache.org>
---
.../java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java | 2 +-
.../org/apache/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 7c9fdb1..c01d8bb 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
@@ -60,7 +60,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 859e36f..8757e7d 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;