From 44e68b4627ea0a4962e553a7b83b4d37c250c90f Mon Sep 17 00:00:00 2001 From: Armin Date: Wed, 13 Sep 2017 13:46:35 +0200 Subject: [PATCH] MINOR: Clean up some dead code around PQ + PQ Benchmarks Fixes #8232 --- .../EventSerializationBenchmark.java | 3 +-- .../benchmark/EventSprintfBenchmark.java | 3 +-- .../logstash/benchmark/QueueRWBenchmark.java | 2 +- .../java/org/logstash/ackedqueue/Queue.java | 2 +- .../ackedqueue/QueueRuntimeException.java | 20 ------------------- .../io/AbstractByteBufferPageIO.java | 2 +- .../ackedqueue/io/ByteBufferPageIO.java | 9 ++++----- .../logstash/ackedqueue/io/CheckpointIO.java | 2 +- .../ackedqueue/io/FileCheckpointIO.java | 2 +- .../ackedqueue/io/MemoryCheckpointIO.java | 4 ++-- .../logstash/ackedqueue/io/PageIOFactory.java | 4 +--- .../common/io/ByteBufferStreamInput.java | 10 +++++----- .../ackedqueue/io/ByteBufferPageIOTest.java | 4 ++-- 13 files changed, 21 insertions(+), 46 deletions(-) diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java index 4565d5d54..24359e7ca 100644 --- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java +++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java @@ -1,7 +1,6 @@ package org.logstash.benchmark; import java.io.DataOutputStream; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -39,7 +38,7 @@ public class EventSerializationBenchmark { private static final Event EVENT = new Event(); @Setup - public void setUp() throws IOException { + public void setUp() { EVENT.setField("Foo", "Bar"); EVENT.setField("Foo1", "Bar1"); EVENT.setField("Foo2", "Bar2"); diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java index ec90639c7..e794dd07f 100644 --- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java +++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java @@ -1,6 +1,5 @@ package org.logstash.benchmark; -import java.io.IOException; import java.util.concurrent.TimeUnit; import org.logstash.Event; import org.logstash.Timestamp; @@ -34,7 +33,7 @@ public class EventSprintfBenchmark { private static final Event EVENT = new Event(); @Setup - public void setUp() throws IOException { + public void setUp() { EVENT.setField("Foo", "Bar"); EVENT.setField("Foo1", "Bar1"); EVENT.setField("Foo2", "Bar2"); diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java index e5b3c3d7b..2c2ff0824 100644 --- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java +++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java @@ -66,7 +66,7 @@ public class QueueRWBenchmark { private ExecutorService exec; @Setup - public void setUp() throws IOException, CloneNotSupportedException { + public void setUp() throws IOException { final Settings settingsPersisted = settings(true); EVENT.setField("Foo", "Bar"); EVENT.setField("Foo1", "Bar1"); diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java index dad8d0f9d..2e3ed5d08 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java @@ -740,7 +740,7 @@ public class Queue implements Closeable { } } - protected Page firstUnreadPage() throws IOException { + protected Page firstUnreadPage() { // look at head page if no unreadTailPages return (this.unreadTailPages.isEmpty()) ? (this.headPage.isFullyRead() ? null : this.headPage) : this.unreadTailPages.get(0); } diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java index 06b8639d5..fb0d8e3df 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java @@ -2,28 +2,8 @@ package org.logstash.ackedqueue; public class QueueRuntimeException extends RuntimeException { - public static QueueRuntimeException newFormatMessage(String fmt, Object... args) { - return new QueueRuntimeException( - String.format(fmt, args) - ); - } - - public QueueRuntimeException() { - } - - public QueueRuntimeException(String message) { - super(message); - } - public QueueRuntimeException(String message, Throwable cause) { super(message, cause); } - public QueueRuntimeException(Throwable cause) { - super(cause); - } - - public QueueRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } } diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java index 4c97da20d..b9073a4d8 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java @@ -185,7 +185,7 @@ public abstract class AbstractByteBufferPageIO implements PageIO { } @Override - public void write(byte[] bytes, long seqNum) throws IOException { + public void write(byte[] bytes, long seqNum) { write(bytes, seqNum, bytes.length, checksum(bytes)); } diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java index 6b77f5e20..991a20b47 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java @@ -1,25 +1,24 @@ package org.logstash.ackedqueue.io; -import java.io.IOException; import java.nio.ByteBuffer; public class ByteBufferPageIO extends AbstractByteBufferPageIO { private final ByteBuffer buffer; - public ByteBufferPageIO(int pageNum, int capacity, String path) throws IOException { + public ByteBufferPageIO(int pageNum, int capacity, String path) { this(capacity, new byte[0]); } - public ByteBufferPageIO(int capacity) throws IOException { + public ByteBufferPageIO(int capacity) { this(capacity, new byte[0]); } - public ByteBufferPageIO(int capacity, byte[] initialBytes) throws IOException { + public ByteBufferPageIO(int capacity, byte[] initialBytes) { super(0, capacity); if (initialBytes.length > capacity) { - throw new IOException("initial bytes greater than capacity"); + throw new IllegalArgumentException("initial bytes greater than capacity"); } this.buffer = ByteBuffer.allocate(capacity); diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java index e60f91273..bd9df8c57 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java @@ -14,7 +14,7 @@ public interface CheckpointIO { void purge(String fileName) throws IOException; - void purge() throws IOException; + void purge(); // @return the head page checkpoint file name String headFileName(); diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java index ebd4927a2..a2e55b560 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java @@ -83,7 +83,7 @@ public class FileCheckpointIO implements CheckpointIO { } @Override - public void purge() throws IOException { + public void purge() { // TODO: dir traversal and delete all checkpoints? throw new UnsupportedOperationException("purge() is not supported"); } diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java index 00e41efaa..4b6946bbf 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java @@ -37,14 +37,14 @@ public class MemoryCheckpointIO implements CheckpointIO { } @Override - public Checkpoint write(String fileName, int pageNum, int firstUnackedPageNum, long firstUnackedSeqNum, long minSeqNum, int elementCount) throws IOException { + public Checkpoint write(String fileName, int pageNum, int firstUnackedPageNum, long firstUnackedSeqNum, long minSeqNum, int elementCount) { Checkpoint checkpoint = new Checkpoint(pageNum, firstUnackedPageNum, firstUnackedSeqNum, minSeqNum, elementCount); write(fileName, checkpoint); return checkpoint; } @Override - public void write(String fileName, Checkpoint checkpoint) throws IOException { + public void write(String fileName, Checkpoint checkpoint) { Map ns = sources.get(dirPath); if (ns == null) { ns = new HashMap<>(); diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java index dffe219b9..dda23d884 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java @@ -1,8 +1,6 @@ package org.logstash.ackedqueue.io; -import java.io.IOException; - @FunctionalInterface public interface PageIOFactory { - PageIO build(int pageNum, int capacity, String dirPath) throws IOException; + PageIO build(int pageNum, int capacity, String dirPath); } diff --git a/logstash-core/src/main/java/org/logstash/common/io/ByteBufferStreamInput.java b/logstash-core/src/main/java/org/logstash/common/io/ByteBufferStreamInput.java index 9cadd1869..fa7697fb3 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/ByteBufferStreamInput.java +++ b/logstash-core/src/main/java/org/logstash/common/io/ByteBufferStreamInput.java @@ -13,7 +13,7 @@ public class ByteBufferStreamInput extends StreamInput { } @Override - public int read() throws IOException { + public int read() { if (!buffer.hasRemaining()) { return -1; } @@ -29,7 +29,7 @@ public class ByteBufferStreamInput extends StreamInput { } @Override - public int read(byte[] b, int off, int len) throws IOException { + public int read(byte[] b, int off, int len) { if (!buffer.hasRemaining()) { return -1; } @@ -59,7 +59,7 @@ public class ByteBufferStreamInput extends StreamInput { } @Override - public void reset() throws IOException { + public void reset() { buffer.reset(); } @@ -68,7 +68,7 @@ public class ByteBufferStreamInput extends StreamInput { } @Override - public int available() throws IOException { + public int available() { return buffer.remaining(); } @@ -83,7 +83,7 @@ public class ByteBufferStreamInput extends StreamInput { } @Override - public void close() throws IOException { + public void close() { } } diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java index cf2eefe6c..bc4595177 100644 --- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java @@ -51,7 +51,7 @@ public class ByteBufferPageIOTest { return io; } - private static ByteBufferPageIO newPageIO(int capacity, byte[] bytes) throws IOException { + private static ByteBufferPageIO newPageIO(int capacity, byte[] bytes) { return new ByteBufferPageIO(capacity, bytes); } @@ -378,4 +378,4 @@ public class ByteBufferPageIOTest { assertThat(StringElement.deserialize(result.getElements().get(2)).toString(), is(equalTo(element3.toString()))); assertThat(StringElement.deserialize(result.getElements().get(3)).toString(), is(equalTo(element4.toString()))); } -} \ No newline at end of file +}