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 2016/07/01 01:59:03 UTC
[06/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for
readability
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 14933fb..d61fb9e 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -46,14 +46,14 @@ import org.junit.Test;
*/
public class GarbageCollectionTest {
static class TestGCE implements GarbageCollectionEnvironment {
- TreeSet<String> candidates = new TreeSet<String>();
- ArrayList<String> blips = new ArrayList<String>();
- Map<Key,Value> references = new TreeMap<Key,Value>();
- HashSet<String> tableIds = new HashSet<String>();
+ TreeSet<String> candidates = new TreeSet<>();
+ ArrayList<String> blips = new ArrayList<>();
+ Map<Key,Value> references = new TreeMap<>();
+ HashSet<String> tableIds = new HashSet<>();
- ArrayList<String> deletes = new ArrayList<String>();
- ArrayList<String> tablesDirsToDelete = new ArrayList<String>();
- TreeMap<String,Status> filesToReplicate = new TreeMap<String,Status>();
+ ArrayList<String> deletes = new ArrayList<>();
+ ArrayList<String> tablesDirsToDelete = new ArrayList<>();
+ TreeMap<String,Status> filesToReplicate = new TreeMap<>();
@Override
public boolean getCandidates(String continuePoint, List<String> ret) {
@@ -208,7 +208,7 @@ public class GarbageCollectionTest {
gca.collect(gce);
assertRemoved(gce);
- List<String[]> refsToRemove = new ArrayList<String[]>();
+ List<String[]> refsToRemove = new ArrayList<>();
refsToRemove.add(new String[] {"4", "/t0/F000.rf"});
refsToRemove.add(new String[] {"5", "../4/t0/F000.rf"});
refsToRemove.add(new String[] {"6", "hdfs://foo.com:6000/accumulo/tables/4/t0/F000.rf"});
@@ -545,7 +545,7 @@ public class GarbageCollectionTest {
gca.collect(gce);
- HashSet<String> tids = new HashSet<String>();
+ HashSet<String> tids = new HashSet<>();
tids.add("5");
tids.add("6");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index cda9548..efea076 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -106,7 +106,7 @@ class FateServiceHandler implements FateService.Iface {
if (!master.security.canCreateNamespace(c, namespace))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
break;
}
case NAMESPACE_RENAME: {
@@ -118,7 +118,7 @@ class FateServiceHandler implements FateService.Iface {
if (!master.security.canRenameNamespace(c, namespaceId, oldName, newName))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
break;
}
case NAMESPACE_DELETE: {
@@ -129,7 +129,7 @@ class FateServiceHandler implements FateService.Iface {
if (!master.security.canDeleteNamespace(c, namespaceId))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteNamespace(namespaceId)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteNamespace(namespaceId)), autoCleanup);
break;
}
case TABLE_CREATE: {
@@ -148,7 +148,7 @@ class FateServiceHandler implements FateService.Iface {
if (!master.security.canCreateTable(c, tableName, namespaceId))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
break;
}
@@ -186,7 +186,7 @@ class FateServiceHandler implements FateService.Iface {
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
try {
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
} catch (NamespaceNotFoundException e) {
throw new ThriftTableOperationException(null, oldTableName, tableOp, TableOperationExceptionType.NAMESPACE_NOTFOUND, "");
}
@@ -216,8 +216,8 @@ class FateServiceHandler implements FateService.Iface {
if (!canCloneTable)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- Map<String,String> propertiesToSet = new HashMap<String,String>();
- Set<String> propertiesToExclude = new HashSet<String>();
+ Map<String,String> propertiesToSet = new HashMap<>();
+ Set<String> propertiesToExclude = new HashSet<>();
for (Entry<String,String> entry : options.entrySet()) {
if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) {
@@ -233,7 +233,7 @@ class FateServiceHandler implements FateService.Iface {
propertiesToSet.put(entry.getKey(), entry.getValue());
}
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
+ master.fate.seedTransaction(opid, new TraceRepo<>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
autoCleanup);
break;
@@ -255,7 +255,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canDeleteTable)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteTable(tableId)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteTable(tableId)), autoCleanup);
break;
}
case TABLE_ONLINE: {
@@ -274,7 +274,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canOnlineOfflineTable)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
break;
}
case TABLE_OFFLINE: {
@@ -293,7 +293,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canOnlineOfflineTable)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
break;
}
case TABLE_MERGE: {
@@ -317,7 +317,7 @@ class FateServiceHandler implements FateService.Iface {
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
Master.log.debug("Creating merge op: " + tableId + " " + startRow + " " + endRow);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
break;
}
case TABLE_DELETE_RANGE: {
@@ -340,7 +340,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canDeleteRange)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
break;
}
case TABLE_BULK_IMPORT: {
@@ -365,7 +365,7 @@ class FateServiceHandler implements FateService.Iface {
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
master.updateBulkImportStatus(dir, BulkImportState.INITIAL);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
break;
}
case TABLE_COMPACT: {
@@ -388,7 +388,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canCompact)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
break;
}
case TABLE_CANCEL_COMPACT: {
@@ -407,7 +407,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canCancelCompact)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new CancelCompactions(tableId)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new CancelCompactions(tableId)), autoCleanup);
break;
}
case TABLE_IMPORT: {
@@ -432,7 +432,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canImport)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
break;
}
case TABLE_EXPORT: {
@@ -454,7 +454,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canExport)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- master.fate.seedTransaction(opid, new TraceRepo<Master>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
+ master.fate.seedTransaction(opid, new TraceRepo<>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
break;
}
default:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index f320214..10d9152 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -186,7 +186,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
final private String hostname;
final private Object balancedNotifier = new Object();
final LiveTServerSet tserverSet;
- final private List<TabletGroupWatcher> watchers = new ArrayList<TabletGroupWatcher>();
+ final private List<TabletGroupWatcher> watchers = new ArrayList<>();
final SecurityOperation security;
final Map<TServerInstance,AtomicInteger> badServers = Collections.synchronizedMap(new DefaultMap<TServerInstance,AtomicInteger>(new AtomicInteger()));
final Set<TServerInstance> serversToShutdown = Collections.synchronizedSet(new HashSet<TServerInstance>());
@@ -380,8 +380,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
String namespaces = ZooUtil.getRoot(getInstance()) + Constants.ZNAMESPACES;
zoo.putPersistentData(namespaces, new byte[0], NodeExistsPolicy.SKIP);
for (Pair<String,String> namespace : Iterables.concat(
- Collections.singleton(new Pair<String,String>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
- Collections.singleton(new Pair<String,String>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
+ Collections.singleton(new Pair<>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
+ Collections.singleton(new Pair<>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
String ns = namespace.getFirst();
String id = namespace.getSecond();
log.debug("Upgrade creating namespace \"" + ns + "\" (ID: " + id + ")");
@@ -727,7 +727,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
static enum TabletGoalState {
HOSTED, UNASSIGNED, DELETED
- };
+ }
TabletGoalState getSystemGoalState(TabletLocationState tls) {
switch (getMasterState()) {
@@ -841,7 +841,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
private void cleanupNonexistentMigrations(final Connector connector) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
- Set<KeyExtent> found = new HashSet<KeyExtent>();
+ Set<KeyExtent> found = new HashSet<>();
for (Entry<Key,Value> entry : scanner) {
KeyExtent extent = new KeyExtent(entry.getKey().getRow(), entry.getValue());
if (migrations.containsKey(extent)) {
@@ -1019,7 +1019,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
private long balanceTablets() {
- List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+ List<TabletMigration> migrationsOut = new ArrayList<>();
long wait = tabletBalancer.balance(Collections.unmodifiableSortedMap(tserverStatus), migrationsSnapshot(), migrationsOut);
for (TabletMigration m : TabletBalancer.checkMigrationSanity(tserverStatus.keySet(), migrationsOut)) {
@@ -1046,7 +1046,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
long start = System.currentTimeMillis();
int threads = Math.max(getConfiguration().getCount(Property.MASTER_STATUS_THREAD_POOL_SIZE), 1);
ExecutorService tp = Executors.newFixedThreadPool(threads);
- final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+ final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
for (TServerInstance serverInstance : currentServers) {
final TServerInstance server = serverInstance;
@@ -1144,12 +1144,12 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
waitForMetadataUpgrade.await();
try {
- final AgeOffStore<Master> store = new AgeOffStore<Master>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
+ final AgeOffStore<Master> store = new AgeOffStore<>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
ZooReaderWriter.getInstance()), 1000 * 60 * 60 * 8);
int threads = getConfiguration().getCount(Property.MASTER_FATE_THREADPOOL_SIZE);
- fate = new Fate<Master>(this, store);
+ fate = new Fate<>(this, store);
fate.startTransactionRunners(threads);
SimpleTimer.getInstance(getConfiguration()).schedule(new Runnable() {
@@ -1191,9 +1191,9 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
final Processor<Iface> processor;
if (ThriftServerType.SASL == getThriftServerType()) {
Iface tcredsProxy = TCredentialsUpdatingWrapper.service(rpcProxy, clientHandler.getClass(), getConfiguration());
- processor = new Processor<Iface>(tcredsProxy);
+ processor = new Processor<>(tcredsProxy);
} else {
- processor = new Processor<Iface>(rpcProxy);
+ processor = new Processor<>(rpcProxy);
}
ServerAddress sa = TServerUtils.startServer(this, hostname, Property.MASTER_CLIENTPORT, processor, "Master", "Master Client Service Handler", null,
Property.MASTER_MINTHREADS, Property.MASTER_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1221,8 +1221,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
// Start the replication coordinator which assigns tservers to service replication requests
MasterReplicationCoordinator impl = new MasterReplicationCoordinator(this);
- ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(
- RpcWrapper.service(impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
+ ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<>(RpcWrapper.service(
+ impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
ServerAddress replAddress = TServerUtils.startServer(this, hostname, Property.MASTER_REPLICATION_COORDINATOR_PORT, replicationCoordinatorProcessor,
"Master Replication Coordinator", "Replication Coordinator", null, Property.MASTER_REPLICATION_COORDINATOR_MINTHREADS,
Property.MASTER_REPLICATION_COORDINATOR_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1404,7 +1404,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
obit.post(dead.hostPort(), cause);
}
- Set<TServerInstance> unexpected = new HashSet<TServerInstance>(deleted);
+ Set<TServerInstance> unexpected = new HashSet<>(deleted);
unexpected.removeAll(this.serversToShutdown);
if (unexpected.size() > 0) {
if (stillMaster() && !getMasterGoalState().equals(MasterGoalState.CLEAN_STOP)) {
@@ -1469,7 +1469,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
@Override
public Set<String> onlineTables() {
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
if (getMasterState() != MasterState.NORMAL) {
if (getMasterState() != MasterState.UNLOAD_METADATA_TABLETS)
result.add(MetadataTable.ID);
@@ -1496,7 +1496,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
@Override
public Collection<MergeInfo> merges() {
- List<MergeInfo> result = new ArrayList<MergeInfo>();
+ List<MergeInfo> result = new ArrayList<>();
for (String tableId : Tables.getIdToNameMap(getInstance()).keySet()) {
result.add(getMergeInfo(tableId));
}
@@ -1552,8 +1552,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
public MasterMonitorInfo getMasterMonitorInfo() {
final MasterMonitorInfo result = new MasterMonitorInfo();
- result.tServerInfo = new ArrayList<TabletServerStatus>();
- result.tableMap = new DefaultMap<String,TableInfo>(new TableInfo());
+ result.tServerInfo = new ArrayList<>();
+ result.tableMap = new DefaultMap<>(new TableInfo());
for (Entry<TServerInstance,TabletServerStatus> serverEntry : tserverStatus.entrySet()) {
final TabletServerStatus status = serverEntry.getValue();
result.tServerInfo.add(status);
@@ -1561,7 +1561,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
TableInfoUtil.add(result.tableMap.get(entry.getKey()), entry.getValue());
}
}
- result.badTServers = new HashMap<String,Byte>();
+ result.badTServers = new HashMap<>();
synchronized (badServers) {
for (TServerInstance bad : badServers.keySet()) {
result.badTServers.put(bad.hostPort(), TabletServerState.UNRESPONSIVE.getId());
@@ -1570,7 +1570,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
result.state = getMasterState();
result.goalState = getMasterGoalState();
result.unassignedTablets = displayUnassigned();
- result.serversShuttingDown = new HashSet<String>();
+ result.serversShuttingDown = new HashSet<>();
synchronized (serversToShutdown) {
for (TServerInstance server : serversToShutdown)
result.serversShuttingDown.add(server.hostPort());
@@ -1590,7 +1590,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
@Override
public Set<KeyExtent> migrationsSnapshot() {
- Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>();
+ Set<KeyExtent> migrationKeys = new HashSet<>();
synchronized (migrations) {
migrationKeys.addAll(migrations.keySet());
}
@@ -1600,7 +1600,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
@Override
public Set<TServerInstance> shutdownServers() {
synchronized (serversToShutdown) {
- return new HashSet<TServerInstance>(serversToShutdown);
+ return new HashSet<>(serversToShutdown);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index 590f483..bbbdbed 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -148,7 +148,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
if (endRow != null && startRow != null && ByteBufferUtil.toText(startRow).compareTo(ByteBufferUtil.toText(endRow)) >= 0)
throw new ThriftTableOperationException(tableId, null, TableOperation.FLUSH, TableOperationExceptionType.BAD_RANGE, "start row must be less than end row");
- Set<TServerInstance> serversToFlush = new HashSet<TServerInstance>(master.tserverSet.getCurrentServers());
+ Set<TServerInstance> serversToFlush = new HashSet<>(master.tserverSet.getCurrentServers());
for (long l = 0; l < maxLoops; l++) {
@@ -303,7 +303,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
log.debug("Seeding FATE op to shutdown " + tabletServer + " with tid " + tid);
- master.fate.seedTransaction(tid, new TraceRepo<Master>(new ShutdownTServer(doomed, force)), false);
+ master.fate.seedTransaction(tid, new TraceRepo<>(new ShutdownTServer(doomed, force)), false);
master.fate.waitForCompletion(tid);
master.fate.delete(tid);
@@ -469,7 +469,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
@Override
public List<String> getActiveTservers(TInfo tinfo, TCredentials credentials) throws TException {
Set<TServerInstance> tserverInstances = master.onlineTabletServers();
- List<String> servers = new ArrayList<String>();
+ List<String> servers = new ArrayList<>();
for (TServerInstance tserverInstance : tserverInstances) {
servers.add(tserverInstance.getLocation().toString());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 e8df759..e20335b 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
@@ -142,8 +142,8 @@ class TabletGroupWatcher extends Daemon {
int unloaded = 0;
ClosableIterator<TabletLocationState> iter = null;
try {
- Map<String,MergeStats> mergeStatsCache = new HashMap<String,MergeStats>();
- Map<String,MergeStats> currentMerges = new HashMap<String,MergeStats>();
+ Map<String,MergeStats> mergeStatsCache = new HashMap<>();
+ Map<String,MergeStats> currentMerges = new HashMap<>();
for (MergeInfo merge : master.merges()) {
if (merge.getExtent() != null) {
currentMerges.put(merge.getExtent().getTableId(), new MergeStats(merge));
@@ -151,7 +151,7 @@ class TabletGroupWatcher extends Daemon {
}
// Get the current status for the current list of tservers
- SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<TServerInstance,TabletServerStatus>();
+ SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<>();
for (TServerInstance entry : this.master.tserverSet.getCurrentServers()) {
currentTServers.put(entry, this.master.tserverStatus.get(entry));
}
@@ -162,13 +162,13 @@ class TabletGroupWatcher extends Daemon {
}
// Don't move tablets to servers that are shutting down
- SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<TServerInstance,TabletServerStatus>(currentTServers);
+ SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<>(currentTServers);
destinations.keySet().removeAll(this.master.serversToShutdown);
- List<Assignment> assignments = new ArrayList<Assignment>();
- List<Assignment> assigned = new ArrayList<Assignment>();
- List<TabletLocationState> assignedToDeadServers = new ArrayList<TabletLocationState>();
- Map<KeyExtent,TServerInstance> unassigned = new HashMap<KeyExtent,TServerInstance>();
+ List<Assignment> assignments = new ArrayList<>();
+ List<Assignment> assigned = new ArrayList<>();
+ List<TabletLocationState> assignedToDeadServers = new ArrayList<>();
+ Map<KeyExtent,TServerInstance> unassigned = new HashMap<>();
Map<TServerInstance,List<Path>> logsForDeadServers = new TreeMap<>();
MasterState masterState = master.getMasterState();
@@ -356,8 +356,8 @@ class TabletGroupWatcher extends Daemon {
// ACCUMULO-2261 if a dying tserver writes a location before its lock information propagates, it may cause duplicate assignment.
// Attempt to find the dead server entry and remove it.
try {
- Map<Key,Value> future = new HashMap<Key,Value>();
- Map<Key,Value> assigned = new HashMap<Key,Value>();
+ Map<Key,Value> future = new HashMap<>();
+ Map<Key,Value> assigned = new HashMap<>();
KeyExtent extent = new KeyExtent(row, new Value(new byte[] {0}));
String table = MetadataTable.NAME;
if (extent.isMeta())
@@ -536,7 +536,7 @@ class TabletGroupWatcher extends Daemon {
TabletsSection.ServerColumnFamily.TIME_COLUMN.fetch(scanner);
scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
- Set<FileRef> datafiles = new TreeSet<FileRef>();
+ Set<FileRef> datafiles = new TreeSet<>();
for (Entry<Key,Value> entry : scanner) {
Key key = entry.getKey();
if (key.compareColumnFamily(DataFileColumnFamily.NAME) == 0) {
@@ -761,7 +761,7 @@ class TabletGroupWatcher extends Daemon {
}
if (!currentTServers.isEmpty()) {
- Map<KeyExtent,TServerInstance> assignedOut = new HashMap<KeyExtent,TServerInstance>();
+ Map<KeyExtent,TServerInstance> assignedOut = new HashMap<>();
final StringBuilder builder = new StringBuilder(64);
this.master.tabletBalancer.getAssignments(Collections.unmodifiableSortedMap(currentTServers), Collections.unmodifiableMap(unassigned), assignedOut);
for (Entry<KeyExtent,TServerInstance> assignment : assignedOut.entrySet()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index c1c1713..bd49a7d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -55,9 +55,9 @@ public class RecoveryManager {
private static final Logger log = LoggerFactory.getLogger(RecoveryManager.class);
- private Map<String,Long> recoveryDelay = new HashMap<String,Long>();
- private Set<String> closeTasksQueued = new HashSet<String>();
- private Set<String> sortsQueued = new HashSet<String>();
+ private Map<String,Long> recoveryDelay = new HashMap<>();
+ private Set<String> closeTasksQueued = new HashSet<>();
+ private Set<String> sortsQueued = new HashSet<>();
private ScheduledExecutorService executor;
private Master master;
private ZooCache zooCache;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
index 1fe72a3..931df12 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
@@ -23,14 +23,14 @@ import org.apache.accumulo.core.master.thrift.MasterState;
import org.apache.accumulo.server.master.state.TabletState;
public class TableStats {
- private Map<String,TableCounts> last = new HashMap<String,TableCounts>();
+ private Map<String,TableCounts> last = new HashMap<>();
private Map<String,TableCounts> next;
private long startScan = 0;
private long endScan = 0;
private MasterState state;
public synchronized void begin() {
- next = new HashMap<String,TableCounts>();
+ next = new HashMap<>();
startScan = System.currentTimeMillis();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 2346ecc..4653472 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
@@ -80,7 +80,7 @@ class CompactionDriver extends MasterRepo {
throw new AcceptableThriftTableOperationException(tableId, null, TableOperation.COMPACT, TableOperationExceptionType.OTHER, "Compaction canceled");
}
- MapCounter<TServerInstance> serversToFlush = new MapCounter<TServerInstance>();
+ MapCounter<TServerInstance> serversToFlush = new MapCounter<>();
Connector conn = master.getConnector();
Scanner scanner;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
index 5fbf3a0..2f71907 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
@@ -67,7 +67,7 @@ class CopyFailed extends MasterRepo {
@Override
public long isReady(long tid, Master master) throws Exception {
- Set<TServerInstance> finished = new HashSet<TServerInstance>();
+ Set<TServerInstance> finished = new HashSet<>();
Set<TServerInstance> running = master.onlineTabletServers();
for (TServerInstance server : running) {
try {
@@ -92,8 +92,8 @@ class CopyFailed extends MasterRepo {
if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
return new CleanUpBulkImport(tableId, source, bulk, error);
- HashMap<FileRef,String> failures = new HashMap<FileRef,String>();
- HashMap<FileRef,String> loadedFailures = new HashMap<FileRef,String>();
+ HashMap<FileRef,String> failures = new HashMap<>();
+ HashMap<FileRef,String> loadedFailures = new HashMap<>();
try (BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(error, BulkImport.FAILURES_TXT)), UTF_8))) {
String line = null;
@@ -138,7 +138,7 @@ class CopyFailed extends MasterRepo {
DistributedWorkQueue bifCopyQueue = new DistributedWorkQueue(Constants.ZROOT + "/" + master.getInstance().getInstanceID() + Constants.ZBULK_FAILED_COPYQ,
master.getConfiguration());
- HashSet<String> workIds = new HashSet<String>();
+ HashSet<String> workIds = new HashSet<>();
for (String failure : loadedFailures.values()) {
Path orig = new Path(failure);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 40cac38..ff285fa 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@ -101,7 +101,7 @@ class LoadFiles extends MasterRepo {
ExecutorService executor = getThreadPool(master);
final AccumuloConfiguration conf = master.getConfiguration();
VolumeManager fs = master.getFileSystem();
- List<FileStatus> files = new ArrayList<FileStatus>();
+ List<FileStatus> files = new ArrayList<>();
for (FileStatus entry : fs.listStatus(new Path(bulk))) {
files.add(entry);
}
@@ -123,7 +123,7 @@ class LoadFiles extends MasterRepo {
final int RETRIES = Math.max(1, conf.getCount(Property.MASTER_BULK_RETRIES));
for (int attempt = 0; attempt < RETRIES && filesToLoad.size() > 0; attempt++) {
- List<Future<List<String>>> results = new ArrayList<Future<List<String>>>();
+ List<Future<List<String>>> results = new ArrayList<>();
if (master.onlineTabletServers().size() == 0)
log.warn("There are no tablet server to process bulk import, waiting (tid = " + tid + ")");
@@ -140,7 +140,7 @@ class LoadFiles extends MasterRepo {
results.add(executor.submit(new Callable<List<String>>() {
@Override
public List<String> call() {
- List<String> failures = new ArrayList<String>();
+ List<String> failures = new ArrayList<>();
ClientService.Client client = null;
HostAndPort server = null;
try {
@@ -168,7 +168,7 @@ class LoadFiles extends MasterRepo {
}
}));
}
- Set<String> failures = new HashSet<String>();
+ Set<String> failures = new HashSet<>();
for (Future<List<String>> f : results)
failures.addAll(f.get());
filesToLoad.removeAll(loaded);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 9e596f8..81e28b6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -69,7 +69,7 @@ class PopulateMetadataTable extends MasterRepo {
BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), UTF_8));
try {
- Map<String,String> map = new HashMap<String,String>();
+ Map<String,String> map = new HashMap<>();
String line = null;
while ((line = in.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
index 9388b7b..4bbb12b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
@@ -57,7 +57,7 @@ public class TraceRepo<T> implements Repo<T> {
Repo<T> result = repo.call(tid, environment);
if (result == null)
return null;
- return new TraceRepo<T>(result);
+ return new TraceRepo<>(result);
} finally {
span.stop();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 3ea2767..d0cbe36 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
@@ -202,7 +202,7 @@ class WriteExportFiles extends MasterRepo {
DataOutputStream dataOut) throws IOException, TableNotFoundException, AccumuloException, AccumuloSecurityException {
zipOut.putNextEntry(new ZipEntry(Constants.EXPORT_METADATA_FILE));
- Map<String,String> uniqueFiles = new HashMap<String,String>();
+ Map<String,String> uniqueFiles = new HashMap<>();
Scanner metaScanner = context.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
metaScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
index 953d630..a1dd303 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
@@ -44,7 +44,7 @@ public class FateAdmin {
static class TxOpts {
@Parameter(description = "<txid>...", required = true)
- List<String> txids = new ArrayList<String>();
+ List<String> txids = new ArrayList<>();
}
@Parameters(commandDescription = "Stop an existing FATE by transaction id")
@@ -60,7 +60,7 @@ public class FateAdmin {
Help opts = new Help();
JCommander jc = new JCommander(opts);
jc.setProgramName(FateAdmin.class.getName());
- LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<String,TxOpts>(2);
+ LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<>(2);
txOpts.put("fail", new FailOpts());
txOpts.put("delete", new DeleteOpts());
for (Entry<String,TxOpts> entry : txOpts.entrySet()) {
@@ -76,13 +76,13 @@ public class FateAdmin {
System.err
.printf("This tool has been deprecated%nFATE administration now available within 'accumulo shell'%n$ fate fail <txid>... | delete <txid>... | print [<txid>...]%n%n");
- AdminUtil<Master> admin = new AdminUtil<Master>();
+ AdminUtil<Master> admin = new AdminUtil<>();
Instance instance = HdfsZooInstance.getInstance();
String path = ZooUtil.getRoot(instance) + Constants.ZFATE;
String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK;
IZooReaderWriter zk = ZooReaderWriter.getInstance();
- ZooStore<Master> zs = new ZooStore<Master>(path, zk);
+ ZooStore<Master> zs = new ZooStore<>(path, zk);
if (jc.getParsedCommand().equals("fail")) {
for (String txid : txOpts.get(jc.getParsedCommand()).txids) {
@@ -98,7 +98,7 @@ public class FateAdmin {
admin.deleteLocks(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS, txid);
}
} else if (jc.getParsedCommand().equals("print")) {
- admin.print(new ReadOnlyStore<Master>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
+ admin.print(new ReadOnlyStore<>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
}
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
index c0e9a4a..8d139ac 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
@@ -26,7 +26,7 @@ public class DefaultMapTest {
@Test
public void testDefaultMap() {
- DefaultMap<String,String> map = new DefaultMap<String,String>("");
+ DefaultMap<String,String> map = new DefaultMap<>("");
map.put("key", "value");
String empty = map.get("otherKey");
assertEquals(map.get("key"), "value");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
index 0a78d59..0bc989e 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
@@ -48,7 +48,7 @@ public class RootTabletStateStoreTest {
this.name = name;
}
- List<Node> children = new ArrayList<Node>();
+ List<Node> children = new ArrayList<>();
String name;
byte[] value = new byte[] {};
@@ -58,7 +58,7 @@ public class RootTabletStateStoreTest {
return node;
return null;
}
- };
+ }
static class FakeZooStore implements DistributedStore {
@@ -83,7 +83,7 @@ public class RootTabletStateStoreTest {
Node node = navigate(path);
if (node == null)
return Collections.emptyList();
- List<String> children = new ArrayList<String>(node.children.size());
+ List<String> children = new ArrayList<>(node.children.size());
for (Node child : node.children)
children.add(child.name);
return children;
@@ -143,10 +143,10 @@ public class RootTabletStateStoreTest {
assertArrayEquals(store.get("/a/b"), "ab".getBytes());
store.put("/a/b/b", "abb".getBytes());
List<String> children = store.getChildren("/a/b");
- assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b", "c")));
+ assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b", "c")));
store.remove("/a/b/c");
children = store.getChildren("/a/b");
- assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b")));
+ assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b")));
}
@Test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 9dc4cef..63fb32c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -173,20 +173,20 @@ public class Monitor {
private ZooLock monitorLock;
private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
- public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+ public static final AtomicReference<String> cachedInstanceName = new AtomicReference<>(DEFAULT_INSTANCE_NAME);
private static class EventCounter {
- Map<String,Pair<Long,Long>> prevSamples = new HashMap<String,Pair<Long,Long>>();
- Map<String,Pair<Long,Long>> samples = new HashMap<String,Pair<Long,Long>>();
- Set<String> serversUpdated = new HashSet<String>();
+ Map<String,Pair<Long,Long>> prevSamples = new HashMap<>();
+ Map<String,Pair<Long,Long>> samples = new HashMap<>();
+ Set<String> serversUpdated = new HashSet<>();
void startingUpdates() {
serversUpdated.clear();
}
void updateTabletServer(String name, long sampleTime, long numEvents) {
- Pair<Long,Long> newSample = new Pair<Long,Long>(sampleTime, numEvents);
+ Pair<Long,Long> newSample = new Pair<>(sampleTime, numEvents);
Pair<Long,Long> lastSample = samples.get(name);
if (lastSample == null || !lastSample.equals(newSample)) {
@@ -347,25 +347,25 @@ public class Monitor {
Monitor.totalHoldTime = totalHoldTime;
Monitor.totalLookups = totalLookups;
- ingestRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestRate));
- ingestByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestByteRate));
+ ingestRateOverTime.add(new Pair<>(currentTime, totalIngestRate));
+ ingestByteRateOverTime.add(new Pair<>(currentTime, totalIngestByteRate));
double totalLoad = 0.;
for (TabletServerStatus status : mmi.tServerInfo) {
if (status != null)
totalLoad += status.osLoad;
}
- loadOverTime.add(new Pair<Long,Double>(currentTime, totalLoad));
+ loadOverTime.add(new Pair<>(currentTime, totalLoad));
- minorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, minorCompactions));
- majorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, majorCompactions));
+ minorCompactionsOverTime.add(new Pair<>(currentTime, minorCompactions));
+ majorCompactionsOverTime.add(new Pair<>(currentTime, majorCompactions));
- lookupsOverTime.add(new Pair<Long,Double>(currentTime, lookupRateTracker.calculateRate()));
+ lookupsOverTime.add(new Pair<>(currentTime, lookupRateTracker.calculateRate()));
- queryRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalQueryRate));
- queryByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalQueryByteRate));
+ queryRateOverTime.add(new Pair<>(currentTime, (int) totalQueryRate));
+ queryByteRateOverTime.add(new Pair<>(currentTime, totalQueryByteRate));
- scanRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalScanRate));
+ scanRateOverTime.add(new Pair<>(currentTime, (int) totalScanRate));
calcCacheHitRate(indexCacheHitRateOverTime, currentTime, indexCacheHitTracker, indexCacheRequestTracker);
calcCacheHitRate(dataCacheHitRateOverTime, currentTime, dataCacheHitTracker, dataCacheRequestTracker);
@@ -390,7 +390,7 @@ public class Monitor {
private static void calcCacheHitRate(List<Pair<Long,Double>> hitRate, long currentTime, EventCounter cacheHits, EventCounter cacheReq) {
long req = cacheReq.calculateCount();
if (req > 0)
- hitRate.add(new Pair<Long,Double>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
+ hitRate.add(new Pair<>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
else
hitRate.add(new Pair<Long,Double>(currentTime, null));
}
@@ -558,11 +558,11 @@ public class Monitor {
}
}
- static final Map<HostAndPort,ScanStats> allScans = new HashMap<HostAndPort,ScanStats>();
+ static final Map<HostAndPort,ScanStats> allScans = new HashMap<>();
public static Map<HostAndPort,ScanStats> getScans() {
synchronized (allScans) {
- return new HashMap<HostAndPort,ScanStats>(allScans);
+ return new HashMap<>(allScans);
}
}
@@ -762,37 +762,37 @@ public class Monitor {
public static List<Pair<Long,Double>> getLoadOverTime() {
synchronized (loadOverTime) {
- return new ArrayList<Pair<Long,Double>>(loadOverTime);
+ return new ArrayList<>(loadOverTime);
}
}
public static List<Pair<Long,Double>> getIngestRateOverTime() {
synchronized (ingestRateOverTime) {
- return new ArrayList<Pair<Long,Double>>(ingestRateOverTime);
+ return new ArrayList<>(ingestRateOverTime);
}
}
public static List<Pair<Long,Double>> getIngestByteRateOverTime() {
synchronized (ingestByteRateOverTime) {
- return new ArrayList<Pair<Long,Double>>(ingestByteRateOverTime);
+ return new ArrayList<>(ingestByteRateOverTime);
}
}
public static List<Pair<Long,Integer>> getMinorCompactionsOverTime() {
synchronized (minorCompactionsOverTime) {
- return new ArrayList<Pair<Long,Integer>>(minorCompactionsOverTime);
+ return new ArrayList<>(minorCompactionsOverTime);
}
}
public static List<Pair<Long,Integer>> getMajorCompactionsOverTime() {
synchronized (majorCompactionsOverTime) {
- return new ArrayList<Pair<Long,Integer>>(majorCompactionsOverTime);
+ return new ArrayList<>(majorCompactionsOverTime);
}
}
public static List<Pair<Long,Double>> getLookupsOverTime() {
synchronized (lookupsOverTime) {
- return new ArrayList<Pair<Long,Double>>(lookupsOverTime);
+ return new ArrayList<>(lookupsOverTime);
}
}
@@ -802,31 +802,31 @@ public class Monitor {
public static List<Pair<Long,Integer>> getQueryRateOverTime() {
synchronized (queryRateOverTime) {
- return new ArrayList<Pair<Long,Integer>>(queryRateOverTime);
+ return new ArrayList<>(queryRateOverTime);
}
}
public static List<Pair<Long,Integer>> getScanRateOverTime() {
synchronized (scanRateOverTime) {
- return new ArrayList<Pair<Long,Integer>>(scanRateOverTime);
+ return new ArrayList<>(scanRateOverTime);
}
}
public static List<Pair<Long,Double>> getQueryByteRateOverTime() {
synchronized (queryByteRateOverTime) {
- return new ArrayList<Pair<Long,Double>>(queryByteRateOverTime);
+ return new ArrayList<>(queryByteRateOverTime);
}
}
public static List<Pair<Long,Double>> getIndexCacheHitRateOverTime() {
synchronized (indexCacheHitRateOverTime) {
- return new ArrayList<Pair<Long,Double>>(indexCacheHitRateOverTime);
+ return new ArrayList<>(indexCacheHitRateOverTime);
}
}
public static List<Pair<Long,Double>> getDataCacheHitRateOverTime() {
synchronized (dataCacheHitRateOverTime) {
- return new ArrayList<Pair<Long,Double>>(dataCacheHitRateOverTime);
+ return new ArrayList<>(dataCacheHitRateOverTime);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 7e992e0..f2a295d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -82,7 +82,7 @@ public class ZooKeeperStatus implements Runnable {
}
}
- private static SortedSet<ZooKeeperState> status = new TreeSet<ZooKeeperState>();
+ private static SortedSet<ZooKeeperState> status = new TreeSet<>();
public static Collection<ZooKeeperState> getZooKeeperStatus() {
return status;
@@ -93,7 +93,7 @@ public class ZooKeeperStatus implements Runnable {
while (!stop) {
- TreeSet<ZooKeeperState> update = new TreeSet<ZooKeeperState>();
+ TreeSet<ZooKeeperState> update = new TreeSet<>();
String zookeepers[] = SiteConfiguration.getInstance().get(Property.INSTANCE_ZK_HOST).split(",");
for (String keeper : zookeepers) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
index 926eedc..74fc21c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
@@ -48,7 +48,7 @@ public class GcStatusServlet extends BasicServlet {
gcActivity.addSortableColumn("Candidates", new NumberType<Long>(), null);
gcActivity.addSortableColumn("Deleted", new NumberType<Long>(), null);
gcActivity.addSortableColumn("In Use", new NumberType<Long>(), null);
- gcActivity.addSortableColumn("Errors", new NumberType<Long>(0l, 1l), null);
+ gcActivity.addSortableColumn("Errors", new NumberType<>(0l, 1l), null);
gcActivity.addSortableColumn("Duration", new DurationType(), null);
if (status.last.finished > 0)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
index dc75537..745fd96 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
@@ -49,7 +49,7 @@ public class JSONServlet extends BasicServlet {
private static Map<String,Object> addServer(String ip, String hostname, double osload, double ingest, double query, double ingestMB, double queryMB,
int scans, double scansessions, long holdtime) {
- Map<String,Object> map = new HashMap<String,Object>();
+ Map<String,Object> map = new HashMap<>();
map.put("ip", ip);
map.put("hostname", hostname);
map.put("osload", osload);
@@ -69,8 +69,8 @@ public class JSONServlet extends BasicServlet {
return;
}
- Map<String,Object> results = new HashMap<String,Object>();
- List<Map<String,Object>> servers = new ArrayList<Map<String,Object>>();
+ Map<String,Object> results = new HashMap<>();
+ List<Map<String,Object>> servers = new ArrayList<>();
for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
TableInfo summary = TableInfoUtil.summarizeTableStats(status);
@@ -80,14 +80,14 @@ public class JSONServlet extends BasicServlet {
}
for (Entry<String,Byte> entry : Monitor.getMmi().badTServers.entrySet()) {
- Map<String,Object> badServer = new HashMap<String,Object>();
+ Map<String,Object> badServer = new HashMap<>();
badServer.put("ip", entry.getKey());
badServer.put("bad", true);
servers.add(badServer);
}
for (DeadServer dead : Monitor.getMmi().deadTabletServers) {
- Map<String,Object> deadServer = new HashMap<String,Object>();
+ Map<String,Object> deadServer = new HashMap<>();
deadServer.put("ip", dead.server);
deadServer.put("dead", true);
servers.add(deadServer);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
index 64b8648..42d771c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
@@ -122,7 +122,7 @@ public class MasterServlet extends BasicServlet {
}
int guessHighLoad = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
- List<String> slaves = new ArrayList<String>();
+ List<String> slaves = new ArrayList<>();
for (TabletServerStatus up : Monitor.getMmi().tServerInfo) {
slaves.add(up.name);
}
@@ -137,8 +137,8 @@ public class MasterServlet extends BasicServlet {
(int) (slaves.size() * 0.6 + 1.0), slaves.size()), "Number of tablet servers currently available");
masterStatus.addSortableColumn("# Total<br />Tablet Servers", new PreciseNumberType(), "The total number of tablet servers configured");
masterStatus.addSortableColumn("Last GC", null, "The last time files were cleaned-up from HDFS.");
- masterStatus.addSortableColumn("# Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
- masterStatus.addSortableColumn("# Unassigned<br />Tablets", new NumberType<Integer>(0, 0), null);
+ masterStatus.addSortableColumn("# Tablets", new NumberType<>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
+ masterStatus.addSortableColumn("# Unassigned<br />Tablets", new NumberType<>(0, 0), null);
masterStatus.addSortableColumn("Entries", new NumberType<Long>(), "The total number of key/value pairs in Accumulo");
masterStatus.addSortableColumn("Ingest", new NumberType<Long>(), "The number of Key/Value pairs inserted, per second. "
+ " Note that deleted records are \"inserted\" and will make the ingest " + "rate increase in the near-term.");
@@ -147,7 +147,7 @@ public class MasterServlet extends BasicServlet {
masterStatus.addSortableColumn("Entries<br />Returned", new NumberType<Long>(), "The total number of Key/Value pairs returned as a result of scans.");
masterStatus.addSortableColumn("Hold Time", new DurationType(0l, 0l), "The maximum amount of time that ingest has been held "
+ "across all servers due to a lack of memory to store the records");
- masterStatus.addSortableColumn("OS Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+ masterStatus.addSortableColumn("OS Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
"The one-minute load average on the computer that runs the monitor web server.");
TableRow row = masterStatus.prepareRow();
row.add(masters.size() == 0 ? "<div class='error'>Down</div>" : AddressUtil.parseAddress(masters.get(0), false).getHostText());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
index e78c26a..29ab6c6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
@@ -93,7 +93,7 @@ public class ProblemServlet extends BasicServlet {
if (Monitor.getProblemException() != null)
return;
- ArrayList<ProblemReport> problemReports = new ArrayList<ProblemReport>();
+ ArrayList<ProblemReport> problemReports = new ArrayList<>();
Iterator<ProblemReport> iter = tableId == null ? ProblemReports.getInstance(Monitor.getContext()).iterator() : ProblemReports.getInstance(
Monitor.getContext()).iterator(tableId);
while (iter.hasNext())
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
index bf582c7..abc9ec4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
@@ -122,7 +122,7 @@ public class ReplicationServlet extends BasicServlet {
// Up to 2x the number of slots for replication available, WARN
// More than 2x the number of slots for replication available, ERROR
- NumberType<Long> filesPendingFormat = new NumberType<Long>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
+ NumberType<Long> filesPendingFormat = new NumberType<>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
Long.valueOf(4 * totalWorkQueueSize));
String utilization = filesPendingFormat.format(filesPendingOverAllTargets);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
index 1f0e137..31bea15 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
@@ -41,7 +41,7 @@ public class ShellServlet extends BasicServlet {
private synchronized Map<String,ShellExecutionThread> userShells() {
if (userShells == null) {
- userShells = new HashMap<String,ShellExecutionThread>();
+ userShells = new HashMap<>();
}
return userShells;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index c01a6a9..858192b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -99,7 +99,7 @@ public class TServersServlet extends BasicServlet {
doDeadTserverList(req, sb);
- ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+ ArrayList<TabletServerStatus> tservers = new ArrayList<>();
if (Monitor.getMmi() != null)
tservers.addAll(Monitor.getMmi().tServerInfo);
@@ -124,7 +124,7 @@ public class TServersServlet extends BasicServlet {
HostAndPort address = HostAndPort.fromString(tserverAddress);
TabletStats historical = new TabletStats(null, new ActionStats(), new ActionStats(), new ActionStats(), 0, 0, 0, 0);
- List<TabletStats> tsStats = new ArrayList<TabletStats>();
+ List<TabletStats> tsStats = new ArrayList<>();
try {
ClientContext context = Monitor.getContext();
TabletClientService.Client client = ThriftUtil.getClient(new TabletClientService.Client.Factory(), address, context);
@@ -319,7 +319,7 @@ public class TServersServlet extends BasicServlet {
}
final long MINUTES = 3 * 60 * 1000;
tServerList.addSortableColumn("Server", new TServerLinkType(), null);
- tServerList.addSortableColumn("Hosted Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE), null);
+ tServerList.addSortableColumn("Hosted Tablets", new NumberType<>(0, Integer.MAX_VALUE), null);
tServerList.addSortableColumn("Last Contact", new DurationType(0l, (long) Math.min(avgLastContact * 4, MINUTES)), null);
tServerList.addSortableColumn("Entries", new NumberType<Long>(), "The number of key/value pairs.");
tServerList.addSortableColumn("Ingest", new NumberType<Long>(), "The number of key/value pairs inserted. (Note that deletes are also 'inserted')");
@@ -336,7 +336,7 @@ public class TServersServlet extends BasicServlet {
+ "Major compactions are the operations where many smaller files are grouped into a larger file, eliminating duplicates and cleaning up deletes.");
tServerList.addSortableColumn("Index Cache<br />Hit Rate", new PercentageType(), "The recent index cache hit rate.");
tServerList.addSortableColumn("Data Cache<br />Hit Rate", new PercentageType(), "The recent data cache hit rate.");
- tServerList.addSortableColumn("OS Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+ tServerList.addSortableColumn("OS Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
"The Unix one minute load average. The average number of processes in the run queue over a one minute interval.");
log.debug("tableId: " + tableId);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index 1431698..c1751d8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -84,7 +84,7 @@ public class TablesServlet extends BasicServlet {
tableList.addSortableColumn("Table Name", new TableLinkType(), null);
tableList.addSortableColumn("State", new TableStateType(), null);
tableList.addSortableColumn("# Tablets", new NumberType<Integer>(), "Tables are broken down into ranges of rows called tablets.");
- tableList.addSortableColumn("# Offline<br />Tablets", new NumberType<Integer>(0, 0), "Tablets unavailable for query or ingest. "
+ tableList.addSortableColumn("# Offline<br />Tablets", new NumberType<>(0, 0), "Tablets unavailable for query or ingest. "
+ "May be a transient condition when tablets are moved for balancing.");
tableList.addSortableColumn("Entries", new NumberType<Long>(), "Key/value pairs over each instance, table or tablet.");
tableList.addSortableColumn("Entries<br />In Memory", new NumberType<Long>(),
@@ -106,7 +106,7 @@ public class TablesServlet extends BasicServlet {
"Gathering up many small files and rewriting them as one larger file is called a 'Major Compaction'. "
+ "Major Compactions are performed as a consequence of new files created from Minor Compactions and Bulk Load operations. "
+ "They reduce the number of files used during queries.");
- SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>();
+ SortedMap<String,TableInfo> tableStats = new TreeMap<>();
if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null)
for (Entry<String,TableInfo> te : Monitor.getMmi().tableMap.entrySet())
@@ -145,7 +145,7 @@ public class TablesServlet extends BasicServlet {
private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
String displayName = Tables.getPrintableTableNameFromId(tidToNameMap, tableId);
Instance instance = Monitor.getContext().getInstance();
- TreeSet<String> locs = new TreeSet<String>();
+ TreeSet<String> locs = new TreeSet<>();
if (RootTable.ID.equals(tableId)) {
locs.add(instance.getRootTabletLocation());
} else {
@@ -168,7 +168,7 @@ public class TablesServlet extends BasicServlet {
log.debug("Locs: " + locs);
- List<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+ List<TabletServerStatus> tservers = new ArrayList<>();
if (Monitor.getMmi() != null) {
for (TabletServerStatus tss : Monitor.getMmi().tServerInfo) {
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
index eedf598..298dcdf 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
@@ -150,7 +150,7 @@ public class VisServlet extends BasicServlet {
cfg.spacing = 80;
}
- ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+ ArrayList<TabletServerStatus> tservers = new ArrayList<>();
if (Monitor.getMmi() != null)
tservers.addAll(Monitor.getMmi().tServerInfo);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
index 1662069..ea0ee59 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
@@ -63,7 +63,7 @@ public class XMLServlet extends BasicServlet {
sb.append("</servers>\n");
return;
}
- SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>(Monitor.getMmi().tableMap);
+ SortedMap<String,TableInfo> tableStats = new TreeMap<>(Monitor.getMmi().tableMap);
for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..af68a98 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -141,7 +141,7 @@ abstract class Basic extends BasicServlet {
scanner = getScanner(table, principal, at, sb);
}
- return new AbstractMap.SimpleEntry<Scanner,UserGroupInformation>(scanner, traceUgi);
+ return new AbstractMap.SimpleEntry<>(scanner, traceUgi);
}
private Scanner getScanner(String table, String principal, AuthenticationToken at, StringBuilder sb) throws AccumuloException, AccumuloSecurityException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index 5c58375..56da108 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -168,7 +168,7 @@ public class Summary extends Basic {
}
Range range = getRangeForTrace(minutes);
scanner.setRange(range);
- final Map<String,Stats> summary = new TreeMap<String,Stats>();
+ final Map<String,Stats> summary = new TreeMap<>();
if (null != pair.getValue()) {
pair.getValue().doAs(new PrivilegedAction<Void>() {
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index caf70a1..e7bc30b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -43,8 +43,8 @@ public class Table {
this.caption = caption;
this.captionclass = captionClass;
this.subcaption = null;
- this.columns = new ArrayList<TableColumn<?>>();
- this.rows = new ArrayList<TableRow>();
+ this.columns = new ArrayList<>();
+ this.rows = new ArrayList<>();
}
public synchronized void setSubCaption(String subcaption) {
@@ -59,9 +59,9 @@ public class Table {
private synchronized <T> void addColumn(String title, CellType<T> type, String legend, boolean sortable) {
if (type == null)
- type = new StringType<T>();
+ type = new StringType<>();
type.setSortable(sortable);
- addColumn(new TableColumn<T>(title, type, legend));
+ addColumn(new TableColumn<>(title, type, legend));
}
public synchronized <T> void addUnsortableColumn(String title, CellType<T> type, String legend) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
index c1ce1c5..42853f4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
@@ -25,7 +25,7 @@ public class TableRow {
TableRow(int size) {
this.size = size;
- this.row = new ArrayList<Object>(size);
+ this.row = new ArrayList<>(size);
}
public boolean add(Object obj) {
@@ -47,7 +47,7 @@ public class TableRow {
}
public static <T> Comparator<TableRow> getComparator(int index, Comparator<T> comp) {
- return new TableRowComparator<T>(index, comp);
+ return new TableRowComparator<>(index, comp);
}
private static class TableRowComparator<T> implements Comparator<TableRow> {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 786e8e3..1201d92 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
@@ -31,7 +31,7 @@ public class ShowTraceLinkTypeTest {
@Test
public void testTraceSortingForMonitor() {
- ArrayList<RemoteSpan> spans = new ArrayList<RemoteSpan>(10), expectedOrdering = new ArrayList<RemoteSpan>(10);
+ ArrayList<RemoteSpan> spans = new ArrayList<>(10), expectedOrdering = new ArrayList<>(10);
// "Random" ordering
spans.add(rs(55l, 75l, "desc5"));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
index 7f56931..88a0c5a 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
@@ -32,13 +32,13 @@ public class ZooKeeperStatusTest {
List<String> expectedHosts = Arrays.asList("rack1node1", "rack2node1", "rack4node1", "rack4node4");
// Add the states in a not correctly sorted order
- TreeSet<ZooKeeperState> states = new TreeSet<ZooKeeperState>();
+ TreeSet<ZooKeeperState> states = new TreeSet<>();
states.add(new ZooKeeperState("rack4node4", "leader", 10));
states.add(new ZooKeeperState("rack4node1", "follower", 10));
states.add(new ZooKeeperState("rack1node1", "follower", 10));
states.add(new ZooKeeperState("rack2node1", "follower", 10));
- List<String> actualHosts = new ArrayList<String>(4);
+ List<String> actualHosts = new ArrayList<>(4);
for (ZooKeeperState state : states) {
actualHosts.add(state.keeper);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 a35734d..be924ba 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
@@ -57,7 +57,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
public static final String QUEUE_SIZE = "tracer.queue.size";
public static final String SPAN_MIN_MS = "tracer.span.min.ms";
- private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
+ private final Map<SpanKey,Destination> clients = new HashMap<>();
protected String host = null;
protected String service = null;
@@ -69,7 +69,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
protected abstract SpanKey getSpanKey(Map<String,String> data);
Timer timer = new Timer("SpanSender", true);
- protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
+ protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<>();
protected final AtomicInteger sendQueueSize = new AtomicInteger(0);
int maxQueueSize = 5000;
long lastNotificationOfDroppedSpans = 0;
@@ -150,7 +150,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
if (annotations == null)
return null;
- List<Annotation> result = new ArrayList<Annotation>();
+ List<Annotation> result = new ArrayList<>();
for (TimelineAnnotation annotation : annotations) {
result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
index c7682c1..05c3212 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
@@ -27,8 +27,8 @@ import org.apache.accumulo.tracer.thrift.RemoteSpan;
import org.apache.htrace.Span;
public class SpanTree {
- final Map<Long,List<Long>> parentChildren = new HashMap<Long,List<Long>>();
- public final Map<Long,RemoteSpan> nodes = new HashMap<Long,RemoteSpan>();
+ final Map<Long,List<Long>> parentChildren = new HashMap<>();
+ public final Map<Long,RemoteSpan> nodes = new HashMap<>();
public SpanTree() {}
@@ -40,7 +40,7 @@ public class SpanTree {
}
public Set<Long> visit(SpanTreeVisitor visitor) {
- Set<Long> visited = new HashSet<Long>();
+ Set<Long> visited = new HashSet<>();
List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
if (root == null || root.isEmpty())
return visited;
@@ -57,7 +57,7 @@ public class SpanTree {
if (visited.contains(node.spanId))
return;
visited.add(node.spanId);
- List<RemoteSpan> children = new ArrayList<RemoteSpan>();
+ List<RemoteSpan> children = new ArrayList<>();
List<Long> childrenIds = parentChildren.get(node.spanId);
if (childrenIds != null) {
for (Long childId : childrenIds) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
index 0a87469..b5c00ed 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -52,7 +52,7 @@ public class TraceDump {
@Parameter(names = {"-d", "--dump"}, description = "Dump all traces")
boolean dump = false;
@Parameter(description = " <trace id> { <trace id> ... }")
- List<String> traceIds = new ArrayList<String>();
+ List<String> traceIds = new ArrayList<>();
Opts() {
super("trace");
@@ -74,7 +74,7 @@ public class TraceDump {
}
public static List<RemoteSpan> sortByStart(Collection<RemoteSpan> spans) {
- List<RemoteSpan> spanList = new ArrayList<RemoteSpan>(spans);
+ List<RemoteSpan> spanList = new ArrayList<>(spans);
Collections.sort(spanList, new Comparator<RemoteSpan>() {
@Override
public int compare(RemoteSpan o1, RemoteSpan o2) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index e74aef5..45b6669 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -253,7 +253,7 @@ public class TraceServer implements Watcher {
options.processor(new Processor<Iface>(new Receiver()));
server = new TThreadPoolServer(options);
registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
- writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(tableName,
+ writer = new AtomicReference<>(this.connector.createBatchWriter(tableName,
new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS)));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index aa5a9ee..6954983 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -51,7 +51,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
String path;
boolean pathExists = false;
final Random random = new Random();
- final List<String> hosts = new ArrayList<String>();
+ final List<String> hosts = new ArrayList<>();
long retryPause = 5000l;
// Visible for testing
@@ -144,7 +144,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
synchronized private void updateHosts(String path, List<String> children) {
log.debug("Scanning trace hosts in zookeeper: " + path);
try {
- List<String> hosts = new ArrayList<String>();
+ List<String> hosts = new ArrayList<>();
for (String child : children) {
byte[] data = zoo.getData(path + "/" + child, null);
hosts.add(new String(data, UTF_8));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index 703670f..6dcf7a4 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -79,7 +79,7 @@ public class TracerTest {
}
static class TestReceiver implements SpanReceiver {
- public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
+ public Map<Long,List<SpanStruct>> traces = new HashMap<>();
public TestReceiver() {}