From 446061454da9c2f0bd1cc53ee53cb8f46692d17b Mon Sep 17 00:00:00 2001 From: Mike Walch Date: Wed, 19 Dec 2018 18:57:40 -0500 Subject: [PATCH] Remove empty comments --- .../accumulo/core/iterators/user/RowEncodingIterator.java | 1 - .../org/apache/accumulo/core/spi/cache/BlockCacheManager.java | 1 - .../org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 3 --- .../org/apache/accumulo/tserver/ConditionalMutationSet.java | 3 --- .../src/main/java/org/apache/accumulo/tserver/MemValue.java | 3 --- .../src/main/java/org/apache/accumulo/tserver/RowLocks.java | 3 --- .../tserver/compaction/SizeLimitCompactionStrategy.java | 3 --- .../accumulo/tserver/data/ServerConditionalMutation.java | 3 --- .../main/java/org/apache/accumulo/tserver/log/LogSorter.java | 3 --- .../accumulo/tserver/metrics/Metrics2TabletServerMetrics.java | 3 --- .../tserver/metrics/Metrics2TabletServerMinCMetrics.java | 3 --- .../tserver/metrics/Metrics2TabletServerScanMetrics.java | 3 --- .../tserver/metrics/Metrics2TabletServerUpdateMetrics.java | 3 --- .../tserver/replication/ReplicationServicerHandler.java | 3 --- .../org/apache/accumulo/tserver/tablet/CompactionWatcher.java | 3 --- .../java/org/apache/accumulo/tserver/tablet/RootFiles.java | 3 --- .../main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 -- .../org/apache/accumulo/tserver/CountingIteratorTest.java | 4 +--- .../tserver/compaction/SizeLimitCompactionStrategyTest.java | 4 +--- .../org/apache/accumulo/tserver/tablet/RootFilesTest.java | 3 --- .../java/org/apache/accumulo/tserver/tablet/TabletTest.java | 3 --- 21 files changed, 2 insertions(+), 58 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java index 79f4b6a45b1..bac8849337d 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java @@ -37,7 +37,6 @@ import org.apache.hadoop.io.Text; /** - * * The RowEncodingIterator is designed to provide row-isolation so that queries see mutations as * atomic. It does so by encapsulating an entire row of key/value pairs into a single key/value * pair, which is returned through the client as an atomic operation. This is an abstract class, diff --git a/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCacheManager.java b/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCacheManager.java index 89a17437a17..42c5635985b 100644 --- a/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCacheManager.java +++ b/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCacheManager.java @@ -23,7 +23,6 @@ import org.apache.accumulo.core.conf.Property; /** - * * @since 2.0.0 */ public abstract class BlockCacheManager { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java index 30b012ce19c..e7c45192cbe 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java @@ -24,9 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class ActiveAssignmentRunnable implements Runnable { private static final Logger log = LoggerFactory.getLogger(ActiveAssignmentRunnable.class); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java index f9e4852e1aa..cd852c7c2f7 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java @@ -27,9 +27,6 @@ import org.apache.accumulo.tserver.data.ServerConditionalMutation; import org.apache.hadoop.io.WritableComparator; -/** - * - */ public class ConditionalMutationSet { interface DeferFilter { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java index 67f379d9955..94f4e6ce06c 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java @@ -18,9 +18,6 @@ import org.apache.accumulo.core.data.Value; -/** - * - */ public class MemValue { Value value; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java index c0d8926c3d4..fed66fb523a 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java @@ -29,9 +29,6 @@ import org.apache.accumulo.tserver.ConditionalMutationSet.DeferFilter; import org.apache.accumulo.tserver.data.ServerConditionalMutation; -/** - * - */ class RowLocks { private Map rowLocks = new HashMap<>(); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java index ccfb6ae3ef9..0077964e811 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java @@ -25,9 +25,6 @@ import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; -/** - * - */ public class SizeLimitCompactionStrategy extends DefaultCompactionStrategy { public static final String SIZE_LIMIT_OPT = "sizeLimit"; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/data/ServerConditionalMutation.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/data/ServerConditionalMutation.java index ab0846febb0..01e127e6fa6 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/data/ServerConditionalMutation.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/data/ServerConditionalMutation.java @@ -23,9 +23,6 @@ import org.apache.accumulo.core.dataImpl.thrift.TConditionalMutation; import org.apache.accumulo.server.data.ServerMutation; -/** - * - */ public class ServerConditionalMutation extends ServerMutation { public static class TCMTranslator diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java index 51379e10a64..5888b5c96dc 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java @@ -51,9 +51,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class LogSorter { private static final Logger log = LoggerFactory.getLogger(LogSorter.class); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java index c0920396a8f..f3f6b9dc966 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java @@ -28,9 +28,6 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry; import org.apache.hadoop.metrics2.lib.MutableGaugeLong; -/** - * - */ public class Metrics2TabletServerMetrics implements Metrics, MetricsSource, TabletServerMetricsKeys { public static final String NAME = TSERVER_NAME + ",sub=General", diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java index 6dc978e121a..1427b7ce99c 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java @@ -27,9 +27,6 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry; import org.apache.hadoop.metrics2.lib.MutableStat; -/** - * - */ public class Metrics2TabletServerMinCMetrics implements Metrics, MetricsSource, TabletServerMinCMetricsKeys { public static final String NAME = TSERVER_NAME + ",sub=MinorCompactions", diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java index 0f44ca5647b..294960ba7ff 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java @@ -27,9 +27,6 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry; import org.apache.hadoop.metrics2.lib.MutableStat; -/** - * - */ public class Metrics2TabletServerScanMetrics implements Metrics, MetricsSource, TabletServerScanMetricsKeys { public static final String NAME = TSERVER_NAME + ",sub=Scans", diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java index 2022de4cd06..b21e05086a1 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java @@ -28,9 +28,6 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableStat; -/** - * - */ public class Metrics2TabletServerUpdateMetrics implements Metrics, MetricsSource, TabletServerUpdateMetricsKeys { public static final String NAME = TSERVER_NAME + ",sub=Updates", diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java index 0abe464d2b6..aa887ca4b05 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java @@ -37,9 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class ReplicationServicerHandler implements Iface { private static final Logger log = LoggerFactory.getLogger(ReplicationServicerHandler.class); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java index 7382de4f63c..769facd97e7 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java @@ -28,9 +28,6 @@ import org.apache.accumulo.server.util.time.SimpleTimer; import org.slf4j.LoggerFactory; -/** - * - */ public class CompactionWatcher implements Runnable { private final Map,ObservedCompactionInfo> observedCompactions = new HashMap<>(); private final AccumuloConfiguration config; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java index 32fb00901a5..eb3d218955e 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java @@ -32,9 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class RootFiles { private static final Logger log = LoggerFactory.getLogger(RootFiles.class); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index a769061747e..f1ecbb44f30 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@ -163,9 +163,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** - * * Provide access to a single row range in a living TabletServer. - * */ public class Tablet implements TabletCommitter { private static final Logger log = LoggerFactory.getLogger(Tablet.class); diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java index d4beebe140e..6f60b894127 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java @@ -30,10 +30,8 @@ import org.apache.accumulo.tserver.tablet.CountingIterator; import org.junit.Test; -/** - * - */ public class CountingIteratorTest { + @Test public void testDeepCopyCount() throws IOException { TreeMap tm = new TreeMap<>(); diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java index ded5837db8e..e494426d7b4 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java @@ -33,10 +33,8 @@ import org.apache.accumulo.server.fs.FileRef; import org.junit.Test; -/** - * - */ public class SizeLimitCompactionStrategyTest { + private Map nfl(String... sa) { HashMap ret = new HashMap<>(); diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java index d7aac43cef8..be4cabe5a4c 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java @@ -38,9 +38,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -/** - * - */ public class RootFilesTest { @Rule diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java index cd69d4c0869..ea9c9ff5415 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java @@ -34,9 +34,6 @@ import org.easymock.EasyMock; import org.junit.Test; -/** - * - */ public class TabletTest { @Test