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/11/04 22:16:57 UTC
[20/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
index 03707d1..62f321e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.tserver.data.ServerConditionalMutation;
*/
class RowLocks {
- private Map<ByteSequence,RowLock> rowLocks = new HashMap<ByteSequence,RowLock>();
+ private Map<ByteSequence,RowLock> rowLocks = new HashMap<>();
static class RowLock {
ReentrantLock rlock;
@@ -82,7 +82,7 @@ class RowLocks {
}
List<RowLock> acquireRowlocks(Map<KeyExtent,List<ServerConditionalMutation>> updates, Map<KeyExtent,List<ServerConditionalMutation>> deferred) {
- ArrayList<RowLock> locks = new ArrayList<RowLock>();
+ ArrayList<RowLock> locks = new ArrayList<>();
// assume that mutations are in sorted order to avoid deadlock
synchronized (rowLocks) {
@@ -100,7 +100,7 @@ class RowLocks {
for (RowLock rowLock : locks) {
if (!rowLock.tryLock()) {
if (rowsNotLocked == null)
- rowsNotLocked = new HashSet<ByteSequence>();
+ rowsNotLocked = new HashSet<>();
rowsNotLocked.add(rowLock.rowSeq);
}
}
@@ -126,8 +126,8 @@ class RowLocks {
}
});
- ArrayList<RowLock> filteredLocks = new ArrayList<RowLock>();
- ArrayList<RowLock> locksToReturn = new ArrayList<RowLock>();
+ ArrayList<RowLock> filteredLocks = new ArrayList<>();
+ ArrayList<RowLock> locksToReturn = new ArrayList<>();
for (RowLock rowLock : locks) {
if (rowsNotLocked.contains(rowLock.rowSeq)) {
locksToReturn.add(rowLock);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 6c5b63d..01be531 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
@@ -40,7 +40,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
private final IteratorScope scope;
private final boolean fullMajorCompaction;
private final AccumuloConfiguration config;
- private final ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+ private final ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
private Map<FileRef,DataFileValue> files;
private final Authorizations authorizations; // these will only be supplied during scan scope
@@ -118,7 +118,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
public SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
if (topLevelIterators.isEmpty())
return iter;
- ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+ ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
allIters.add(iter);
return new MultiIterator(allIters, false);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 6762c53..0554462 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
@@ -288,7 +288,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
private final TabletServerResourceManager resourceManager;
private final SecurityOperation security;
- private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<MasterMessage>();
+ private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<>();
private Thread majorCompactorThread;
@@ -413,12 +413,12 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
if (!security.canPerformSystemActions(credentials))
throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- List<TKeyExtent> failures = new ArrayList<TKeyExtent>();
+ List<TKeyExtent> failures = new ArrayList<>();
for (Entry<TKeyExtent,Map<String,MapFileInfo>> entry : files.entrySet()) {
TKeyExtent tke = entry.getKey();
Map<String,MapFileInfo> fileMap = entry.getValue();
- Map<FileRef,MapFileInfo> fileRefMap = new HashMap<FileRef,MapFileInfo>();
+ Map<FileRef,MapFileInfo> fileRefMap = new HashMap<>();
for (Entry<String,MapFileInfo> mapping : fileMap.entrySet()) {
Path path = new Path(mapping.getKey());
FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
@@ -473,7 +473,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
if (tablet == null)
throw new NotServingTabletException(textent);
- Set<Column> columnSet = new HashSet<Column>();
+ Set<Column> columnSet = new HashSet<>();
for (TColumn tcolumn : columns) {
columnSet.add(new Column(tcolumn));
}
@@ -587,7 +587,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
public InitialMultiScan startMultiScan(TInfo tinfo, TCredentials credentials, Map<TKeyExtent,List<TRange>> tbatch, List<TColumn> tcolumns,
List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws ThriftSecurityException {
// find all of the tables that need to be scanned
- final HashSet<String> tables = new HashSet<String>();
+ final HashSet<String> tables = new HashSet<>();
for (TKeyExtent keyExtent : tbatch.keySet()) {
tables.add(new String(keyExtent.getTable(), UTF_8));
}
@@ -607,8 +607,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
log.error("{} is not authorized", credentials.getPrincipal(), tse);
throw tse;
}
- Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<TRange,Range>(
- new TRangeTranslator()));
+ Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<>(new TRangeTranslator()));
// This is used to determine which thread pool to use
KeyExtent threadPoolExtent = batch.keySet().iterator().next();
@@ -801,7 +800,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
private void flush(UpdateSession us) {
int mutationCount = 0;
- Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+ Map<CommitSession,Mutations> sendables = new HashMap<>();
Throwable error = null;
long pt1 = System.currentTimeMillis();
@@ -1079,7 +1078,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
results.add(new TCMResult(scm.getID(), TCMStatus.IGNORED));
iter.remove();
} else {
- final List<ServerConditionalMutation> okMutations = new ArrayList<ServerConditionalMutation>(entry.getValue().size());
+ final List<ServerConditionalMutation> okMutations = new ArrayList<>(entry.getValue().size());
final List<TCMResult> resultsSubList = results.subList(results.size(), results.size());
ConditionChecker checker = checkerContext.newChecker(entry.getValue(), okMutations, resultsSubList);
@@ -1107,7 +1106,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
private void writeConditionalMutations(Map<KeyExtent,List<ServerConditionalMutation>> updates, ArrayList<TCMResult> results, ConditionalSession sess) {
Set<Entry<KeyExtent,List<ServerConditionalMutation>>> es = updates.entrySet();
- Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+ Map<CommitSession,Mutations> sendables = new HashMap<>();
boolean sessionCanceled = sess.interruptFlag.get();
@@ -1201,7 +1200,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
// sort each list of mutations, this is done to avoid deadlock and doing seeks in order is more efficient and detect duplicate rows.
ConditionalMutationSet.sortConditionalMutations(updates);
- Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<KeyExtent,List<ServerConditionalMutation>>();
+ Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<>();
// can not process two mutations for the same row, because one will not see what the other writes
ConditionalMutationSet.deferDuplicatesRows(updates, deferred);
@@ -1270,14 +1269,14 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
long opid = writeTracker.startWrite(TabletType.type(new KeyExtent(tid, null, null)));
try {
- Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET,
- new Translator.ListTranslator<TConditionalMutation,ServerConditionalMutation>(ServerConditionalMutation.TCMT));
+ Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET, new Translator.ListTranslator<>(
+ ServerConditionalMutation.TCMT));
for (KeyExtent ke : updates.keySet())
if (!ke.getTableId().equals(tid))
throw new IllegalArgumentException("Unexpected table id " + tid + " != " + ke.getTableId());
- ArrayList<TCMResult> results = new ArrayList<TCMResult>();
+ ArrayList<TCMResult> results = new ArrayList<>();
Map<KeyExtent,List<ServerConditionalMutation>> deferred = conditionalUpdate(cs, updates, results, symbols);
@@ -1357,9 +1356,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
public List<TabletStats> getTabletStats(TInfo tinfo, TCredentials credentials, String tableId) throws ThriftSecurityException, TException {
TreeMap<KeyExtent,Tablet> onlineTabletsCopy;
synchronized (onlineTablets) {
- onlineTabletsCopy = new TreeMap<KeyExtent,Tablet>(onlineTablets);
+ onlineTabletsCopy = new TreeMap<>(onlineTablets);
}
- List<TabletStats> result = new ArrayList<TabletStats>();
+ List<TabletStats> result = new ArrayList<>();
Text text = new Text(tableId);
KeyExtent start = new KeyExtent(text, new Text(), null);
for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.tailMap(start).entrySet()) {
@@ -1451,7 +1450,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
Set<KeyExtent> openingOverlapping = KeyExtent.findOverlapping(extent, openingTablets);
Set<KeyExtent> onlineOverlapping = KeyExtent.findOverlapping(extent, onlineTablets);
- Set<KeyExtent> all = new HashSet<KeyExtent>();
+ Set<KeyExtent> all = new HashSet<>();
all.addAll(unopenedOverlapping);
all.addAll(openingOverlapping);
all.addAll(onlineOverlapping);
@@ -1532,7 +1531,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
throw new RuntimeException(e);
}
- ArrayList<Tablet> tabletsToFlush = new ArrayList<Tablet>();
+ ArrayList<Tablet> tabletsToFlush = new ArrayList<>();
KeyExtent ke = new KeyExtent(new Text(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
@@ -1654,7 +1653,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
KeyExtent ke = new KeyExtent(new Text(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
- ArrayList<Tablet> tabletsToCompact = new ArrayList<Tablet>();
+ ArrayList<Tablet> tabletsToCompact = new ArrayList<>();
synchronized (onlineTablets) {
for (Tablet tablet : onlineTablets.values())
if (ke.overlaps(tablet.getExtent()))
@@ -1682,9 +1681,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
public void removeLogs(TInfo tinfo, TCredentials credentials, List<String> filenames) throws TException {
String myname = getClientAddressString();
myname = myname.replace(':', '+');
- Set<String> loggers = new HashSet<String>();
+ Set<String> loggers = new HashSet<>();
logger.getLogFiles(loggers);
- Set<String> loggerUUIDs = new HashSet<String>();
+ Set<String> loggerUUIDs = new HashSet<>();
for (String logger : loggers)
loggerUUIDs.add(new Path(logger).getName());
@@ -1694,7 +1693,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
if (loggerUUIDs.contains(uuid))
continue nextFile;
- List<Tablet> onlineTabletsCopy = new ArrayList<Tablet>();
+ List<Tablet> onlineTabletsCopy = new ArrayList<>();
synchronized (onlineTablets) {
onlineTabletsCopy.addAll(onlineTablets.values());
}
@@ -1752,7 +1751,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
List<CompactionInfo> compactions = Compactor.getRunningCompactions();
- List<ActiveCompaction> ret = new ArrayList<ActiveCompaction>(compactions.size());
+ List<ActiveCompaction> ret = new ArrayList<>(compactions.size());
for (CompactionInfo compactionInfo : compactions) {
ret.add(compactionInfo.toThrift());
@@ -1763,9 +1762,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
@Override
public List<String> getActiveLogs(TInfo tinfo, TCredentials credentials) throws TException {
- Set<String> logs = new HashSet<String>();
+ Set<String> logs = new HashSet<>();
logger.getLogFiles(logs);
- return new ArrayList<String>(logs);
+ return new ArrayList<>(logs);
}
}
@@ -1820,7 +1819,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
try {
UtilWaitThread.sleep(getConfiguration().getTimeInMillis(Property.TSERV_MAJC_DELAY));
- TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<KeyExtent,Tablet>();
+ TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<>();
synchronized (onlineTablets) {
copyOnlineTablets.putAll(onlineTablets); // avoid
@@ -2093,7 +2092,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
// check Metadata table before accepting assignment
Text locationToOpen = null;
- SortedMap<Key,Value> tabletsKeyValues = new TreeMap<Key,Value>();
+ SortedMap<Key,Value> tabletsKeyValues = new TreeMap<>();
try {
Pair<Text,KeyExtent> pair = verifyTabletInformation(TabletServer.this, extent, TabletServer.this.getTabletSession(), tabletsKeyValues,
getClientAddressString(), getLock());
@@ -2104,7 +2103,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
openingTablets.remove(extent);
openingTablets.notifyAll();
// it expected that the new extent will overlap the old one... if it does not, it should not be added to unopenedTablets
- if (!KeyExtent.findOverlapping(extent, new TreeSet<KeyExtent>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
+ if (!KeyExtent.findOverlapping(extent, new TreeSet<>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
throw new IllegalStateException("Fixed split does not overlap " + extent + " " + pair.getSecond());
}
unopenedTablets.add(pair.getSecond());
@@ -2238,7 +2237,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
log.info("Adding " + logs.size() + " logs for extent " + extent + " as alias " + id);
long now = RelativeTime.currentTimeMillis();
- List<String> logSet = new ArrayList<String>();
+ List<String> logSet = new ArrayList<>();
for (DfsLogger log : logs)
logSet.add(log.getFileName());
LogEntry entry = new LogEntry();
@@ -2299,9 +2298,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
final Processor<Iface> processor;
if (ThriftServerType.SASL == getThriftServerType()) {
Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration());
- processor = new Processor<Iface>(tcredProxy);
+ processor = new Processor<>(tcredProxy);
} else {
- processor = new Processor<Iface>(rpcProxy);
+ processor = new Processor<>(rpcProxy);
}
HostAndPort address = startServer(getServerConfigurationFactory().getConfiguration(), clientAddress.getHostText(), Property.TSERV_CLIENTPORT, processor,
"Thrift Client Server");
@@ -2313,7 +2312,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
final ReplicationServicerHandler handler = new ReplicationServicerHandler(this);
ReplicationServicer.Iface rpcProxy = RpcWrapper.service(handler, new ReplicationServicer.Processor<ReplicationServicer.Iface>(handler));
ReplicationServicer.Iface repl = TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(), getConfiguration());
- ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<ReplicationServicer.Iface>(repl);
+ ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<>(repl);
AccumuloConfiguration conf = getServerConfigurationFactory().getConfiguration();
Property maxMessageSizeProperty = (conf.get(Property.TSERV_MAX_MESSAGE_SIZE) != null ? Property.TSERV_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
ServerAddress sp = TServerUtils.startServer(this, clientAddress.getHostText(), Property.REPLICATION_RECEIPT_SERVICE_PORT, processor,
@@ -2600,7 +2599,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
try {
- return new Pair<Text,KeyExtent>(new Text(MetadataTableUtil.getRootTabletDir()), null);
+ return new Pair<>(new Text(MetadataTableUtil.getRootTabletDir()), null);
} catch (IOException e) {
throw new AccumuloException(e);
}
@@ -2624,7 +2623,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
ScannerImpl scanner = new ScannerImpl(context, tableToVerify, Authorizations.EMPTY);
scanner.setRange(extent.toMetadataRange());
- TreeMap<Key,Value> tkv = new TreeMap<Key,Value>();
+ TreeMap<Key,Value> tkv = new TreeMap<>();
for (Entry<Key,Value> entry : scanner)
tkv.put(entry.getKey(), entry.getValue());
@@ -2662,7 +2661,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
if (!fke.equals(extent)) {
- return new Pair<Text,KeyExtent>(null, fke);
+ return new Pair<>(null, fke);
}
// reread and reverify metadata entries now that metadata entries were fixed
@@ -2670,7 +2669,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
return verifyTabletInformation(context, fke, instance, tabletsKeyValues, clientAddress, lock);
}
- return new Pair<Text,KeyExtent>(new Text(dir.get()), null);
+ return new Pair<>(new Text(dir.get()), null);
}
static Value checkTabletMetadata(KeyExtent extent, TServerInstance instance, SortedMap<Key,Value> tabletsKeyValues, Text metadataEntry)
@@ -2784,7 +2783,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
@Override
public void run() {
Set<String> contextProperties = getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
- Set<String> configuredContexts = new HashSet<String>();
+ Set<String> configuredContexts = new HashSet<>();
for (String prop : contextProperties) {
configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
}
@@ -2818,7 +2817,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
ArrayList<Tablet> tablets;
synchronized (onlineTablets) {
- tablets = new ArrayList<Tablet>(onlineTablets.values());
+ tablets = new ArrayList<>(onlineTablets.values());
}
for (Tablet tablet : tablets) {
@@ -2835,9 +2834,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
Map<KeyExtent,Tablet> onlineTabletsCopy;
synchronized (this.onlineTablets) {
- onlineTabletsCopy = new HashMap<KeyExtent,Tablet>(this.onlineTablets);
+ onlineTabletsCopy = new HashMap<>(this.onlineTablets);
}
- Map<String,TableInfo> tables = new HashMap<String,TableInfo>();
+ Map<String,TableInfo> tables = new HashMap<>();
for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.entrySet()) {
String tableId = entry.getKey().getTableId().toString();
@@ -2884,7 +2883,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
table.scans.running += entry.getValue().get(ScanRunState.RUNNING);
}
- ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<KeyExtent>();
+ ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<>();
synchronized (this.unopenedTablets) {
synchronized (this.openingTablets) {
offlineTabletsCopy.addAll(this.unopenedTablets);
@@ -2976,8 +2975,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
public void recover(VolumeManager fs, KeyExtent extent, TableConfiguration tconf, List<LogEntry> logEntries, Set<String> tabletFiles,
MutationReceiver mutationReceiver) throws IOException {
- List<Path> recoveryLogs = new ArrayList<Path>();
- List<LogEntry> sorted = new ArrayList<LogEntry>(logEntries);
+ List<Path> recoveryLogs = new ArrayList<>();
+ List<LogEntry> sorted = new ArrayList<>(logEntries);
Collections.sort(sorted, new Comparator<LogEntry>() {
@Override
public int compare(LogEntry e1, LogEntry e2) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index d2790da..1944569 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -84,7 +84,7 @@ public class TabletServerResourceManager {
private final ExecutorService assignMetaDataPool;
private final ExecutorService readAheadThreadPool;
private final ExecutorService defaultReadAheadThreadPool;
- private final Map<String,ExecutorService> threadPools = new TreeMap<String,ExecutorService>();
+ private final Map<String,ExecutorService> threadPools = new TreeMap<>();
private final ConcurrentHashMap<KeyExtent,RunnableStartedAt> activeAssignments;
@@ -207,7 +207,7 @@ public class TabletServerResourceManager {
assignMetaDataPool = createEs(0, 1, 60, "metadata tablet assignment");
- activeAssignments = new ConcurrentHashMap<KeyExtent,RunnableStartedAt>();
+ activeAssignments = new ConcurrentHashMap<>();
readAheadThreadPool = createEs(Property.TSERV_READ_AHEAD_MAXCONCURRENT, "tablet read ahead");
defaultReadAheadThreadPool = createEs(Property.TSERV_METADATA_READ_AHEAD_MAXCONCURRENT, "metadata tablets read ahead");
@@ -332,7 +332,7 @@ public class TabletServerResourceManager {
MemoryManagementFramework() {
tabletReports = Collections.synchronizedMap(new HashMap<KeyExtent,TabletStateImpl>());
- memUsageReports = new LinkedBlockingQueue<TabletStateImpl>();
+ memUsageReports = new LinkedBlockingQueue<>();
maxMem = conf.getConfiguration().getMemoryInBytes(Property.TSERV_MAXMEM);
Runnable r1 = new Runnable() {
@@ -408,7 +408,7 @@ public class TabletServerResourceManager {
Map<KeyExtent,TabletStateImpl> tabletReportsCopy = null;
try {
synchronized (tabletReports) {
- tabletReportsCopy = new HashMap<KeyExtent,TabletStateImpl>(tabletReports);
+ tabletReportsCopy = new HashMap<>(tabletReports);
}
ArrayList<TabletState> tabletStates = new ArrayList<TabletState>(tabletReportsCopy.values());
mma = memoryManager.getMemoryManagementActions(tabletStates);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
index db02526..c999c09 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
@@ -39,7 +39,7 @@ class WriteTracker {
private static final Logger log = LoggerFactory.getLogger(WriteTracker.class);
private static final AtomicLong operationCounter = new AtomicLong(1);
- private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<TabletType,TreeSet<Long>>(TabletType.class);
+ private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<>(TabletType.class);
WriteTracker() {
for (TabletType ttype : TabletType.values()) {
@@ -87,7 +87,7 @@ class WriteTracker {
if (keySet.size() == 0)
return -1;
- List<KeyExtent> extents = new ArrayList<KeyExtent>(keySet.size());
+ List<KeyExtent> extents = new ArrayList<>(keySet.size());
for (Tablet tablet : keySet)
extents.add(tablet.getExtent());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
index 8f98761..845d779 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
@@ -31,8 +31,8 @@ import com.google.common.collect.Sets;
* create the resulting output file.
*/
public class CompactionPlan {
- public final List<FileRef> inputFiles = new ArrayList<FileRef>();
- public final List<FileRef> deleteFiles = new ArrayList<FileRef>();
+ public final List<FileRef> inputFiles = new ArrayList<>();
+ public final List<FileRef> deleteFiles = new ArrayList<>();
public WriteParameters writeParameters = null;
@Override
@@ -67,8 +67,8 @@ public class CompactionPlan {
* thrown when validation fails.
*/
public final void validate(Set<FileRef> allFiles) {
- Set<FileRef> inputSet = new HashSet<FileRef>(inputFiles);
- Set<FileRef> deleteSet = new HashSet<FileRef>(deleteFiles);
+ Set<FileRef> inputSet = new HashSet<>(inputFiles);
+ Set<FileRef> deleteSet = new HashSet<>(deleteFiles);
if (!allFiles.containsAll(inputSet)) {
inputSet.removeAll(allFiles);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
index 1f0dc3a..faf9534 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
@@ -60,16 +60,16 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
private List<FileRef> findMapFilesToCompact(MajorCompactionRequest request) {
MajorCompactionReason reason = request.getReason();
if (reason == MajorCompactionReason.USER) {
- return new ArrayList<FileRef>(request.getFiles().keySet());
+ return new ArrayList<>(request.getFiles().keySet());
}
if (reason == MajorCompactionReason.CHOP) {
// should not happen, but this is safe
- return new ArrayList<FileRef>(request.getFiles().keySet());
+ return new ArrayList<>(request.getFiles().keySet());
}
if (request.getFiles().size() <= 1)
return null;
- TreeSet<CompactionFile> candidateFiles = new TreeSet<CompactionFile>(new Comparator<CompactionFile>() {
+ TreeSet<CompactionFile> candidateFiles = new TreeSet<>(new Comparator<CompactionFile>() {
@Override
public int compare(CompactionFile o1, CompactionFile o2) {
if (o1 == o2)
@@ -95,7 +95,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
totalSize += mfi.size;
}
- List<FileRef> files = new ArrayList<FileRef>();
+ List<FileRef> files = new ArrayList<>();
while (candidateFiles.size() > 1) {
CompactionFile max = candidateFiles.last();
@@ -121,7 +121,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
if (files.size() < totalFilesToCompact) {
- TreeMap<FileRef,Long> tfc = new TreeMap<FileRef,Long>();
+ TreeMap<FileRef,Long> tfc = new TreeMap<>();
for (Entry<FileRef,DataFileValue> entry : request.getFiles().entrySet()) {
tfc.put(entry.getKey(), entry.getValue().getSize());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
index 6cc9025..69e3269 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
@@ -39,7 +39,7 @@ public class SizeLimitCompactionStrategy extends DefaultCompactionStrategy {
}
private MajorCompactionRequest filterFiles(MajorCompactionRequest mcr) {
- Map<FileRef,DataFileValue> filteredFiles = new HashMap<FileRef,DataFileValue>();
+ Map<FileRef,DataFileValue> filteredFiles = new HashMap<>();
for (Entry<FileRef,DataFileValue> entry : mcr.getFiles().entrySet()) {
if (entry.getValue().getSize() <= limit) {
filteredFiles.put(entry.getKey(), entry.getValue());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
index 13e7c4f..9d065c7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
@@ -47,7 +47,7 @@ public class ConstraintChecker {
private AtomicLong lastCheck = new AtomicLong(0);
public ConstraintChecker(TableConfiguration conf) {
- constrains = new ArrayList<Constraint>();
+ constrains = new ArrayList<>();
this.conf = conf;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 a36463d..c6a2593 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
@@ -131,7 +131,7 @@ public class DfsLogger {
VolumeManager getFileSystem();
}
- private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<DfsLogger.LogWork>();
+ private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<>();
private final Object closeLock = new Object();
@@ -145,7 +145,7 @@ public class DfsLogger {
@Override
public void run() {
- ArrayList<DfsLogger.LogWork> work = new ArrayList<DfsLogger.LogWork>();
+ ArrayList<DfsLogger.LogWork> work = new ArrayList<>();
boolean sawClosedMarker = false;
while (!sawClosedMarker) {
work.clear();
@@ -336,7 +336,7 @@ public class DfsLogger {
// If it's null, we won't have any parameters whatsoever. First, let's attempt to read
// parameters
- Map<String,String> opts = new HashMap<String,String>();
+ Map<String,String> opts = new HashMap<>();
int count = input.readInt();
for (int i = 0; i < count; i++) {
String key = input.readUTF();
@@ -575,7 +575,7 @@ public class DfsLogger {
public LoggerOperation logManyTablets(List<TabletMutations> mutations) throws IOException {
Durability durability = Durability.NONE;
- List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+ List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<>();
for (TabletMutations tabletMutations : mutations) {
LogFileKey key = new LogFileKey();
key.event = MANY_MUTATIONS;
@@ -583,7 +583,7 @@ public class DfsLogger {
key.tid = tabletMutations.getTid();
LogFileValue value = new LogFileValue();
value.mutations = tabletMutations.getMutations();
- data.add(new Pair<LogFileKey,LogFileValue>(key, value));
+ data.add(new Pair<>(key, value));
if (tabletMutations.getDurability().ordinal() > durability.ordinal()) {
durability = tabletMutations.getDurability();
}
@@ -606,7 +606,7 @@ public class DfsLogger {
key.event = COMPACTION_FINISH;
key.seq = seq;
key.tid = tid;
- return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+ return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
}
public LoggerOperation minorCompactionStarted(int seq, int tid, String fqfn, Durability durability) throws IOException {
@@ -615,7 +615,7 @@ public class DfsLogger {
key.seq = seq;
key.tid = tid;
key.filename = fqfn;
- return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+ return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
}
public String getLogger() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index f152f9c..11097ce 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -132,7 +132,7 @@ public class LogSorter {
final long bufferSize = conf.getMemoryInBytes(Property.TSERV_SORT_BUFFER_SIZE);
Thread.currentThread().setName("Sorting " + name + " for recovery");
while (true) {
- final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+ final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<>();
try {
long start = input.getPos();
while (input.getPos() - start < bufferSize) {
@@ -140,7 +140,7 @@ public class LogSorter {
LogFileValue value = new LogFileValue();
key.readFields(decryptingInput);
value.readFields(decryptingInput);
- buffer.add(new Pair<LogFileKey,LogFileValue>(key, value));
+ buffer.add(new Pair<>(key, value));
}
writeBuffer(destPath, buffer, part++);
buffer.clear();
@@ -236,7 +236,7 @@ public class LogSorter {
}
public List<RecoveryStatus> getLogSorts() {
- List<RecoveryStatus> result = new ArrayList<RecoveryStatus>();
+ List<RecoveryStatus> result = new ArrayList<>();
synchronized (currentWork) {
for (Entry<String,LogProcessor> entries : currentWork.entrySet()) {
RecoveryStatus status = new RecoveryStatus();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
index 37882cd..1139b8e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
@@ -152,7 +152,7 @@ public class SortedLogRecovery {
int findLastStartToFinish(MultiReader reader, int fileno, KeyExtent extent, Set<String> tabletFiles, LastStartToFinish lastStartToFinish) throws IOException,
EmptyMapFileException, UnusedException {
- HashSet<String> suffixes = new HashSet<String>();
+ HashSet<String> suffixes = new HashSet<>();
for (String path : tabletFiles)
suffixes.add(getPathSuffix(path));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 bb8ae6f..1cde8a6 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
@@ -72,7 +72,7 @@ public class TabletServerLogger {
private final TabletServer tserver;
// The current log set: always updated to a new set with every change of loggers
- private final List<DfsLogger> loggers = new ArrayList<DfsLogger>();
+ private final List<DfsLogger> loggers = new ArrayList<>();
// The current generation of logSet.
// Because multiple threads can be using a log set at one time, a log
@@ -280,7 +280,7 @@ public class TabletServerLogger {
while (!success) {
try {
// get a reference to the loggers that no other thread can touch
- ArrayList<DfsLogger> copy = new ArrayList<DfsLogger>();
+ ArrayList<DfsLogger> copy = new ArrayList<>();
currentLogSet = initializeLoggers(copy);
// add the logger to the log set for the memory in the tablet,
@@ -301,7 +301,7 @@ public class TabletServerLogger {
// Need to release
KeyExtent extent = commitSession.getExtent();
if (ReplicationConfigurationUtil.isEnabled(extent, tserver.getTableConfiguration(extent))) {
- Set<String> logs = new HashSet<String>();
+ Set<String> logs = new HashSet<>();
for (DfsLogger logger : copy) {
logs.add(logger.getFileName());
}
@@ -321,7 +321,7 @@ public class TabletServerLogger {
seq = seqGen.incrementAndGet();
if (seq < 0)
throw new RuntimeException("Logger sequence generator wrapped! Onos!!!11!eleven");
- ArrayList<LoggerOperation> queuedOperations = new ArrayList<LoggerOperation>(copy.size());
+ ArrayList<LoggerOperation> queuedOperations = new ArrayList<>(copy.size());
for (DfsLogger wal : copy) {
queuedOperations.add(writer.write(wal, seq));
}
@@ -414,7 +414,7 @@ public class TabletServerLogger {
public int logManyTablets(Map<CommitSession,Mutations> mutations) throws IOException {
- final Map<CommitSession,Mutations> loggables = new HashMap<CommitSession,Mutations>(mutations);
+ final Map<CommitSession,Mutations> loggables = new HashMap<>(mutations);
for (Entry<CommitSession,Mutations> entry : mutations.entrySet()) {
if (entry.getValue().getDurability() == Durability.NONE) {
loggables.remove(entry.getKey());
@@ -426,7 +426,7 @@ public class TabletServerLogger {
int seq = write(loggables.keySet(), false, new Writer() {
@Override
public LoggerOperation write(DfsLogger logger, int ignored) throws Exception {
- List<TabletMutations> copy = new ArrayList<TabletMutations>(loggables.size());
+ List<TabletMutations> copy = new ArrayList<>(loggables.size());
for (Entry<CommitSession,Mutations> entry : loggables.entrySet()) {
CommitSession cs = entry.getKey();
Durability durability = entry.getValue().getDurability();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
index 87e17b3..f49eb71 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
@@ -39,7 +39,7 @@ public class LogFileValue implements Writable {
@Override
public void readFields(DataInput in) throws IOException {
int count = in.readInt();
- mutations = new ArrayList<Mutation>(count);
+ mutations = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
ServerMutation mutation = new ServerMutation();
mutation.readFields(in);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 6ceba5a..23a9fab 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -59,7 +59,7 @@ public class LogReader {
@Parameter(names = "-p", description = "search for a row that matches the given regex")
String regexp;
@Parameter(description = "<logfile> { <logfile> ... }")
- List<String> files = new ArrayList<String>();
+ List<String> files = new ArrayList<>();
}
/**
@@ -91,7 +91,7 @@ public class LogReader {
rowMatcher = pattern.matcher("");
}
- Set<Integer> tabletIds = new HashSet<Integer>();
+ Set<Integer> tabletIds = new HashSet<>();
for (String file : opts.files) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 3624e74..411ae87 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -690,7 +690,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
protected WalReplication getWalEdits(ReplicationTarget target, DataInputStream wal, Path p, Status status, long sizeLimit, Set<Integer> desiredTids)
throws IOException {
WalEdits edits = new WalEdits();
- edits.edits = new ArrayList<ByteBuffer>();
+ edits.edits = new ArrayList<>();
long size = 0l;
long entriesConsumed = 0l;
long numUpdates = 0l;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
index 08597f4..8c0aebc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
@@ -77,9 +77,9 @@ public class LookupTask extends ScanTask<MultiScanResult> {
long startTime = System.currentTimeMillis();
- List<KVEntry> results = new ArrayList<KVEntry>();
- Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
- List<KeyExtent> fullScans = new ArrayList<KeyExtent>();
+ List<KVEntry> results = new ArrayList<>();
+ Map<KeyExtent,List<Range>> failures = new HashMap<>();
+ List<KeyExtent> fullScans = new ArrayList<>();
KeyExtent partScan = null;
Key partNextKey = null;
boolean partNextKeyInclusive = false;
@@ -145,10 +145,10 @@ public class LookupTask extends ScanTask<MultiScanResult> {
session.numEntries += results.size();
// convert everything to thrift before adding result
- List<TKeyValue> retResults = new ArrayList<TKeyValue>();
+ List<TKeyValue> retResults = new ArrayList<>();
for (KVEntry entry : results)
retResults.add(new TKeyValue(entry.getKey().toThrift(), ByteBuffer.wrap(entry.getValue().get())));
- Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<Range,TRange>(Translators.RT));
+ Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<>(Translators.RT));
List<TKeyExtent> retFullScans = Translator.translate(fullScans, Translators.KET);
TKeyExtent retPartScan = null;
TKey retPartNextKey = null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
index 6d5adce..cd99ba2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
@@ -43,9 +43,9 @@ public abstract class ScanTask<T> implements RunnableFuture<T> {
ScanTask(TabletServer server) {
this.server = server;
interruptFlag = new AtomicBoolean(false);
- runState = new AtomicReference<ScanRunState>(ScanRunState.QUEUED);
+ runState = new AtomicReference<>(ScanRunState.QUEUED);
state = new AtomicInteger(INITIAL);
- resultQueue = new ArrayBlockingQueue<Object>(1);
+ resultQueue = new ArrayBlockingQueue<>(1);
}
protected void addResult(Object o) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
index 2fd590c..da21131 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.tserver.scan.ScanTask;
public class MultiScanSession extends Session {
public final KeyExtent threadPoolExtent;
- public final HashSet<Column> columnSet = new HashSet<Column>();
+ public final HashSet<Column> columnSet = new HashSet<>();
public final Map<KeyExtent,List<Range>> queries;
public final List<IterInfo> ssiList;
public final Map<String,Map<String,String>> ssio;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 97018df..78c351d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -50,10 +50,10 @@ public class SessionManager {
private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
private final SecureRandom random = new SecureRandom();
- private final Map<Long,Session> sessions = new HashMap<Long,Session>();
+ private final Map<Long,Session> sessions = new HashMap<>();
private final long maxIdle;
private final long maxUpdateIdle;
- private final List<Session> idleSessions = new ArrayList<Session>();
+ private final List<Session> idleSessions = new ArrayList<>();
private final Long expiredSessionMarker = Long.valueOf(-1);
private final AccumuloConfiguration aconf;
@@ -169,7 +169,7 @@ public class SessionManager {
}
private void sweep(final long maxIdle, final long maxUpdateIdle) {
- List<Session> sessionsToCleanup = new ArrayList<Session>();
+ List<Session> sessionsToCleanup = new ArrayList<>();
synchronized (this) {
Iterator<Session> iter = sessions.values().iterator();
while (iter.hasNext()) {
@@ -231,8 +231,8 @@ public class SessionManager {
}
public synchronized Map<String,MapCounter<ScanRunState>> getActiveScansPerTable() {
- Map<String,MapCounter<ScanRunState>> counts = new HashMap<String,MapCounter<ScanRunState>>();
- Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+ Map<String,MapCounter<ScanRunState>> counts = new HashMap<>();
+ Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
synchronized (idleSessions) {
/**
@@ -270,7 +270,7 @@ public class SessionManager {
MapCounter<ScanRunState> stateCounts = counts.get(tableID);
if (stateCounts == null) {
- stateCounts = new MapCounter<ScanRunState>();
+ stateCounts = new MapCounter<>();
counts.put(tableID, stateCounts);
}
@@ -282,9 +282,9 @@ public class SessionManager {
public synchronized List<ActiveScan> getActiveScans() {
- final List<ActiveScan> activeScans = new ArrayList<ActiveScan>();
+ final List<ActiveScan> activeScans = new ArrayList<>();
final long ct = System.currentTimeMillis();
- final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+ final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
synchronized (idleSessions) {
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
index 4a9b265..c53f560 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
@@ -33,14 +33,14 @@ import org.apache.accumulo.tserver.tablet.Tablet;
public class UpdateSession extends Session {
public final TservConstraintEnv cenv;
- public final MapCounter<Tablet> successfulCommits = new MapCounter<Tablet>();
- public final Map<KeyExtent,Long> failures = new HashMap<KeyExtent,Long>();
- public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<KeyExtent,SecurityErrorCode>();
+ public final MapCounter<Tablet> successfulCommits = new MapCounter<>();
+ public final Map<KeyExtent,Long> failures = new HashMap<>();
+ public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<>();
public final Stat prepareTimes = new Stat();
public final Stat walogTimes = new Stat();
public final Stat commitTimes = new Stat();
public final Stat authTimes = new Stat();
- public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<Tablet,List<Mutation>>();
+ public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<>();
public final Violations violations;
public Tablet currentTablet = null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
index c7ca29d..5c4f7c4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
@@ -114,14 +114,14 @@ public class CompactionInfo {
}
}
- List<IterInfo> iiList = new ArrayList<IterInfo>();
- Map<String,Map<String,String>> iterOptions = new HashMap<String,Map<String,String>>();
+ List<IterInfo> iiList = new ArrayList<>();
+ Map<String,Map<String,String>> iterOptions = new HashMap<>();
for (IteratorSetting iterSetting : compactor.getIterators()) {
iiList.add(new IterInfo(iterSetting.getPriority(), iterSetting.getIteratorClass(), iterSetting.getName()));
iterOptions.put(iterSetting.getName(), iterSetting.getOptions());
}
- List<String> filesToCompact = new ArrayList<String>();
+ List<String> filesToCompact = new ArrayList<>();
for (FileRef ref : compactor.getFilesToCompact())
filesToCompact.add(ref.toString());
return new ActiveCompaction(compactor.extent.toThrift(), System.currentTimeMillis() - compactor.getStartTime(), filesToCompact, compactor.getOutputFile(),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
index 6ca4407..64345c2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class CompactionWatcher implements Runnable {
- private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<List<Long>,ObservedCompactionInfo>();
+ private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<>();
private final AccumuloConfiguration config;
private static boolean watching = false;
@@ -55,7 +55,7 @@ public class CompactionWatcher implements Runnable {
public void run() {
List<CompactionInfo> runningCompactions = Compactor.getRunningCompactions();
- Set<List<Long>> newKeys = new HashSet<List<Long>>();
+ Set<List<Long>> newKeys = new HashSet<>();
long time = System.currentTimeMillis();
@@ -69,7 +69,7 @@ public class CompactionWatcher implements Runnable {
}
// look for compactions that finished or made progress and logged a warning
- HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<List<Long>,ObservedCompactionInfo>(observedCompactions);
+ HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<>(observedCompactions);
copy.keySet().removeAll(newKeys);
for (ObservedCompactionInfo oci : copy.values()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index 4f38655..12a3626 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -128,7 +128,7 @@ public class Compactor implements Callable<CompactionStats> {
protected static final Set<Compactor> runningCompactions = Collections.synchronizedSet(new HashSet<Compactor>());
public static List<CompactionInfo> getRunningCompactions() {
- ArrayList<CompactionInfo> compactions = new ArrayList<CompactionInfo>();
+ ArrayList<CompactionInfo> compactions = new ArrayList<>();
synchronized (runningCompactions) {
for (Compactor compactor : runningCompactions) {
@@ -203,7 +203,7 @@ public class Compactor implements Callable<CompactionStats> {
long t1 = System.currentTimeMillis();
- HashSet<ByteSequence> allColumnFamilies = new HashSet<ByteSequence>();
+ HashSet<ByteSequence> allColumnFamilies = new HashSet<>();
if (mfw.supportsLocalityGroups()) {
for (Entry<String,Set<ByteSequence>> entry : lGroups.entrySet()) {
@@ -270,7 +270,7 @@ public class Compactor implements Callable<CompactionStats> {
private List<SortedKeyValueIterator<Key,Value>> openMapDataFiles(String lgName, ArrayList<FileSKVIterator> readers) throws IOException {
- List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(filesToCompact.size());
+ List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(filesToCompact.size());
for (FileRef mapFile : filesToCompact.keySet()) {
try {
@@ -318,7 +318,7 @@ public class Compactor implements Callable<CompactionStats> {
private void compactLocalityGroup(String lgName, Set<ByteSequence> columnFamilies, boolean inclusive, FileSKVWriter mfw, CompactionStats majCStats)
throws IOException, CompactionCanceledException {
- ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(filesToCompact.size());
+ ArrayList<FileSKVIterator> readers = new ArrayList<>(filesToCompact.size());
Span span = Trace.start("compact");
try {
long entriesCompacted = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
index 8716695..be22778 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
@@ -47,7 +47,7 @@ public class CountingIterator extends WrappingIterator {
}
public CountingIterator(SortedKeyValueIterator<Key,Value> source, AtomicLong entriesRead) {
- deepCopies = new ArrayList<CountingIterator>();
+ deepCopies = new ArrayList<>();
this.setSource(source);
count = 0;
this.entriesRead = entriesRead;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index db1b418..6b50df1 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -70,13 +70,13 @@ class DatafileManager {
}
private FileRef mergingMinorCompactionFile = null;
- private final Set<FileRef> filesToDeleteAfterScan = new HashSet<FileRef>();
- private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<Long,Set<FileRef>>();
- private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<FileRef>();
+ private final Set<FileRef> filesToDeleteAfterScan = new HashSet<>();
+ private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<>();
+ private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<>();
private long nextScanReservationId = 0;
private boolean reservationsBlocked = false;
- private final Set<FileRef> majorCompactingFiles = new HashSet<FileRef>();
+ private final Set<FileRef> majorCompactingFiles = new HashSet<>();
static void rename(VolumeManager fs, Path src, Path dst) throws IOException {
if (!fs.rename(src, dst)) {
@@ -95,26 +95,26 @@ class DatafileManager {
}
}
- Set<FileRef> absFilePaths = new HashSet<FileRef>(datafileSizes.keySet());
+ Set<FileRef> absFilePaths = new HashSet<>(datafileSizes.keySet());
long rid = nextScanReservationId++;
scanFileReservations.put(rid, absFilePaths);
- Map<FileRef,DataFileValue> ret = new HashMap<FileRef,DataFileValue>();
+ Map<FileRef,DataFileValue> ret = new HashMap<>();
for (FileRef path : absFilePaths) {
fileScanReferenceCounts.increment(path, 1);
ret.put(path, datafileSizes.get(path));
}
- return new Pair<Long,Map<FileRef,DataFileValue>>(rid, ret);
+ return new Pair<>(rid, ret);
}
}
void returnFilesForScan(Long reservationId) {
- final Set<FileRef> filesToDelete = new HashSet<FileRef>();
+ final Set<FileRef> filesToDelete = new HashSet<>();
synchronized (tablet) {
Set<FileRef> absFilePaths = scanFileReservations.remove(reservationId);
@@ -147,7 +147,7 @@ class DatafileManager {
if (scanFiles.size() == 0)
return;
- Set<FileRef> filesToDelete = new HashSet<FileRef>();
+ Set<FileRef> filesToDelete = new HashSet<>();
synchronized (tablet) {
for (FileRef path : scanFiles) {
@@ -166,7 +166,7 @@ class DatafileManager {
private TreeSet<FileRef> waitForScansToFinish(Set<FileRef> pathsToWaitFor, boolean blockNewScans, long maxWaitTime) {
long startTime = System.currentTimeMillis();
- TreeSet<FileRef> inUse = new TreeSet<FileRef>();
+ TreeSet<FileRef> inUse = new TreeSet<>();
Span waitForScans = Trace.start("waitForScans");
try {
@@ -210,7 +210,7 @@ class DatafileManager {
final KeyExtent extent = tablet.getExtent();
String bulkDir = null;
- Map<FileRef,DataFileValue> paths = new HashMap<FileRef,DataFileValue>();
+ Map<FileRef,DataFileValue> paths = new HashMap<>();
for (Entry<FileRef,DataFileValue> entry : pathsString.entrySet())
paths.put(entry.getKey(), entry.getValue());
@@ -586,14 +586,14 @@ class DatafileManager {
public SortedMap<FileRef,DataFileValue> getDatafileSizes() {
synchronized (tablet) {
- TreeMap<FileRef,DataFileValue> copy = new TreeMap<FileRef,DataFileValue>(datafileSizes);
+ TreeMap<FileRef,DataFileValue> copy = new TreeMap<>(datafileSizes);
return Collections.unmodifiableSortedMap(copy);
}
}
public Set<FileRef> getFiles() {
synchronized (tablet) {
- HashSet<FileRef> files = new HashSet<FileRef>(datafileSizes.keySet());
+ HashSet<FileRef> files = new HashSet<>(datafileSizes.keySet());
return Collections.unmodifiableSet(files);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
index 9ba8e38..56dbec9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
@@ -80,7 +80,7 @@ public class RootFiles {
/*
* called in constructor and before major compactions
*/
- Collection<String> goodFiles = new ArrayList<String>(files.length);
+ Collection<String> goodFiles = new ArrayList<>(files.length);
for (FileStatus file : files) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
index f586e2e..5632960 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
@@ -164,7 +164,7 @@ class ScanDataSource implements DataSource {
Collection<InterruptibleIterator> mapfiles = fileManager.openFiles(files, options.isIsolated());
- List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(mapfiles.size() + memIters.size());
+ List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(mapfiles.size() + memIters.size());
iters.addAll(mapfiles);
iters.addAll(memIters);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 3231ce9..7338ae4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -182,7 +182,7 @@ public class Tablet implements TabletCommitter {
return dataSourceDeletions.get();
}
- private final Set<ScanDataSource> activeScans = new HashSet<ScanDataSource>();
+ private final Set<ScanDataSource> activeScans = new HashSet<>();
private static enum CloseState {
OPEN, CLOSING, CLOSED, COMPLETE
@@ -212,7 +212,7 @@ public class Tablet implements TabletCommitter {
private final Set<MajorCompactionReason> majorCompactionQueued = Collections.synchronizedSet(EnumSet.noneOf(MajorCompactionReason.class));
- private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<ConstraintChecker>();
+ private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<>();
private int writesInProgress = 0;
@@ -251,7 +251,7 @@ public class Tablet implements TabletCommitter {
}
public static class LookupResult {
- public List<Range> unfinishedRanges = new ArrayList<Range>();
+ public List<Range> unfinishedRanges = new ArrayList<>();
public long bytesAdded = 0;
public long dataSize = 0;
public boolean closed = false;
@@ -321,7 +321,7 @@ public class Tablet implements TabletCommitter {
if (extent.isRootTablet()) {
return null;
} else {
- entries = new TreeMap<Key,Value>();
+ entries = new TreeMap<>();
Text rowName = extent.getMetadataEntry();
for (Entry<Key,Value> entry : tabletsKeyValues.entrySet()) {
if (entry.getKey().compareRow(rowName) == 0 && TabletsSection.ServerColumnFamily.TIME_COLUMN.hasColumns(entry.getKey())) {
@@ -338,7 +338,7 @@ public class Tablet implements TabletCommitter {
private static SortedMap<FileRef,DataFileValue> lookupDatafiles(AccumuloServerContext context, VolumeManager fs, KeyExtent extent,
SortedMap<Key,Value> tabletsKeyValues) throws IOException {
- TreeMap<FileRef,DataFileValue> datafiles = new TreeMap<FileRef,DataFileValue>();
+ TreeMap<FileRef,DataFileValue> datafiles = new TreeMap<>();
if (extent.isRootTablet()) { // the meta0 tablet
Path location = new Path(MetadataTableUtil.getRootTabletDir());
@@ -375,7 +375,7 @@ public class Tablet implements TabletCommitter {
}
private static List<LogEntry> lookupLogEntries(AccumuloServerContext context, KeyExtent ke, SortedMap<Key,Value> tabletsKeyValues) {
- List<LogEntry> logEntries = new ArrayList<LogEntry>();
+ List<LogEntry> logEntries = new ArrayList<>();
if (ke.isMeta()) {
try {
@@ -401,7 +401,7 @@ public class Tablet implements TabletCommitter {
}
private static Set<FileRef> lookupScanFiles(KeyExtent extent, SortedMap<Key,Value> tabletsKeyValues, VolumeManager fs) throws IOException {
- HashSet<FileRef> scanFiles = new HashSet<FileRef>();
+ HashSet<FileRef> scanFiles = new HashSet<>();
Text row = extent.getMetadataEntry();
for (Entry<Key,Value> entry : tabletsKeyValues.entrySet()) {
@@ -584,7 +584,7 @@ public class Tablet implements TabletCommitter {
final CommitSession commitSession = getTabletMemory().getCommitSession();
count[1] = Long.MIN_VALUE;
try {
- Set<String> absPaths = new HashSet<String>();
+ Set<String> absPaths = new HashSet<>();
for (FileRef ref : datafiles.keySet())
absPaths.add(ref.path().toString());
@@ -642,7 +642,7 @@ public class Tablet implements TabletCommitter {
}
}
// make some closed references that represent the recovered logs
- currentLogs = new HashSet<DfsLogger>();
+ currentLogs = new HashSet<>();
for (LogEntry logEntry : logEntries) {
for (String log : logEntry.logSet) {
currentLogs.add(new DfsLogger(tabletServer.getServerConfig(), log, logEntry.getColumnQualifier().toString()));
@@ -867,7 +867,7 @@ public class Tablet implements TabletCommitter {
// log.info("In nextBatch..");
- List<KVEntry> results = new ArrayList<KVEntry>();
+ List<KVEntry> results = new ArrayList<>();
Key key = null;
Value value;
@@ -1009,7 +1009,7 @@ public class Tablet implements TabletCommitter {
private synchronized MinorCompactionTask prepareForMinC(long flushId, MinorCompactionReason mincReason) {
CommitSession oldCommitSession = getTabletMemory().prepareForMinC();
otherLogs = currentLogs;
- currentLogs = new HashSet<DfsLogger>();
+ currentLogs = new HashSet<>();
FileRef mergeFile = null;
if (mincReason != MinorCompactionReason.RECOVERY) {
@@ -1206,7 +1206,7 @@ public class Tablet implements TabletCommitter {
}
}
- return new Pair<Long,UserCompactionConfig>(compactID, compactionConfig);
+ return new Pair<>(compactID, compactionConfig);
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (NumberFormatException nfe) {
@@ -1259,7 +1259,7 @@ public class Tablet implements TabletCommitter {
if (more != null) {
violations.add(more);
if (violators == null)
- violators = new ArrayList<Mutation>();
+ violators = new ArrayList<>();
violators.add(mutation);
}
}
@@ -1268,8 +1268,8 @@ public class Tablet implements TabletCommitter {
if (!violations.isEmpty()) {
- HashSet<Mutation> violatorsSet = new HashSet<Mutation>(violators);
- ArrayList<Mutation> nonViolators = new ArrayList<Mutation>();
+ HashSet<Mutation> violatorsSet = new HashSet<>(violators);
+ ArrayList<Mutation> nonViolators = new ArrayList<>();
for (Mutation mutation : mutations) {
if (!violatorsSet.contains(mutation)) {
@@ -1735,7 +1735,7 @@ public class Tablet implements TabletCommitter {
}
private Map<FileRef,Pair<Key,Key>> getFirstAndLastKeys(SortedMap<FileRef,DataFileValue> allFiles) throws IOException {
- Map<FileRef,Pair<Key,Key>> result = new HashMap<FileRef,Pair<Key,Key>>();
+ Map<FileRef,Pair<Key,Key>> result = new HashMap<>();
FileOperations fileFactory = FileOperations.getInstance();
VolumeManager fs = getTabletServer().getFileSystem();
for (Entry<FileRef,DataFileValue> entry : allFiles.entrySet()) {
@@ -1745,7 +1745,7 @@ public class Tablet implements TabletCommitter {
try {
Key first = openReader.getFirstKey();
Key last = openReader.getLastKey();
- result.put(file, new Pair<Key,Key>(first, last));
+ result.put(file, new Pair<>(first, last));
} finally {
openReader.close();
}
@@ -1754,7 +1754,7 @@ public class Tablet implements TabletCommitter {
}
List<FileRef> findChopFiles(KeyExtent extent, Map<FileRef,Pair<Key,Key>> firstAndLastKeys, Collection<FileRef> allFiles) throws IOException {
- List<FileRef> result = new ArrayList<FileRef>();
+ List<FileRef> result = new ArrayList<>();
if (firstAndLastKeys == null) {
result.addAll(allFiles);
return result;
@@ -1862,7 +1862,7 @@ public class Tablet implements TabletCommitter {
RootFiles.cleanupReplacement(fs, fs.listStatus(this.location), false);
}
SortedMap<FileRef,DataFileValue> allFiles = getDatafileManager().getDatafileSizes();
- List<FileRef> inputFiles = new ArrayList<FileRef>();
+ List<FileRef> inputFiles = new ArrayList<>();
if (reason == MajorCompactionReason.CHOP) {
// enforce rules: files with keys outside our range need to be compacted
inputFiles.addAll(findChopFiles(extent, firstAndLastKeys, allFiles.keySet()));
@@ -1929,7 +1929,7 @@ public class Tablet implements TabletCommitter {
}
}
- List<IteratorSetting> compactionIterators = new ArrayList<IteratorSetting>();
+ List<IteratorSetting> compactionIterators = new ArrayList<>();
if (compactionId != null) {
if (reason == MajorCompactionReason.USER) {
if (getCompactionCancelID() >= compactionId.getFirst()) {
@@ -1979,7 +1979,7 @@ public class Tablet implements TabletCommitter {
}
};
- HashMap<FileRef,DataFileValue> copy = new HashMap<FileRef,DataFileValue>(getDatafileManager().getDatafileSizes());
+ HashMap<FileRef,DataFileValue> copy = new HashMap<>(getDatafileManager().getDatafileSizes());
if (!copy.keySet().containsAll(smallestFiles))
throw new IllegalStateException("Cannot find data file values for " + smallestFiles);
@@ -2047,12 +2047,12 @@ public class Tablet implements TabletCommitter {
// short-circuit; also handles zero files case
if (filesToCompact.size() <= maxFilesToCompact) {
- Set<FileRef> smallestFiles = new HashSet<FileRef>(filesToCompact.keySet());
+ Set<FileRef> smallestFiles = new HashSet<>(filesToCompact.keySet());
filesToCompact.clear();
return smallestFiles;
}
- PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<Pair<FileRef,Long>>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
+ PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
@Override
public int compare(Pair<FileRef,Long> o1, Pair<FileRef,Long> o2) {
if (o1.getSecond() == o2.getSecond())
@@ -2065,10 +2065,10 @@ public class Tablet implements TabletCommitter {
for (Iterator<Entry<FileRef,DataFileValue>> iterator = filesToCompact.entrySet().iterator(); iterator.hasNext();) {
Entry<FileRef,DataFileValue> entry = iterator.next();
- fileHeap.add(new Pair<FileRef,Long>(entry.getKey(), entry.getValue().getSize()));
+ fileHeap.add(new Pair<>(entry.getKey(), entry.getValue().getSize()));
}
- Set<FileRef> smallestFiles = new HashSet<FileRef>();
+ Set<FileRef> smallestFiles = new HashSet<>();
while (smallestFiles.size() < maxFilesToCompact && fileHeap.size() > 0) {
Pair<FileRef,Long> pair = fileHeap.remove();
filesToCompact.remove(pair.getFirst());
@@ -2237,7 +2237,7 @@ public class Tablet implements TabletCommitter {
synchronized (this) {
// java needs tuples ...
- TreeMap<KeyExtent,SplitInfo> newTablets = new TreeMap<KeyExtent,SplitInfo>();
+ TreeMap<KeyExtent,SplitInfo> newTablets = new TreeMap<>();
long t1 = System.currentTimeMillis();
// choose a split point
@@ -2268,9 +2268,9 @@ public class Tablet implements TabletCommitter {
String lowDirectory = createTabletDirectory(getTabletServer().getFileSystem(), extent.getTableId().toString(), midRow);
// write new tablet information to MetadataTable
- SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
- SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
- List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+ SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
+ SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+ List<FileRef> highDatafilesToRemove = new ArrayList<>();
MetadataTableUtil.splitDatafiles(extent.getTableId(), midRow, splitRatio, firstAndLastRows, getDatafileManager().getDatafileSizes(), lowDatafileSizes,
highDatafileSizes, highDatafilesToRemove);
@@ -2346,7 +2346,7 @@ public class Tablet implements TabletCommitter {
}
public void importMapFiles(long tid, Map<FileRef,MapFileInfo> fileMap, boolean setTime) throws IOException {
- Map<FileRef,DataFileValue> entries = new HashMap<FileRef,DataFileValue>(fileMap.size());
+ Map<FileRef,DataFileValue> entries = new HashMap<>(fileMap.size());
for (Entry<FileRef,MapFileInfo> entry : fileMap.entrySet()) {
entries.put(entry.getKey(), new DataFileValue(entry.getValue().estimatedSize, 0l));
@@ -2393,10 +2393,10 @@ public class Tablet implements TabletCommitter {
}
}
- private Set<DfsLogger> currentLogs = new HashSet<DfsLogger>();
+ private Set<DfsLogger> currentLogs = new HashSet<>();
public synchronized Set<String> getCurrentLogFiles() {
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
for (DfsLogger log : currentLogs) {
result.add(log.getFileName());
}
@@ -2404,10 +2404,10 @@ public class Tablet implements TabletCommitter {
}
Set<String> beginClearingUnusedLogs() {
- Set<String> doomed = new HashSet<String>();
+ Set<String> doomed = new HashSet<>();
- ArrayList<String> otherLogsCopy = new ArrayList<String>();
- ArrayList<String> currentLogsCopy = new ArrayList<String>();
+ ArrayList<String> otherLogsCopy = new ArrayList<>();
+ ArrayList<String> currentLogsCopy = new ArrayList<>();
// do not hold tablet lock while acquiring the log lock
logLock.lock();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index 0b39d40..86f9543 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -157,7 +157,7 @@ class TabletMemory implements Closeable {
}
public List<MemoryIterator> getIterators() {
- List<MemoryIterator> toReturn = new ArrayList<MemoryIterator>(2);
+ List<MemoryIterator> toReturn = new ArrayList<>(2);
toReturn.add(memTable.skvIterator());
if (otherMemTable != null)
toReturn.add(otherMemTable.skvIterator());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index b809a35..4af2101 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -38,7 +38,7 @@ public class AssignmentWatcherTest {
@Before
public void setup() {
- assignments = new HashMap<KeyExtent,RunnableStartedAt>();
+ assignments = new HashMap<>();
timer = EasyMock.createMock(SimpleTimer.class);
conf = EasyMock.createMock(AccumuloConfiguration.class);
watcher = new AssignmentWatcher(conf, assignments, timer);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
index 8c00ece..b1d79ce 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
@@ -58,7 +58,7 @@ public class CheckTabletMetadataTest {
}
private static void assertFail(TreeMap<Key,Value> tabletMeta, KeyExtent ke, TServerInstance tsi, Key keyToDelete) {
- TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+ TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
Assert.assertNotNull(copy.remove(keyToDelete));
try {
Assert.assertNull(TabletServer.checkTabletMetadata(ke, tsi, copy, ke.getMetadataEntry()));
@@ -72,7 +72,7 @@ public class CheckTabletMetadataTest {
KeyExtent ke = new KeyExtent(new Text("1"), null, null);
- TreeMap<Key,Value> tabletMeta = new TreeMap<Key,Value>();
+ TreeMap<Key,Value> tabletMeta = new TreeMap<>();
put(tabletMeta, "1<", TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(null).get());
put(tabletMeta, "1<", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1".getBytes());
@@ -101,18 +101,18 @@ public class CheckTabletMetadataTest {
assertFail(tabletMeta, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
- TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+ TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "4", "127.0.0.1:9997");
assertFail(copy, ke, tsi);
assertFail(copy, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
- copy = new TreeMap<Key,Value>(tabletMeta);
+ copy = new TreeMap<>(tabletMeta);
put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
assertFail(copy, ke, tsi);
put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "6", "127.0.0.1:9999");
assertFail(copy, ke, tsi);
- copy = new TreeMap<Key,Value>(tabletMeta);
+ copy = new TreeMap<>(tabletMeta);
put(copy, "1<", TabletsSection.FutureLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
assertFail(copy, ke, tsi);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
index 8a1dca5..423d522 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class CountingIteratorTest {
@Test
public void testDeepCopyCount() throws IOException {
- TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+ TreeMap<Key,Value> tm = new TreeMap<>();
tm.put(new Key("r1", "cf1", "cq1"), new Value("data1".getBytes()));
tm.put(new Key("r2", "cf1", "cq1"), new Value("data2".getBytes()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index da7157a..37cbfa0 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -101,7 +101,7 @@ public class InMemoryMapTest {
}
static Set<ByteSequence> newCFSet(String... cfs) {
- HashSet<ByteSequence> cfSet = new HashSet<ByteSequence>();
+ HashSet<ByteSequence> cfSet = new HashSet<>();
for (String cf : cfs) {
cfSet.add(new ArrayByteSequence(cf));
}
@@ -353,7 +353,7 @@ public class InMemoryMapTest {
imm.delete(0);
- ArrayList<ByteSequence> columns = new ArrayList<ByteSequence>();
+ ArrayList<ByteSequence> columns = new ArrayList<>();
columns.add(new ArrayByteSequence("bar"));
// this seek resulted in an infinite loop before a bug was fixed
@@ -411,7 +411,7 @@ public class InMemoryMapTest {
@Test
@Ignore
public void parallelWriteSpeed() throws InterruptedException, IOException {
- List<Double> timings = new ArrayList<Double>();
+ List<Double> timings = new ArrayList<>();
for (int threads : new int[] {1, 2, 16, /* 64, 256 */}) {
final long now = System.currentTimeMillis();
final long counts[] = new long[threads];
@@ -452,7 +452,7 @@ public class InMemoryMapTest {
@Test
public void testLocalityGroups() throws Exception {
- Map<String,Set<ByteSequence>> lggroups1 = new HashMap<String,Set<ByteSequence>>();
+ Map<String,Set<ByteSequence>> lggroups1 = new HashMap<>();
lggroups1.put("lg1", newCFSet("cf1", "cf2"));
lggroups1.put("lg2", newCFSet("cf3", "cf4"));