HBASE-19239 Fix findbugs and error-prone issues Fixes for hbase-procedure
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5b741129 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5b741129 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5b741129 Branch: refs/heads/branch-1 Commit: 5b7411290b8da8e09ef88e928a7113b910e3fbd5 Parents: f856cbf Author: Andrew Purtell <[email protected]> Authored: Wed Nov 15 18:47:45 2017 -0800 Committer: Andrew Purtell <[email protected]> Committed: Fri Nov 17 17:12:35 2017 -0800 ---------------------------------------------------------------------- .../procedure2/store/wal/ProcedureWALPrettyPrinter.java | 1 + .../org/apache/hadoop/hbase/procedure2/util/ByteSlot.java | 2 ++ .../apache/hadoop/hbase/procedure2/TestChildProcedures.java | 4 ++++ .../hadoop/hbase/procedure2/TestProcedureInMemoryChore.java | 2 +- .../hadoop/hbase/procedure2/TestProcedureReplayOrder.java | 5 +++-- .../apache/hadoop/hbase/procedure2/TestYieldProcedures.java | 5 +++-- .../store/wal/ProcedureWALLoaderPerformanceEvaluation.java | 9 ++++----- .../store/wal/ProcedureWALPerformanceEvaluation.java | 2 +- .../hbase/procedure2/util/TestTimeoutBlockingQueue.java | 1 + 9 files changed, 20 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.java index fb195b6..55b26ac 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.java @@ -149,6 +149,7 @@ public class ProcedureWALPrettyPrinter extends Configured implements Tool { * @throws IOException * Thrown upon file system errors etc. */ + @Override public int run(final String[] args) throws IOException { // create options Options options = new Options(); http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/ByteSlot.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/ByteSlot.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/ByteSlot.java index c4ed9b7..1a48f49 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/ByteSlot.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/ByteSlot.java @@ -81,11 +81,13 @@ public class ByteSlot extends OutputStream { buf[offset] = (byte)b; } + @Override public void write(int b) { ensureCapacity(size + 1); buf[size++] = (byte)b; } + @Override public void write(byte[] b, int off, int len) { ensureCapacity(size + len); System.arraycopy(b, off, buf, size, len); http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java index 61f2333..0937f70 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java @@ -146,6 +146,7 @@ public class TestChildProcedures { public static class TestRootProcedure extends SequentialProcedure<TestProcEnv> { public TestRootProcedure() {} + @Override public Procedure[] execute(TestProcEnv env) { if (env.toggleKillBeforeStoreUpdate) { ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor); @@ -153,6 +154,7 @@ public class TestChildProcedures { return new Procedure[] { new TestChildProcedure(), new TestChildProcedure() }; } + @Override public void rollback(TestProcEnv env) { } @@ -165,6 +167,7 @@ public class TestChildProcedures { public static class TestChildProcedure extends SequentialProcedure<TestProcEnv> { public TestChildProcedure() {} + @Override public Procedure[] execute(TestProcEnv env) { if (env.toggleKillBeforeStoreUpdate) { ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor); @@ -175,6 +178,7 @@ public class TestChildProcedures { return null; } + @Override public void rollback(TestProcEnv env) { } http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java index 8bc8fa8..5e8f201 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java @@ -33,7 +33,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -49,6 +48,7 @@ public class TestProcedureInMemoryChore { private HBaseCommonTestingUtility htu; + @SuppressWarnings("rawtypes") @Before public void setUp() throws IOException { htu = new HBaseCommonTestingUtility(); http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java index c51f3cf..2557c98 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java @@ -133,8 +133,9 @@ public class TestProcedureReplayOrder { public void run() { for (int i = 0; i < nprocPerThread; ++i) { try { - procExecutor.submitProcedure((Procedure)procClazz.newInstance()); - } catch (InstantiationException|IllegalAccessException e) { + procExecutor.submitProcedure((Procedure) + procClazz.getDeclaredConstructor().newInstance()); + } catch (Exception e) { LOG.error("unable to instantiate the procedure", e); fail("failure during the proc.newInstance(): " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java index 211d06d..ba36291 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java @@ -193,7 +193,7 @@ public class TestYieldProcedures { extends StateMachineProcedure<TestProcEnv, TestStateMachineProcedure.State> { enum State { STATE_1, STATE_2, STATE_3 } - public class ExecutionInfo { + public static class ExecutionInfo { private final boolean rollback; private final long timestamp; private final State step; @@ -358,7 +358,8 @@ public class TestYieldProcedures { public TestRunQueue() {} - public void addFront(final Procedure proc) { + @Override + public void addFront(final Procedure proc) { addFrontCalls++; super.addFront(proc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java index 401b859..d34d259 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java @@ -72,7 +72,7 @@ public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool { private WALProcedureStore store; static byte[] serializedState; - private class LoadCounter implements ProcedureStore.ProcedureLoader { + private static class LoadCounter implements ProcedureStore.ProcedureLoader { public LoadCounter() {} @Override @@ -85,7 +85,7 @@ public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool { if (procIter.isNextCompleted()) { ProcedureInfo proc = procIter.nextAsProcedureInfo(); } else { - Procedure proc = procIter.nextAsProcedure(); + Procedure<?> proc = procIter.nextAsProcedure(); } } } @@ -93,7 +93,7 @@ public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool { @Override public void handleCorrupted(ProcedureIterator procIter) throws IOException { while (procIter.hasNext()) { - Procedure proc = procIter.nextAsProcedure(); + Procedure<?> proc = procIter.nextAsProcedure(); } } } @@ -171,8 +171,7 @@ public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool { private void writeWals() throws IOException { List<Integer> procStates = shuffleProcWriteSequence(); TestProcedure[] procs = new TestProcedure[numProcs + 1]; // 0 is not used. - int numProcsPerWal = numWals > 0 ? (int)Math.ceil(procStates.size() / numWals) - : Integer.MAX_VALUE; + int numProcsPerWal = numWals > 0 ? procStates.size() / numWals : Integer.MAX_VALUE; long startTime = currentTimeMillis(); long lastTime = startTime; for (int i = 0; i < procStates.size(); ++i) { http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java index f657822..7565c41 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java @@ -237,7 +237,7 @@ public class ProcedureWALPerformanceEvaluation extends AbstractHBaseTool { } } - public class NoSyncWalProcedureStore extends WALProcedureStore { + public static class NoSyncWalProcedureStore extends WALProcedureStore { public NoSyncWalProcedureStore(final Configuration conf, final FileSystem fs, final Path logDir) { super(conf, fs, logDir, new WALProcedureStore.LeaseRecovery() { http://git-wip-us.apache.org/repos/asf/hbase/blob/5b741129/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/util/TestTimeoutBlockingQueue.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/util/TestTimeoutBlockingQueue.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/util/TestTimeoutBlockingQueue.java index 3c52ea1..0e034a0 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/util/TestTimeoutBlockingQueue.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/util/TestTimeoutBlockingQueue.java @@ -53,6 +53,7 @@ public class TestTimeoutBlockingQueue { return timeout; } + @Override public String toString() { return String.format("(%03d, %03d)", seqId, timeout); }
