You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/07 20:54:10 UTC
[06/11] accumulo git commit: ACCUMULO-3771 Configure automatic Java
code style formatting
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoderTest.java
index 3f5b991..ee37950 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoderTest.java
@@ -25,4 +25,4 @@ public class BytesLexicoderTest extends AbstractLexicoderTest {
assertDecodesB(lexicoder, new byte[0]);
assertDecodesB(lexicoder, "accumulo".getBytes());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java
index 98d3ed1..87db36d 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java
@@ -27,4 +27,4 @@ public class DateLexicoderTest extends AbstractLexicoderTest {
assertDecodes(new DateLexicoder(), new Date(0));
assertDecodes(new DateLexicoder(), new Date(Long.MAX_VALUE));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/client/lexicoder/StringLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/StringLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/StringLexicoderTest.java
index 686ee46..388d21f 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/StringLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/StringLexicoderTest.java
@@ -25,4 +25,4 @@ public class StringLexicoderTest extends AbstractLexicoderTest {
assertDecodes(new StringLexicoder(), "0");
assertDecodes(new StringLexicoder(), "accumulo");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/client/lexicoder/TextLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/TextLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/TextLexicoderTest.java
index 74558de..4199b21 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/TextLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/TextLexicoderTest.java
@@ -25,4 +25,4 @@ public class TextLexicoderTest extends AbstractLexicoderTest {
assertDecodes(new TextLexicoder(), new Text(""));
assertDecodes(new TextLexicoder(), new Text("accumulo"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtilsTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtilsTest.java
index 1304797..9c3e343 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtilsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtilsTest.java
@@ -23,7 +23,7 @@ public class ByteUtilsTest {
private final byte[] empty = new byte[0];
private final byte[] noSplits = "nosplits".getBytes();
- private final byte[] splitAt5 = ("1234" + (char)0x00 + "56789").getBytes();
+ private final byte[] splitAt5 = ("1234" + (char) 0x00 + "56789").getBytes();
@Test
public void testSplit() throws Exception {
@@ -68,4 +68,4 @@ public class ByteUtilsTest {
Assert.assertEquals(1, result.length);
Assert.assertArrayEquals("5678".getBytes(), result[0]);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 0d075e4..b39757b 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -651,17 +651,17 @@ public class MutationTest {
new Mutation(tm1);
}
- /* The following two tests assert that no exception is thrown after calling
- * hashCode or equals on a Mutation. These guard against the condition noted
- * in ACCUMULO-3718.
+ /*
+ * The following two tests assert that no exception is thrown after calling hashCode or equals on a Mutation. These guard against the condition noted in
+ * ACCUMULO-3718.
*/
@Test
public void testPutAfterHashCode() {
Mutation m = new Mutation("r");
m.hashCode();
try {
- m.put("cf", "cq", "v");
- } catch(IllegalStateException e) {
+ m.put("cf", "cq", "v");
+ } catch (IllegalStateException e) {
fail("Calling Mutation#hashCode then Mutation#put should not result in an IllegalStateException.");
}
}
@@ -672,9 +672,9 @@ public class MutationTest {
Mutation m2 = new Mutation("r2");
m.equals(m2);
try {
- m.put("cf", "cq", "v");
- m2.put("cf", "cq", "v");
- } catch(IllegalStateException e) {
+ m.put("cf", "cq", "v");
+ m2.put("cf", "cq", "v");
+ } catch (IllegalStateException e) {
fail("Calling Mutation#equals then Mutation#put should not result in an IllegalStateException.");
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
index 88be983..74f7462 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
@@ -67,8 +67,7 @@ public class FirstEntryInRowIteratorTest {
}
@Override
- public SortedKeyValueIterator<Key,Value> reserveMapFileReader(
- String arg0) throws IOException {
+ public SortedKeyValueIterator<Key,Value> reserveMapFileReader(String arg0) throws IOException {
return null;
}
};
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
index 796311e..5a56ead 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.data.Value;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* @deprecated since 1.4
*/
@@ -74,7 +75,7 @@ public class NumSummationTest {
la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
assertTrue(la.length == 0);
} catch (Exception e) {
- log.error("{}", e.getMessage(),e);
+ log.error("{}", e.getMessage(), e);
assertTrue(false);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
index 6bd92ee..a3c1cca 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
@@ -74,7 +74,7 @@ public class RowDeletingIteratorTest extends TestCase {
@Override
public Authorizations getAuthorizations() {
- return null;
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/CountingVerifyingReceiver.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/CountingVerifyingReceiver.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/CountingVerifyingReceiver.java
index 873f886..4ac9db1 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/CountingVerifyingReceiver.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/CountingVerifyingReceiver.java
@@ -61,4 +61,4 @@ class CountingVerifyingReceiver {
count++;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 3644590..d0898f0 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* A demonstration of reading entire rows and deleting entire rows.
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
index 9c1abd9..74c40a5 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.util.ToolRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* A simple map reduce job that inserts word counts into accumulo. See the README for instructions on how to run this. This version does not use the ClientOpts
* class to parse arguments as an example of using AccumuloInputFormat and AccumuloOutputFormat directly. See README.mapred for more details.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
index 0915e17..b9e1a83 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
@@ -41,7 +41,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Accumulo Reservation System : An example reservation system using Accumulo. Supports atomic reservations of a resource at a date. Wait list are also
* supported. In order to keep the example simple, no checking is done of the date. Also the code is inefficient, if interested in improving it take a look at
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
index e4887aa..f089d42 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class CountTest extends TestCase {
private static final Logger log = LoggerFactory.getLogger(CountTest.class);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index d93bf8c..8532e92 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -111,7 +111,7 @@ public class AdminUtil<T> {
tables.add(lda[0].charAt(0) + ":" + id);
} catch (Exception e) {
- log.error("{}", e.getMessage(),e);
+ log.error("{}", e.getMessage(), e);
}
pos++;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index 87ef5ab..d023c27 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* This store removes Repos, in the store it wraps, that are in a finished or new state for more than a configurable time period.
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/Fate.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 34d2206..cf2ab73 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -28,7 +28,6 @@ import org.apache.accumulo.fate.util.LoggingRunnable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Fault tolerant executor
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index c9a8224..6fa5ad0 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -23,7 +23,6 @@ import java.security.Security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class AddressUtil {
private static final Logger log = LoggerFactory.getLogger(AddressUtil.class);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
index e109e06..de31fb0 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.fate.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class UtilWaitThread {
private static final Logger log = LoggerFactory.getLogger(UtilWaitThread.class);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 2c6446d..624ce5d 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -31,7 +31,6 @@ import org.apache.commons.lang.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
// A ReadWriteLock that can be implemented in ZooKeeper. Features the ability to store data
// with the lock, and recover the lock using that data to find the lock.
public class DistributedReadWriteLock implements java.util.concurrent.locks.ReadWriteLock {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
index f5a57a6..e84b1af 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.fate.zookeeper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Encapsulates the retrying implementation for some operation. Provides bounded retry attempts with a bounded, linear backoff.
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
index 2fcb7a9..dda7db9 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class TransactionWatcher {
public interface Arbitrator {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 6c7c1d6..7933ff1 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Test the AddressUtil class.
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 5a05431..e2dabe5 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -199,8 +199,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
} else {
clientConf = ClientConfiguration.loadDefault();
}
- instance = new ZooKeeperInstance(clientConf.withInstance(props.getProperty("instance"))
- .withZkHosts(props.getProperty("zookeepers")));
+ instance = new ZooKeeperInstance(clientConf.withInstance(props.getProperty("instance")).withZkHosts(props.getProperty("zookeepers")));
}
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java b/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
index c87c7e1..e97b99b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
@@ -19,9 +19,7 @@ package org.apache.accumulo.server;
import org.apache.accumulo.core.data.impl.KeyExtent;
public enum TabletLevel {
- ROOT,
- META,
- NORMAL;
+ ROOT, META, NORMAL;
public static TabletLevel getLevel(KeyExtent extent) {
if (!extent.isMeta())
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 00e0346..588e3e0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -134,7 +134,7 @@ public class ClientServiceHandler implements ClientService.Iface {
try {
return security.authenticateUser(credentials, credentials);
} catch (ThriftSecurityException e) {
- log.error("ThriftSecurityException",e);
+ log.error("ThriftSecurityException", e);
throw e;
}
}
@@ -144,7 +144,7 @@ public class ClientServiceHandler implements ClientService.Iface {
try {
return security.authenticateUser(credentials, toAuth);
} catch (ThriftSecurityException e) {
- log.error("ThriftSecurityException",e);
+ log.error("ThriftSecurityException", e);
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
index c154bd0..600349b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
@@ -124,7 +124,7 @@ public class MetaDataStateStore extends TabletStateStore {
}
@Override
- public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance, List<Path>> logsForDeadServers) throws DistributedStoreException {
+ public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance,List<Path>> logsForDeadServers) throws DistributedStoreException {
BatchWriter writer = createBatchWriter();
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
index acc10d8..147e071 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
@@ -62,9 +62,10 @@ public abstract class TabletStateStore implements Iterable<TabletLocationState>
* @param logsForDeadServers
* a cache of logs in use by servers when they died
*/
- abstract public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance, List<Path>> logsForDeadServers) throws DistributedStoreException;
+ abstract public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance,List<Path>> logsForDeadServers) throws DistributedStoreException;
- public static void unassign(AccumuloServerContext context, TabletLocationState tls, Map<TServerInstance, List<Path>> logsForDeadServers) throws DistributedStoreException {
+ public static void unassign(AccumuloServerContext context, TabletLocationState tls, Map<TServerInstance,List<Path>> logsForDeadServers)
+ throws DistributedStoreException {
TabletStateStore store;
if (tls.extent.isRootTablet()) {
store = new ZooTabletStateStore();
@@ -91,6 +92,6 @@ public abstract class TabletStateStore implements Iterable<TabletLocationState>
/**
* When a server fails, its logs must be marked as unused after the log markers are moved to the tablets.
*/
- abstract public void markLogsAsUnused(AccumuloServerContext context, Map<TServerInstance, List<Path>> logs) throws DistributedStoreException;
+ abstract public void markLogsAsUnused(AccumuloServerContext context, Map<TServerInstance,List<Path>> logs) throws DistributedStoreException;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index bce20fd..03627e3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -165,7 +165,7 @@ public class ZooTabletStateStore extends TabletStateStore {
}
@Override
- public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance, List<Path>> logsForDeadServers) throws DistributedStoreException {
+ public void unassign(Collection<TabletLocationState> tablets, Map<TServerInstance,List<Path>> logsForDeadServers) throws DistributedStoreException {
if (tablets.size() != 1)
throw new IllegalArgumentException("There is only one root tablet");
TabletLocationState tls = tablets.iterator().next();
@@ -183,7 +183,8 @@ public class ZooTabletStateStore extends TabletStateStore {
throw new DistributedStoreException(ex);
}
store.put(RootTable.ZROOT_TABLET_WALOGS + "/" + logEntry.getUniqueID(), value);
- store.remove(RootTable.ZROOT_TABLET_CURRENT_LOGS + "/" + MetadataSchema.CurrentLogsSection.getRowPrefix() + tls.current.toString() + logEntry.getUniqueID());
+ store.remove(RootTable.ZROOT_TABLET_CURRENT_LOGS + "/" + MetadataSchema.CurrentLogsSection.getRowPrefix() + tls.current.toString()
+ + logEntry.getUniqueID());
}
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManager.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManager.java
index 3582cfd..ad36d3e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManager.java
@@ -52,8 +52,7 @@ public class AuthenticationTokenKeyManager extends Daemon {
* @param tokenMaxLifetime
* The lifetime, in milliseconds, of generated AuthenticationKeys (and subsequently delegation tokens).
*/
- public AuthenticationTokenKeyManager(AuthenticationTokenSecretManager mgr, ZooAuthenticationKeyDistributor dist, long keyUpdateInterval,
- long tokenMaxLifetime) {
+ public AuthenticationTokenKeyManager(AuthenticationTokenSecretManager mgr, ZooAuthenticationKeyDistributor dist, long keyUpdateInterval, long tokenMaxLifetime) {
super("Delegation Token Key Manager");
this.secretManager = mgr;
this.keyDistributor = dist;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
index 515b036..b327a26 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
@@ -38,7 +38,6 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Class that manages distribution of {@link AuthenticationKey}s, Accumulo's secret in the delegation token model, to other Accumulo nodes via ZooKeeper.
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index 4a5650e..29745d5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -281,7 +281,6 @@ public class MasterMetadataUtil {
}
}
-
/**
* Create an update that updates a tablet
*
@@ -315,7 +314,6 @@ public class MasterMetadataUtil {
TabletsSection.ServerColumnFamily.FLUSH_COLUMN.put(m, new Value(Long.toString(flushId).getBytes(UTF_8)));
-
return m;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index c85cee7..f53f6a5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -1146,8 +1146,8 @@ public class MetadataTableUtil {
}
}
- public static void fetchLogsForDeadServer(ClientContext context, ZooLock lock, KeyExtent extent, TServerInstance server, Map<TServerInstance,List<Path>> logsForDeadServers)
- throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+ public static void fetchLogsForDeadServer(ClientContext context, ZooLock lock, KeyExtent extent, TServerInstance server,
+ Map<TServerInstance,List<Path>> logsForDeadServers) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
// already cached
if (logsForDeadServers.containsKey(server)) {
return;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index e7c7161..7e9543f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -116,7 +116,7 @@ public class MetadataBulkLoadFilterTest {
@Override
public Authorizations getAuthorizations() {
- return null;
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
index 1db7009..827e772 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
@@ -83,7 +83,7 @@ public class ZKAuthenticatorTest extends TestCase {
storedBytes = ZKSecurityTool.createPass(rawPass);
assertTrue(ZKSecurityTool.checkPass(rawPass, storedBytes));
} catch (AccumuloException e) {
- log.error("{}", e.getMessage(),e);
+ log.error("{}", e.getMessage(), e);
assertTrue(false);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java b/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
index 0c74444..b3d490f 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
@@ -33,4 +33,4 @@ public class GCExecutable implements KeywordExecutable {
public void execute(final String[] args) throws IOException {
SimpleGarbageCollector.main(args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index 20917a4..2b874f6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -163,7 +163,7 @@ class TabletGroupWatcher extends Daemon {
List<Assignment> assigned = new ArrayList<Assignment>();
List<TabletLocationState> assignedToDeadServers = new ArrayList<TabletLocationState>();
Map<KeyExtent,TServerInstance> unassigned = new HashMap<KeyExtent,TServerInstance>();
- Map<TServerInstance, List<Path>> logsForDeadServers = new TreeMap<>();
+ Map<TServerInstance,List<Path>> logsForDeadServers = new TreeMap<>();
MasterState masterState = master.getMasterState();
int[] counts = new int[TabletState.values().length];
@@ -738,14 +738,9 @@ class TabletGroupWatcher extends Daemon {
}
}
- private void flushChanges(
- SortedMap<TServerInstance,TabletServerStatus> currentTServers,
- List<Assignment> assignments,
- List<Assignment> assigned,
- List<TabletLocationState> assignedToDeadServers,
- Map<TServerInstance, List<Path>> logsForDeadServers,
- Map<KeyExtent,TServerInstance> unassigned)
- throws DistributedStoreException, TException {
+ private void flushChanges(SortedMap<TServerInstance,TabletServerStatus> currentTServers, List<Assignment> assignments, List<Assignment> assigned,
+ List<TabletLocationState> assignedToDeadServers, Map<TServerInstance,List<Path>> logsForDeadServers, Map<KeyExtent,TServerInstance> unassigned)
+ throws DistributedStoreException, TException {
if (!assignedToDeadServers.isEmpty()) {
int maxServersToShow = min(assignedToDeadServers.size(), 100);
Master.log.debug(assignedToDeadServers.size() + " assigned to dead servers: " + assignedToDeadServers.subList(0, maxServersToShow) + "...");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChooseDir.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChooseDir.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChooseDir.java
index 3e1aa33..50bf19d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChooseDir.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChooseDir.java
@@ -50,4 +50,4 @@ class ChooseDir extends MasterRepo {
public void undo(long tid, Master master) throws Exception {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUpBulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUpBulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUpBulkImport.java
index 85f9a8c..5ca325f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUpBulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUpBulkImport.java
@@ -61,4 +61,4 @@ class CleanUpBulkImport extends MasterRepo {
ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneInfo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneInfo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneInfo.java
index 335d65d..96ff954 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneInfo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneInfo.java
@@ -33,4 +33,4 @@ class CloneInfo implements Serializable {
Set<String> propertiesToExclude;
public String user;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneMetadata.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneMetadata.java
index 045f6b1..9110809 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneMetadata.java
@@ -51,4 +51,4 @@ class CloneMetadata extends MasterRepo {
MetadataTableUtil.deleteTable(cloneInfo.tableId, false, environment, environment.getMasterLock());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneZookeeper.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneZookeeper.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneZookeeper.java
index 072f5de..d9842b2 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneZookeeper.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneZookeeper.java
@@ -73,4 +73,4 @@ class CloneZookeeper extends MasterRepo {
Tables.clearCache(environment.getInstance());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
index e3d0820..0db93c1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
@@ -185,4 +185,4 @@ class CompactionDriver extends MasterRepo {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompleteBulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompleteBulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompleteBulkImport.java
index 8905c80..3fe6d6c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompleteBulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompleteBulkImport.java
@@ -42,4 +42,4 @@ class CompleteBulkImport extends MasterRepo {
ZooArbitrator.stop(Constants.BULK_ARBITRATOR_TYPE, tid);
return new CopyFailed(tableId, source, bulk, error);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateDir.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateDir.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateDir.java
index 6221624..695f9be 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateDir.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateDir.java
@@ -48,4 +48,4 @@ class CreateDir extends MasterRepo {
fs.deleteRecursively(new Path(tableInfo.dir));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateImportDir.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateImportDir.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateImportDir.java
index 4f0e7f8..69dcc49 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateImportDir.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateImportDir.java
@@ -58,4 +58,4 @@ class CreateImportDir extends MasterRepo {
return new MapImportFileNames(tableInfo);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportInfo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportInfo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportInfo.java
index d8f276a..3e86488 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportInfo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportInfo.java
@@ -26,4 +26,4 @@ class ExportInfo implements Serializable {
public String tableID;
public String exportDir;
public String namespaceID;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
index a502a3d..45fc8df 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
@@ -37,4 +37,4 @@ class FinishCancelCompaction extends MasterRepo {
public void undo(long tid, Master environment) throws Exception {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCloneTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCloneTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCloneTable.java
index 7c3701b..18eeae9 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCloneTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCloneTable.java
@@ -61,4 +61,4 @@ class FinishCloneTable extends MasterRepo {
@Override
public void undo(long tid, Master environment) throws Exception {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateNamespace.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateNamespace.java
index 93cc194..fc47c1e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateNamespace.java
@@ -55,4 +55,4 @@ class FinishCreateNamespace extends MasterRepo {
@Override
public void undo(long tid, Master env) throws Exception {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateTable.java
index 2343efb..fd7389a 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCreateTable.java
@@ -59,4 +59,4 @@ class FinishCreateTable extends MasterRepo {
@Override
public void undo(long tid, Master env) throws Exception {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishImportTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishImportTable.java
index 7dd76b1..e27b768 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishImportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishImportTable.java
@@ -65,4 +65,4 @@ class FinishImportTable extends MasterRepo {
@Override
public void undo(long tid, Master env) throws Exception {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportPopulateZookeeper.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportPopulateZookeeper.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportPopulateZookeeper.java
index f436fd3..71e9124 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportPopulateZookeeper.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportPopulateZookeeper.java
@@ -101,4 +101,4 @@ class ImportPopulateZookeeper extends MasterRepo {
Utils.unreserveTable(tableInfo.tableId, tid, true);
Tables.clearCache(instance);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportSetupPermissions.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportSetupPermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportSetupPermissions.java
index 00fade9..cef8929 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportSetupPermissions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportSetupPermissions.java
@@ -62,4 +62,4 @@ class ImportSetupPermissions extends MasterRepo {
public void undo(long tid, Master env) throws Exception {
AuditedSecurityOperation.getInstance(env).deleteTable(env.rpcCreds(), tableInfo.tableId, tableInfo.namespaceId);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportedTableInfo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportedTableInfo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportedTableInfo.java
index 34bb6c8..7c09eb1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportedTableInfo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportedTableInfo.java
@@ -28,4 +28,4 @@ class ImportedTableInfo implements Serializable {
public String tableId;
public String importDir;
public String namespaceId;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/NamespaceInfo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/NamespaceInfo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/NamespaceInfo.java
index ef2becd..aadb24f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/NamespaceInfo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/NamespaceInfo.java
@@ -28,4 +28,4 @@ class NamespaceInfo implements Serializable {
String user;
public Map<String,String> props;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
index da13ecc..45a370d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
@@ -51,4 +51,4 @@ class PopulateMetadata extends MasterRepo {
MetadataTableUtil.deleteTable(tableInfo.tableId, false, environment, environment.getMasterLock());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeper.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeper.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeper.java
index 8ec8834..94a868c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeper.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeper.java
@@ -74,4 +74,4 @@ class PopulateZookeeper extends MasterRepo {
Tables.clearCache(instance);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeperWithNamespace.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeperWithNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeperWithNamespace.java
index bf101ae..6d0a215 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeperWithNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateZookeeperWithNamespace.java
@@ -71,4 +71,4 @@ class PopulateZookeeperWithNamespace extends MasterRepo {
Utils.unreserveNamespace(namespaceInfo.namespaceId, tid, true);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java
index e2057d1..ab418ae 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java
@@ -32,4 +32,4 @@ class TableInfo implements Serializable {
public Map<String,String> props;
public String dir = null;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
index ca31d48..a492957 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
@@ -265,4 +265,4 @@ class WriteExportFiles extends MasterRepo {
osw.flush();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/NullScanner.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/NullScanner.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/NullScanner.java
index 252334d..0ba13c7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/NullScanner.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/NullScanner.java
@@ -109,7 +109,8 @@ public class NullScanner implements Scanner {
@Override
public void close() {}
- @Override public Authorizations getAuthorizations() {
+ @Override
+ public Authorizations getAuthorizations() {
return null;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index e7e5a16..786e8e3 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -26,8 +26,7 @@ import org.junit.Test;
public class ShowTraceLinkTypeTest {
private static RemoteSpan rs(long start, long stop, String description) {
- return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description, Collections.<String,String> emptyMap(),
- Collections.<Annotation> emptyList());
+ return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description, Collections.<String,String> emptyMap(), Collections.<Annotation> emptyList());
}
@Test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
index 0ade243..9b8705a 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -171,8 +171,8 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
if (sendQueue.size() > maxQueueSize) {
long now = System.currentTimeMillis();
if (now - lastNotificationOfDroppedSpans > 60 * 1000) {
- log.warn("Tracing spans are being dropped because there are already " + maxQueueSize + " spans queued for delivery.\n" +
- "This does not affect performance, security or data integrity, but distributed tracing information is being lost.");
+ log.warn("Tracing spans are being dropped because there are already " + maxQueueSize + " spans queued for delivery.\n"
+ + "This does not affect performance, security or data integrity, but distributed tracing information is being lost.");
lastNotificationOfDroppedSpans = now;
}
return;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
index 63c806f..9def071 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
@@ -59,13 +59,8 @@ public class TraceTableStats {
@Override
public String toString() {
- return "{" +
- "type='" + type + '\'' +
- ", nonzeroCount=" + nonzeroCount +
- ", zeroCount=" + zeroCount +
- ", numTraces=" + traceIds.size() +
- ", log10SpanLength=" + log10SpanLength +
- '}';
+ return "{" + "type='" + type + '\'' + ", nonzeroCount=" + nonzeroCount + ", zeroCount=" + zeroCount + ", numTraces=" + traceIds.size()
+ + ", log10SpanLength=" + log10SpanLength + '}';
}
}
@@ -80,7 +75,7 @@ public class TraceTableStats {
Connector conn = opts.getConnector();
Scanner scanner = conn.createScanner(opts.getTableName(), Authorizations.EMPTY);
scanner.setRange(new Range(null, true, "idx:", false));
- Map<String, SpanTypeCount> counts = new TreeMap<>();
+ Map<String,SpanTypeCount> counts = new TreeMap<>();
final SpanTypeCount hdfs = new SpanTypeCount();
hdfs.type = "HDFS";
final SpanTypeCount accumulo = new SpanTypeCount();
@@ -91,14 +86,13 @@ public class TraceTableStats {
for (Entry<Key,Value> entry : scanner) {
numSpans++;
RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
- String id = span.getSvc()+":"+span.getDescription().replaceAll("[0-9][0-9][0-9]+", "");
+ String id = span.getSvc() + ":" + span.getDescription().replaceAll("[0-9][0-9][0-9]+", "");
SpanTypeCount stc = counts.get(id);
if (stc == null) {
stc = new SpanTypeCount();
counts.put(id, stc);
if (span.description.startsWith("org.apache.hadoop") || span.svc.equals("NameNode") || span.svc.equals("DataNode")
- || span.description.contains("DFSOutputStream") || span.description.contains("DFSInputStream")
- || span.description.contains("BlockReader")) {
+ || span.description.contains("DFSOutputStream") || span.description.contains("DFSInputStream") || span.description.contains("BlockReader")) {
stc.type = hdfs.type;
} else {
stc.type = accumulo.type;
@@ -110,18 +104,18 @@ public class TraceTableStats {
} else {
increment(accumulo, span);
}
- maxSpanLength = Math.max(maxSpanLength, Math.log10(span.stop-span.start));
- maxSpanLengthMS = Math.max(maxSpanLengthMS, span.stop-span.start);
+ maxSpanLength = Math.max(maxSpanLength, Math.log10(span.stop - span.start));
+ maxSpanLengthMS = Math.max(maxSpanLengthMS, span.stop - span.start);
}
System.out.println();
- System.out.println("log10 max span length "+maxSpanLength+" "+maxSpanLengthMS);
- System.out.println("Total spans "+numSpans);
+ System.out.println("log10 max span length " + maxSpanLength + " " + maxSpanLengthMS);
+ System.out.println("Total spans " + numSpans);
System.out.println("Percentage Accumulo nonzero of total " + accumulo.nonzeroCount + "/" + numSpans + " = " + (accumulo.nonzeroCount * 1.0 / numSpans));
System.out.println(hdfs + ", total " + (hdfs.nonzeroCount + hdfs.zeroCount));
- System.out.println(accumulo+ ", total " + (accumulo.nonzeroCount + accumulo.zeroCount));
+ System.out.println(accumulo + ", total " + (accumulo.nonzeroCount + accumulo.zeroCount));
System.out.println();
System.out.println("source:desc={stats}");
- for (Entry<String, SpanTypeCount> c : counts.entrySet()) {
+ for (Entry<String,SpanTypeCount> c : counts.entrySet()) {
System.out.println(c);
}
}
@@ -147,7 +141,7 @@ public class TraceTableStats {
else if (ms <= 1000000)
incrementIndex(stc.log10SpanLength, 6);
else
- throw new IllegalArgumentException("unexpected span length "+ms);
+ throw new IllegalArgumentException("unexpected span length " + ms);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index 5fe2548..389a544 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -35,8 +35,7 @@ public class GarbageCollectionLogger {
private long gcTimeIncreasedCount = 0;
private static long lastMemoryCheckTime = 0;
- public GarbageCollectionLogger() {
- }
+ public GarbageCollectionLogger() {}
public synchronized void logGCInfo(AccumuloConfiguration conf) {
final long now = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyComparator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyComparator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyComparator.java
index 6c8b0f3..739b923 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyComparator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyComparator.java
@@ -41,4 +41,4 @@ class MemKeyComparator implements Comparator<Key>, Serializable {
return cmp;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyConversionIterator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyConversionIterator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyConversionIterator.java
index 891a0ba..00c8be9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyConversionIterator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKeyConversionIterator.java
@@ -93,4 +93,4 @@ class MemKeyConversionIterator extends WrappingIterator implements Interruptible
((InterruptibleIterator) getSource()).setInterruptFlag(flag);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/PartialMutationSkippingIterator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/PartialMutationSkippingIterator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/PartialMutationSkippingIterator.java
index 8e2f113..5d0733b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/PartialMutationSkippingIterator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/PartialMutationSkippingIterator.java
@@ -51,4 +51,4 @@ class PartialMutationSkippingIterator extends SkippingIterator implements Interr
((InterruptibleIterator) getSource()).setInterruptFlag(flag);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
index 532405d..6c5b63d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
@@ -43,7 +43,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
private final ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
private Map<FileRef,DataFileValue> files;
- private final Authorizations authorizations; // these will only be supplied during scan scope
+ private final Authorizations authorizations; // these will only be supplied during scan scope
public TabletIteratorEnvironment(IteratorScope scope, AccumuloConfiguration config) {
if (scope == IteratorScope.majc)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index ada06b6..6f2c9a2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -1441,7 +1441,6 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
}
-
@Override
public void loadTablet(TInfo tinfo, TCredentials credentials, String lock, final TKeyExtent textent) {
@@ -1726,8 +1725,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
@Override
public void removeLogs(TInfo tinfo, TCredentials credentials, List<String> filenames) throws TException {
log.warn("Garbage collector is attempting to remove logs through the tablet server");
- log.warn("This is probably because your file Garbage Collector is an older version than your tablet servers.\n" +
- "Restart your file Garbage Collector.");
+ log.warn("This is probably because your file Garbage Collector is an older version than your tablet servers.\n" + "Restart your file Garbage Collector.");
}
}
@@ -2998,7 +2996,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
// avoid unnecessary redundant markings to meta
- final ConcurrentHashMap<DfsLogger, EnumSet<TabletLevel>> metadataTableLogs = new ConcurrentHashMap<>();
+ final ConcurrentHashMap<DfsLogger,EnumSet<TabletLevel>> metadataTableLogs = new ConcurrentHashMap<>();
final Object levelLocks[] = new Object[TabletLevel.values().length];
{
for (int i = 0; i < levelLocks.length; i++) {
@@ -3006,7 +3004,6 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
}
-
// remove any meta entries after a rolled log is no longer referenced
Set<DfsLogger> closedLogs = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
index 2710177..0447abe 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
@@ -27,7 +27,7 @@ public class EverythingCompactionStrategy extends CompactionStrategy {
@Override
public boolean shouldCompact(MajorCompactionRequest request) throws IOException {
- return true; // ACCUMULO-3645 compact for empty files too
+ return true; // ACCUMULO-3645 compact for empty files too
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index bf60d45..397eeff 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -370,12 +370,12 @@ public class DfsLogger implements Comparable<DfsLogger> {
}
/**
- * Opens a Write-Ahead Log file and writes the necessary header information and OPEN entry to the file.
- * The file is ready to be used for ingest if this method returns successfully. If an exception is thrown
- * from this method, it is the callers responsibility to ensure that {@link #close()} is called to prevent
+ * Opens a Write-Ahead Log file and writes the necessary header information and OPEN entry to the file. The file is ready to be used for ingest if this method
+ * returns successfully. If an exception is thrown from this method, it is the callers responsibility to ensure that {@link #close()} is called to prevent
* leaking the file handle and/or syncing thread.
*
- * @param address The address of the host using this WAL
+ * @param address
+ * The address of the host using this WAL
*/
public synchronized void open(String address) throws IOException {
String filename = UUID.randomUUID().toString();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index d468695..809c56a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -211,10 +211,10 @@ public class TabletServerLogger {
startLogMaker();
Object next = nextLog.take();
if (next instanceof Exception) {
- throw (Exception)next;
+ throw (Exception) next;
}
if (next instanceof DfsLogger) {
- currentLog = (DfsLogger)next;
+ currentLog = (DfsLogger) next;
logId.incrementAndGet();
log.info("Using next log " + currentLog.getFileName());
return;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index 0eb7d85..490ecd3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@ -105,7 +105,7 @@ public class MinorCompactor extends Compactor {
return ret;
} catch (IOException e) {
- log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(),getOutputFile());
+ log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(), getOutputFile());
ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId().toString(), ProblemType.FILE_WRITE, getOutputFile(), e));
reportedProblem = true;
} catch (RuntimeException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
index f7f3017..5a60420 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.shell;
-
/**
* Abstract class to encompass the Options available on the Accumulo Shell
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
index fb3c8a0..6363035 100644
--- a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
+++ b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.test;
-
public class EstimateInMemMapOverhead {
private static void runTest(int numEntries, int keyLen, int colFamLen, int colQualLen, int colVisLen, int dataLen) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/InMemoryMapMemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/InMemoryMapMemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/InMemoryMapMemoryUsageTest.java
index f325524..fb0050f 100644
--- a/test/src/main/java/org/apache/accumulo/test/InMemoryMapMemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/InMemoryMapMemoryUsageTest.java
@@ -99,4 +99,4 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
String getName() {
return "IMM " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/IntObjectMemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/IntObjectMemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/IntObjectMemoryUsageTest.java
index d83421a..7c135e7 100644
--- a/test/src/main/java/org/apache/accumulo/test/IntObjectMemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/IntObjectMemoryUsageTest.java
@@ -62,4 +62,4 @@ class IntObjectMemoryUsageTest extends MemoryUsageTest {
return passes;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/MemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/MemoryUsageTest.java
index 39e8d68..c5a417a 100644
--- a/test/src/main/java/org/apache/accumulo/test/MemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/MemoryUsageTest.java
@@ -61,4 +61,4 @@ abstract class MemoryUsageTest {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/MutationMemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MutationMemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/MutationMemoryUsageTest.java
index 011fbfe..6ded7db 100644
--- a/test/src/main/java/org/apache/accumulo/test/MutationMemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/MutationMemoryUsageTest.java
@@ -95,4 +95,4 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
String getName() {
return "Mutation " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
index 14b8184..b9bc37a 100644
--- a/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
@@ -79,4 +79,4 @@ class TextMemoryUsageTest extends MemoryUsageTest {
return "Text " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/continuous/HistData.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/HistData.java b/test/src/main/java/org/apache/accumulo/test/continuous/HistData.java
index f53a6a6..cf23482 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/HistData.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/HistData.java
@@ -46,4 +46,4 @@ class HistData<T> implements Comparable<HistData<T>>, Serializable {
public int compareTo(HistData<T> o) {
return ((Comparable<T>) bin).compareTo(o.bin);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
index 8c39a7f..a43c2ba 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
@@ -45,7 +45,7 @@ public class PrintScanTimeHistogram {
report = new StringBuilder();
report.append(String.format("%n *** Find start rows histogram *** %n"));
fsrHist.print(report);
- log.info("{}",report);
+ log.info("{}", report);
}
private static void processFile(InputStream ins, Histogram<String> srqHist, Histogram<String> fsrHist) throws FileNotFoundException, IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/functional/AuthsIterator.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AuthsIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/AuthsIterator.java
index 1bb82b6..17151f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AuthsIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AuthsIterator.java
@@ -43,7 +43,7 @@ public class AuthsIterator extends WrappingIterator {
@Override
public Key getTopKey() {
- if(env.getAuthorizations().equals(AUTHS))
+ if (env.getAuthorizations().equals(AUTHS))
return new Key(new Text(SUCCESS));
else
return new Key(new Text(FAIL));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
index 616ec63..0c53b35 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
@@ -166,7 +166,7 @@ public class Environment {
if (null != keytab) {
File keytabFile = new File(keytab);
if (!keytabFile.exists() || !keytabFile.isFile()) {
- throw new IllegalArgumentException("Provided keytab is not a normal file: "+ keytab);
+ throw new IllegalArgumentException("Provided keytab is not a normal file: " + keytab);
}
try {
return new KerberosToken(getUserName(), keytabFile, true);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b932755e/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java
index a8db8e5..c1b2502 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java
@@ -69,9 +69,8 @@ public class Replication extends Test {
// Replicate to ourselves
iOps.setProperty(REPLICATION_NAME.getKey(), instName);
- iOps.setProperty(REPLICATION_PEERS.getKey() + instName,
- getPeerConfigurationValue(AccumuloReplicaSystem.class, instName + "," + inst.getZooKeepers()));
- iOps.setProperty(REPLICATION_PEER_USER.getKey() + instName , env.getUserName());
+ iOps.setProperty(REPLICATION_PEERS.getKey() + instName, getPeerConfigurationValue(AccumuloReplicaSystem.class, instName + "," + inst.getZooKeepers()));
+ iOps.setProperty(REPLICATION_PEER_USER.getKey() + instName, env.getUserName());
iOps.setProperty(REPLICATION_PEER_PASSWORD.getKey() + instName, env.getPassword());
// Tweak some replication parameters to make the replication go faster
iOps.setProperty(MASTER_REPLICATION_SCAN_INTERVAL.getKey(), "1s");
@@ -83,7 +82,8 @@ public class Replication extends Test {
ReplicationTable.setOnline(c);
boolean online = ReplicationTable.isOnline(c);
for (int i = 0; i < 10; i++) {
- if (online) break;
+ if (online)
+ break;
UtilWaitThread.sleep(2000);
online = ReplicationTable.isOnline(c);
}
@@ -92,7 +92,7 @@ public class Replication extends Test {
// Make a source and destination table
final String sourceTable = ("repl-source-" + UUID.randomUUID()).replace('-', '_');
final String destTable = ("repl-dest-" + UUID.randomUUID()).replace('-', '_');
- final String tables[] = new String[] { sourceTable, destTable };
+ final String tables[] = new String[] {sourceTable, destTable};
for (String tableName : tables) {
log.debug("creating " + tableName);
@@ -182,8 +182,8 @@ public class Replication extends Test {
// junit isn't a dependency
private void assertTrue(String string, boolean test) {
- if (!test)
- throw new RuntimeException(string);
+ if (!test)
+ throw new RuntimeException(string);
}
private static String itos(int i) {