You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2018/12/20 15:27:18 UTC
[accumulo] branch master updated: Remove empty comments (#847)
This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 2b9c927 Remove empty comments (#847)
2b9c927 is described below
commit 2b9c9275ea5f992cfa2bd1a7e3f8994a41e69df3
Author: Mike Walch <mw...@apache.org>
AuthorDate: Thu Dec 20 10:27:13 2018 -0500
Remove empty comments (#847)
---
.../org/apache/accumulo/core/iterators/user/RowEncodingIterator.java | 1 -
.../java/org/apache/accumulo/core/spi/cache/BlockCacheManager.java | 1 -
.../java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 3 ---
.../main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java | 3 ---
.../tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java | 3 ---
.../tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java | 3 ---
.../accumulo/tserver/compaction/SizeLimitCompactionStrategy.java | 3 ---
.../org/apache/accumulo/tserver/data/ServerConditionalMutation.java | 3 ---
.../src/main/java/org/apache/accumulo/tserver/log/LogSorter.java | 3 ---
.../apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java | 3 ---
.../accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java | 3 ---
.../accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java | 3 ---
.../accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java | 3 ---
.../accumulo/tserver/replication/ReplicationServicerHandler.java | 3 ---
.../java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java | 3 ---
.../src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java | 3 ---
.../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 --
.../test/java/org/apache/accumulo/tserver/CountingIteratorTest.java | 4 +---
.../accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java | 4 +---
.../test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java | 3 ---
.../src/test/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 79f4b6a..bac8849 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.commons.collections.BufferOverflowException;
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 89a1743..42c5635 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 java.util.Map;
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 30b012c..e7c4519 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.apache.accumulo.core.dataImpl.KeyExtent;
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 f9e4852..cd852c7 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.core.dataImpl.KeyExtent;
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 67f379d..94f4e6c 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 @@ package org.apache.accumulo.tserver;
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 c0d8926..fed66fb 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.core.dataImpl.KeyExtent;
import org.apache.accumulo.tserver.ConditionalMutationSet.DeferFilter;
import org.apache.accumulo.tserver.data.ServerConditionalMutation;
-/**
- *
- */
class RowLocks {
private Map<ByteSequence,RowLock> 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 ccfb6ae..0077964 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.conf.ConfigurationTypeHelper;
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 ab0846f..01e127e 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.TCondition;
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 51379e1..5888b5c 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.apache.zookeeper.KeeperException;
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 c092039..f3f6b9d 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.Interns;
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 6dc978e..1427b7c 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.Interns;
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 0f44ca5..294960b 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.Interns;
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 2022de4..b21e050 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.MetricsRegistry;
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 0abe464..aa887ca 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.apache.thrift.TException;
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 7382de4..769facd 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.core.conf.Property;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class CompactionWatcher implements Runnable {
private final Map<List<Long>,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 32fb009..eb3d218 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.apache.hadoop.fs.Path;
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 833a9d3..7bbd5b8 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 com.google.common.collect.ImmutableSet.Builder;
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 d4beebe..6f60b89 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.core.iterators.SortedMapIterator;
import org.apache.accumulo.tserver.tablet.CountingIterator;
import org.junit.Test;
-/**
- *
- */
public class CountingIteratorTest {
+
@Test
public void testDeepCopyCount() throws IOException {
TreeMap<Key,Value> 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 ded5837..e494426 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.core.metadata.schema.DataFileValue;
import org.apache.accumulo.server.fs.FileRef;
import org.junit.Test;
-/**
- *
- */
public class SizeLimitCompactionStrategyTest {
+
private Map<FileRef,DataFileValue> nfl(String... sa) {
HashMap<FileRef,DataFileValue> 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 d7aac43..be4cabe 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.Rule;
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 cd69d4c..ea9c9ff 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.apache.hadoop.fs.Path;
import org.easymock.EasyMock;
import org.junit.Test;
-/**
- *
- */
public class TabletTest {
@Test