Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 16418200BC4 for ; Fri, 4 Nov 2016 23:16:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 137F9160B1D; Fri, 4 Nov 2016 22:16:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B64CA160B0F for ; Fri, 4 Nov 2016 23:16:39 +0100 (CET) Received: (qmail 42797 invoked by uid 500); 4 Nov 2016 22:16:38 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 42575 invoked by uid 99); 4 Nov 2016 22:16:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Nov 2016 22:16:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E081ED315; Fri, 4 Nov 2016 22:16:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 04 Nov 2016 22:16:42 -0000 Message-Id: In-Reply-To: <39657b0ecf194c67a494323ef262bac1@git.apache.org> References: <39657b0ecf194c67a494323ef262bac1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code archived-at: Fri, 04 Nov 2016 22:16:42 -0000 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 rowLocks = new HashMap(); + private Map rowLocks = new HashMap<>(); static class RowLock { ReentrantLock rlock; @@ -82,7 +82,7 @@ class RowLocks { } List acquireRowlocks(Map> updates, Map> deferred) { - ArrayList locks = new ArrayList(); + ArrayList 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(); + rowsNotLocked = new HashSet<>(); rowsNotLocked.add(rowLock.rowSeq); } } @@ -126,8 +126,8 @@ class RowLocks { } }); - ArrayList filteredLocks = new ArrayList(); - ArrayList locksToReturn = new ArrayList(); + ArrayList filteredLocks = new ArrayList<>(); + ArrayList 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> topLevelIterators = new ArrayList>(); + private final ArrayList> topLevelIterators = new ArrayList<>(); private Map files; private final Authorizations authorizations; // these will only be supplied during scan scope @@ -118,7 +118,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment { public SortedKeyValueIterator getTopLevelIterator(SortedKeyValueIterator iter) { if (topLevelIterators.isEmpty()) return iter; - ArrayList> allIters = new ArrayList>(topLevelIterators); + ArrayList> 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 masterMessages = new LinkedBlockingDeque(); + private final BlockingDeque 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 failures = new ArrayList(); + List failures = new ArrayList<>(); for (Entry> entry : files.entrySet()) { TKeyExtent tke = entry.getKey(); Map fileMap = entry.getValue(); - Map fileRefMap = new HashMap(); + Map fileRefMap = new HashMap<>(); for (Entry 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 columnSet = new HashSet(); + Set 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> tbatch, List tcolumns, List ssiList, Map> ssio, List authorizations, boolean waitForWrites) throws ThriftSecurityException { // find all of the tables that need to be scanned - final HashSet tables = new HashSet(); + final HashSet 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> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator( - new TRangeTranslator())); + Map> 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 sendables = new HashMap(); + Map 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 okMutations = new ArrayList(entry.getValue().size()); + final List okMutations = new ArrayList<>(entry.getValue().size()); final List 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> updates, ArrayList results, ConditionalSession sess) { Set>> es = updates.entrySet(); - Map sendables = new HashMap(); + Map 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> deferred = new HashMap>(); + Map> 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> updates = Translator.translate(mutations, Translators.TKET, - new Translator.ListTranslator(ServerConditionalMutation.TCMT)); + Map> 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 results = new ArrayList(); + ArrayList results = new ArrayList<>(); Map> deferred = conditionalUpdate(cs, updates, results, symbols); @@ -1357,9 +1356,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable { public List getTabletStats(TInfo tinfo, TCredentials credentials, String tableId) throws ThriftSecurityException, TException { TreeMap onlineTabletsCopy; synchronized (onlineTablets) { - onlineTabletsCopy = new TreeMap(onlineTablets); + onlineTabletsCopy = new TreeMap<>(onlineTablets); } - List result = new ArrayList(); + List result = new ArrayList<>(); Text text = new Text(tableId); KeyExtent start = new KeyExtent(text, new Text(), null); for (Entry entry : onlineTabletsCopy.tailMap(start).entrySet()) { @@ -1451,7 +1450,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { Set openingOverlapping = KeyExtent.findOverlapping(extent, openingTablets); Set onlineOverlapping = KeyExtent.findOverlapping(extent, onlineTablets); - Set all = new HashSet(); + Set 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 tabletsToFlush = new ArrayList(); + ArrayList 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 tabletsToCompact = new ArrayList(); + ArrayList 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 filenames) throws TException { String myname = getClientAddressString(); myname = myname.replace(':', '+'); - Set loggers = new HashSet(); + Set loggers = new HashSet<>(); logger.getLogFiles(loggers); - Set loggerUUIDs = new HashSet(); + Set 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 onlineTabletsCopy = new ArrayList(); + List onlineTabletsCopy = new ArrayList<>(); synchronized (onlineTablets) { onlineTabletsCopy.addAll(onlineTablets.values()); } @@ -1752,7 +1751,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } List compactions = Compactor.getRunningCompactions(); - List ret = new ArrayList(compactions.size()); + List 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 getActiveLogs(TInfo tinfo, TCredentials credentials) throws TException { - Set logs = new HashSet(); + Set logs = new HashSet<>(); logger.getLogFiles(logs); - return new ArrayList(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 copyOnlineTablets = new TreeMap(); + TreeMap 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 tabletsKeyValues = new TreeMap(); + SortedMap tabletsKeyValues = new TreeMap<>(); try { Pair 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(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 logSet = new ArrayList(); + List 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 processor; if (ThriftServerType.SASL == getThriftServerType()) { Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration()); - processor = new Processor(tcredProxy); + processor = new Processor<>(tcredProxy); } else { - processor = new Processor(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(handler)); ReplicationServicer.Iface repl = TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(), getConfiguration()); - ReplicationServicer.Processor processor = new ReplicationServicer.Processor(repl); + ReplicationServicer.Processor 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(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 tkv = new TreeMap(); + TreeMap tkv = new TreeMap<>(); for (Entry 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(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(new Text(dir.get()), null); + return new Pair<>(new Text(dir.get()), null); } static Value checkTabletMetadata(KeyExtent extent, TServerInstance instance, SortedMap tabletsKeyValues, Text metadataEntry) @@ -2784,7 +2783,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { @Override public void run() { Set contextProperties = getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet(); - Set configuredContexts = new HashSet(); + Set 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 tablets; synchronized (onlineTablets) { - tablets = new ArrayList(onlineTablets.values()); + tablets = new ArrayList<>(onlineTablets.values()); } for (Tablet tablet : tablets) { @@ -2835,9 +2834,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable { Map onlineTabletsCopy; synchronized (this.onlineTablets) { - onlineTabletsCopy = new HashMap(this.onlineTablets); + onlineTabletsCopy = new HashMap<>(this.onlineTablets); } - Map tables = new HashMap(); + Map tables = new HashMap<>(); for (Entry 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 offlineTabletsCopy = new ArrayList(); + ArrayList 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 logEntries, Set tabletFiles, MutationReceiver mutationReceiver) throws IOException { - List recoveryLogs = new ArrayList(); - List sorted = new ArrayList(logEntries); + List recoveryLogs = new ArrayList<>(); + List sorted = new ArrayList<>(logEntries); Collections.sort(sorted, new Comparator() { @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 threadPools = new TreeMap(); + private final Map threadPools = new TreeMap<>(); private final ConcurrentHashMap activeAssignments; @@ -207,7 +207,7 @@ public class TabletServerResourceManager { assignMetaDataPool = createEs(0, 1, 60, "metadata tablet assignment"); - activeAssignments = new ConcurrentHashMap(); + 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()); - memUsageReports = new LinkedBlockingQueue(); + memUsageReports = new LinkedBlockingQueue<>(); maxMem = conf.getConfiguration().getMemoryInBytes(Property.TSERV_MAXMEM); Runnable r1 = new Runnable() { @@ -408,7 +408,7 @@ public class TabletServerResourceManager { Map tabletReportsCopy = null; try { synchronized (tabletReports) { - tabletReportsCopy = new HashMap(tabletReports); + tabletReportsCopy = new HashMap<>(tabletReports); } ArrayList tabletStates = new ArrayList(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> inProgressWrites = new EnumMap>(TabletType.class); + private final Map> inProgressWrites = new EnumMap<>(TabletType.class); WriteTracker() { for (TabletType ttype : TabletType.values()) { @@ -87,7 +87,7 @@ class WriteTracker { if (keySet.size() == 0) return -1; - List extents = new ArrayList(keySet.size()); + List 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 inputFiles = new ArrayList(); - public final List deleteFiles = new ArrayList(); + public final List inputFiles = new ArrayList<>(); + public final List deleteFiles = new ArrayList<>(); public WriteParameters writeParameters = null; @Override @@ -67,8 +67,8 @@ public class CompactionPlan { * thrown when validation fails. */ public final void validate(Set allFiles) { - Set inputSet = new HashSet(inputFiles); - Set deleteSet = new HashSet(deleteFiles); + Set inputSet = new HashSet<>(inputFiles); + Set 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 findMapFilesToCompact(MajorCompactionRequest request) { MajorCompactionReason reason = request.getReason(); if (reason == MajorCompactionReason.USER) { - return new ArrayList(request.getFiles().keySet()); + return new ArrayList<>(request.getFiles().keySet()); } if (reason == MajorCompactionReason.CHOP) { // should not happen, but this is safe - return new ArrayList(request.getFiles().keySet()); + return new ArrayList<>(request.getFiles().keySet()); } if (request.getFiles().size() <= 1) return null; - TreeSet candidateFiles = new TreeSet(new Comparator() { + TreeSet candidateFiles = new TreeSet<>(new Comparator() { @Override public int compare(CompactionFile o1, CompactionFile o2) { if (o1 == o2) @@ -95,7 +95,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy { totalSize += mfi.size; } - List files = new ArrayList(); + List 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 tfc = new TreeMap(); + TreeMap tfc = new TreeMap<>(); for (Entry 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 filteredFiles = new HashMap(); + Map filteredFiles = new HashMap<>(); for (Entry 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(); + 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 workQueue = new LinkedBlockingQueue(); + private final LinkedBlockingQueue workQueue = new LinkedBlockingQueue<>(); private final Object closeLock = new Object(); @@ -145,7 +145,7 @@ public class DfsLogger { @Override public void run() { - ArrayList work = new ArrayList(); + ArrayList 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 opts = new HashMap(); + Map 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 mutations) throws IOException { Durability durability = Durability.NONE; - List> data = new ArrayList>(); + List> 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(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(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(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> buffer = new ArrayList>(); + final ArrayList> 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(key, value)); + buffer.add(new Pair<>(key, value)); } writeBuffer(destPath, buffer, part++); buffer.clear(); @@ -236,7 +236,7 @@ public class LogSorter { } public List getLogSorts() { - List result = new ArrayList(); + List result = new ArrayList<>(); synchronized (currentWork) { for (Entry 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 tabletFiles, LastStartToFinish lastStartToFinish) throws IOException, EmptyMapFileException, UnusedException { - HashSet suffixes = new HashSet(); + HashSet 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 loggers = new ArrayList(); + private final List 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 copy = new ArrayList(); + ArrayList 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 logs = new HashSet(); + Set 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 queuedOperations = new ArrayList(copy.size()); + ArrayList 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 mutations) throws IOException { - final Map loggables = new HashMap(mutations); + final Map loggables = new HashMap<>(mutations); for (Entry 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 copy = new ArrayList(loggables.size()); + List copy = new ArrayList<>(loggables.size()); for (Entry 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(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 = " { ... }") - List files = new ArrayList(); + List files = new ArrayList<>(); } /** @@ -91,7 +91,7 @@ public class LogReader { rowMatcher = pattern.matcher(""); } - Set tabletIds = new HashSet(); + Set 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 desiredTids) throws IOException { WalEdits edits = new WalEdits(); - edits.edits = new ArrayList(); + 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 { long startTime = System.currentTimeMillis(); - List results = new ArrayList(); - Map> failures = new HashMap>(); - List fullScans = new ArrayList(); + List results = new ArrayList<>(); + Map> failures = new HashMap<>(); + List fullScans = new ArrayList<>(); KeyExtent partScan = null; Key partNextKey = null; boolean partNextKeyInclusive = false; @@ -145,10 +145,10 @@ public class LookupTask extends ScanTask { session.numEntries += results.size(); // convert everything to thrift before adding result - List retResults = new ArrayList(); + List retResults = new ArrayList<>(); for (KVEntry entry : results) retResults.add(new TKeyValue(entry.getKey().toThrift(), ByteBuffer.wrap(entry.getValue().get()))); - Map> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator(Translators.RT)); + Map> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<>(Translators.RT)); List 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 implements RunnableFuture { ScanTask(TabletServer server) { this.server = server; interruptFlag = new AtomicBoolean(false); - runState = new AtomicReference(ScanRunState.QUEUED); + runState = new AtomicReference<>(ScanRunState.QUEUED); state = new AtomicInteger(INITIAL); - resultQueue = new ArrayBlockingQueue