You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2020/02/15 20:29:42 UTC

[hbase] 08/18: fixed checkstyle, findbugs, whitespaces

This is an automated email from the ASF dual-hosted git repository.

busbey pushed a commit to branch HBASE-22749
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 7722e1b3ff59fd725a73574eedeec875ba1d1f53
Author: Vladimir Rodionov <vl...@gmail.com>
AuthorDate: Wed Feb 5 13:40:42 2020 -0800

    fixed checkstyle, findbugs, whitespaces
---
 .../src/main/resources/hbase/checkstyle-suppressions.xml          | 1 +
 .../java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java     | 4 ++++
 .../java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java     | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
index 9351ecb..2d8e880 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -55,4 +55,5 @@
   <suppress checks="HideUtilityClassConstructor" files="org.apache.hadoop.hbase.util.ByteRangeUtils"/>
   <!-- Will not be final, because it is InterfaceAudience.Public -->
   <suppress checks="FinalClass" files="org.apache.hadoop.hbase.net.Address"/>
+  <suppress checks="MethodLength" files="org.apache.hadoop.hbase.mob.FaultyMobStoreCompactor.java"/>
 </suppressions>
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
index 955d549..80f699e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
@@ -53,6 +53,8 @@ import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
 import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
@@ -151,6 +153,8 @@ public class MobFileCleanerChore extends ScheduledChore {
    * @param table table name
    * @throws IOException exception
    */
+  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UC_USELESS_CONDITION",
+  justification = "Intentional")
   public void cleanupObsoleteMobFiles(Configuration conf, TableName table) throws IOException {
 
     long minAgeToArchive =
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
index 3fd6dae..1beeffe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
@@ -139,8 +139,8 @@ public class TestMobStoreScanner {
 
   @Test
   public void testMobStoreScanner() throws Exception {
-	  testGetFromFiles(false);
-	  testGetFromMemStore(false);
+    testGetFromFiles(false);
+    testGetFromMemStore(false);
     testGetReferences(false);
     testMobThreshold(false);
     testGetFromArchive(false);
@@ -148,8 +148,8 @@ public class TestMobStoreScanner {
 
   @Test
   public void testReversedMobStoreScanner() throws Exception {
-	  testGetFromFiles(true);
-	  testGetFromMemStore(true);
+    testGetFromFiles(true);
+    testGetFromMemStore(true);
     testGetReferences(true);
     testMobThreshold(true);
     testGetFromArchive(true);