This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push: new be201f4 Use newer map methods in TabletGroupWatcher (#1744) be201f4 is described below commit be201f404f1230a2f31c070f7dadcf47218f318d Author: Mike Miller <mmil...@apache.org> AuthorDate: Wed Oct 21 14:10:23 2020 -0400 Use newer map methods in TabletGroupWatcher (#1744) --- .../java/org/apache/accumulo/master/TabletGroupWatcher.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java index 9ddd3db..7558127 100644 --- a/server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java +++ b/server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java @@ -214,14 +214,10 @@ abstract class TabletGroupWatcher extends Daemon { TableId tableId = tls.extent.tableId(); TableConfiguration tableConf = this.master.getContext().getTableConfiguration(tableId); - MergeStats mergeStats = mergeStatsCache.get(tableId); - if (mergeStats == null) { - mergeStats = currentMerges.get(tableId); - if (mergeStats == null) { - mergeStats = new MergeStats(new MergeInfo()); - } - mergeStatsCache.put(tableId, mergeStats); - } + MergeStats mergeStats = mergeStatsCache.computeIfAbsent(tableId, k -> { + var mStats = currentMerges.get(k); + return mStats != null ? mStats : new MergeStats(new MergeInfo()); + }); TabletGoalState goal = this.master.getGoalState(tls, mergeStats.getMergeInfo()); TServerInstance server = tls.getServer(); TabletState state = tls.getState(currentTServers.keySet());