From 9c22e816426c6984f6cd9512c594b92d107872a7 Mon Sep 17 00:00:00 2001 From: "terence.yoo" Date: Thu, 29 Dec 2022 19:51:29 +0900 Subject: [PATCH] fix violations --- .../java/org/apache/hadoop/hbase/regionserver/HStoreFile.java | 4 ---- .../org/apache/hadoop/hbase/regionserver/StoreEngine.java | 3 ++- .../org/apache/hadoop/hbase/regionserver/TestHStoreFile.java | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java index 3e39c2ef6e9b..73a684b5e972 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java @@ -377,10 +377,6 @@ public HDFSBlocksDistribution getHDFSBlockDistribution() { * Opens reader on this store file. Called by Constructor. * @see #closeStoreFile(boolean) */ - private void open() throws IOException { - open(false); - } - private void open(boolean warmup) throws IOException { fileInfo.initHDFSBlocksDistribution(); long readahead = fileInfo.isNoReadahead() ? 0L : -1L; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java index 339349b2ad68..47473a5985d2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreEngine.java @@ -222,7 +222,8 @@ public HStoreFile createStoreFileAndReader(StoreFileInfo info) throws IOExceptio return createStoreFileAndReader(info, false); } - public HStoreFile createStoreFileAndReader(StoreFileInfo info, boolean warmup) throws IOException { + public HStoreFile createStoreFileAndReader(StoreFileInfo info, boolean warmup) + throws IOException { info.setRegionCoprocessorHost(coprocessorHost); HStoreFile storeFile = new HStoreFile(info, ctx.getFamily().getBloomFilterType(), ctx.getCacheConf(), bloomFilterMetrics); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java index cc23491bf7b3..fec008129a39 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java @@ -1294,7 +1294,8 @@ public void testInitReaderForWarmup() throws Exception { Path hsfPath = regionFs.commitStoreFile(TEST_FAMILY, writer.getPath()); writer.close(); - HStoreFile file = Mockito.spy(new HStoreFile(this.fs, hsfPath, conf, cacheConf, BloomType.NONE, true)); + HStoreFile file = + Mockito.spy(new HStoreFile(this.fs, hsfPath, conf, cacheConf, BloomType.NONE, true)); // after warmup the file reader should be closed and null to avoid file descriptor leakage file.initReader(true);