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 2017/11/18 01:22:35 UTC

[07/30] hbase git commit: HBASE-19239 Fix findbugs and error-prone issues

http://git-wip-us.apache.org/repos/asf/hbase/blob/108ea30e/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java
index fa88294..9f31374 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java
@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -198,7 +197,6 @@ public class TestDefaultWALProvider {
     final Configuration localConf = new Configuration(conf);
     localConf.set(WALFactory.WAL_PROVIDER, DefaultWALProvider.class.getName());
     final WALFactory wals = new WALFactory(localConf, null, currentTest.getMethodName());
-    final AtomicLong sequenceId = new AtomicLong(1);
     try {
       HRegionInfo hri = new HRegionInfo(htd.getTableName(),
           HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW);

http://git-wip-us.apache.org/repos/asf/hbase/blob/108ea30e/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFiltering.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFiltering.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFiltering.java
index a736c71..597bf85 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFiltering.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFiltering.java
@@ -82,8 +82,11 @@ public class TestWALFiltering {
         Delete del = new Delete(row);
         for (int iCol = 0; iCol < 10; ++iCol) {
           final byte[] cf = rand.nextBoolean() ? CF1 : CF2;
-          final long ts = Math.abs(rand.nextInt());
           final byte[] qual = Bytes.toBytes("col" + iCol);
+          long ts = rand.nextInt();
+          if (ts < 0) {
+            ts = -ts;
+          }
           if (rand.nextBoolean()) {
             final byte[] value = Bytes.toBytes("value_for_row_" + iRow +
                 "_cf_" + Bytes.toStringBinary(cf) + "_col_" + iCol + "_ts_" +

http://git-wip-us.apache.org/repos/asf/hbase/blob/108ea30e/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
index d4c59d4..ca2a130 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
@@ -224,52 +224,48 @@ public final class WALPerformanceEvaluation extends Configured implements Tool {
     // Process command line args
     for (int i = 0; i < args.length; i++) {
       String cmd = args[i];
-      try {
-        if (cmd.equals("-threads")) {
-          numThreads = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-iterations")) {
-          numIterations = Long.parseLong(args[++i]);
-        } else if (cmd.equals("-path")) {
-          rootRegionDir = new Path(args[++i]);
-        } else if (cmd.equals("-families")) {
-          numFamilies = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-qualifiers")) {
-          numQualifiers = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-keySize")) {
-          keySize = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-valueSize")) {
-          valueSize = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-syncInterval")) {
-          syncInterval = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-nosync")) {
-          noSync = true;
-        } else if (cmd.equals("-verify")) {
-          verify = true;
-        } else if (cmd.equals("-verbose")) {
-          verbose = true;
-        } else if (cmd.equals("-nocleanup")) {
-          cleanup = false;
-        } else if (cmd.equals("-noclosefs")) {
-          noclosefs = true;
-        } else if (cmd.equals("-roll")) {
-          roll = Long.parseLong(args[++i]);
-        } else if (cmd.equals("-compress")) {
-          compress = true;
-        } else if (cmd.equals("-encryption")) {
-          cipher = args[++i];
-        } else if (cmd.equals("-regions")) {
-          numRegions = Integer.parseInt(args[++i]);
-        } else if (cmd.equals("-traceFreq")) {
-          traceFreq = Double.parseDouble(args[++i]);
-        } else if (cmd.equals("-h")) {
-          printUsageAndExit();
-        } else if (cmd.equals("--help")) {
-          printUsageAndExit();
-        } else {
-          System.err.println("UNEXPECTED: " + cmd);
-          printUsageAndExit();
-        }
-      } catch (Exception e) {
+      if (cmd.equals("-threads")) {
+        numThreads = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-iterations")) {
+        numIterations = Long.parseLong(args[++i]);
+      } else if (cmd.equals("-path")) {
+        rootRegionDir = new Path(args[++i]);
+      } else if (cmd.equals("-families")) {
+        numFamilies = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-qualifiers")) {
+        numQualifiers = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-keySize")) {
+        keySize = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-valueSize")) {
+        valueSize = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-syncInterval")) {
+        syncInterval = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-nosync")) {
+        noSync = true;
+      } else if (cmd.equals("-verify")) {
+        verify = true;
+      } else if (cmd.equals("-verbose")) {
+        verbose = true;
+      } else if (cmd.equals("-nocleanup")) {
+        cleanup = false;
+      } else if (cmd.equals("-noclosefs")) {
+        noclosefs = true;
+      } else if (cmd.equals("-roll")) {
+        roll = Long.parseLong(args[++i]);
+      } else if (cmd.equals("-compress")) {
+        compress = true;
+      } else if (cmd.equals("-encryption")) {
+        cipher = args[++i];
+      } else if (cmd.equals("-regions")) {
+        numRegions = Integer.parseInt(args[++i]);
+      } else if (cmd.equals("-traceFreq")) {
+        traceFreq = Double.parseDouble(args[++i]);
+      } else if (cmd.equals("-h")) {
+        printUsageAndExit();
+      } else if (cmd.equals("--help")) {
+        printUsageAndExit();
+      } else {
+        System.err.println("UNEXPECTED: " + cmd);
         printUsageAndExit();
       }
     }