commit 45b595360df3ac9b6c6bf079314919c8ff6edda4
author Googler <noreply@google.com> Thu May 03 11:10:20 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu May 03 11:12:36 2018 -0700
tree a8c2ee4782f1ce4ea6e09cd65db996e50c63ac7c
parent 42025b2dfb8319d90b4a5566ab583084cfcb2de8

Use ConcurrentHashMap directly instead of MapMaker.

RELNOTES: None.
PiperOrigin-RevId: 195280015

src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
index a418f41..1e1ff15 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
@@ -25,7 +25,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.ListMultimap;
-import com.google.common.collect.MapMaker;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Streams;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -56,6 +55,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 /**
@@ -785,7 +785,9 @@
 
     private ThreadSafeAggregateAllSkyKeysCallback(int concurrencyLevel) {
       this.results =
-          Collections.newSetFromMap(new MapMaker().concurrencyLevel(concurrencyLevel).makeMap());
+          Collections.newSetFromMap(
+              new ConcurrentHashMap<>(
+                  /*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f));
     }
 
     @Override