Use ConcurrentHashMap directly instead of MapMaker.

RELNOTES: None.
PiperOrigin-RevId: 195280015

2 files changed, 13 insertions, 7 deletions

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 a418f41bdf..1e1ff15eac 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.ImmutableList;
 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.HashMap;
 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 @@ public class ParallelSkyQueryUtils {
 
     private ThreadSafeAggregateAllSkyKeysCallback(int concurrencyLevel) {
       this.results =
-          Collections.newSetFromMap(new MapMaker().concurrencyLevel(concurrencyLevel).makeMap());
+          Collections.newSetFromMap(
+              new ConcurrentHashMap<>(
+                  /*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f));
     }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java
index f2a9939ff2..e860cb9060 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.query2.engine;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.MapMaker;
 import com.google.devtools.build.lib.collect.compacthashset.CompactHashSet;
 import com.google.devtools.build.lib.query2.engine.QueryEnvironment.MutableMap;
 import com.google.devtools.build.lib.query2.engine.QueryEnvironment.QueryTaskCallable;
@@ -28,6 +27,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
@@ -155,7 +155,8 @@ public final class QueryUtil {
         int concurrencyLevel) {
       this.extractor = extractor;
       this.elementClass = elementClass;
-      this.map = new MapMaker().concurrencyLevel(concurrencyLevel).makeMap();
+      this.map =
+          new ConcurrentHashMap<>(/*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f);
     }
 
     @Override
@@ -228,8 +229,10 @@ public final class QueryUtil {
 
     public UniquifierImpl(KeyExtractor<T, K> extractor, int concurrencyLevel) {
       this.extractor = extractor;
-      this.alreadySeen = Collections.newSetFromMap(
-          new MapMaker().concurrencyLevel(concurrencyLevel).<K, Boolean>makeMap());
+      this.alreadySeen =
+          Collections.newSetFromMap(
+              new ConcurrentHashMap<>(
+                  /*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f));
     }
 
     @Override
@@ -261,7 +264,8 @@ public final class QueryUtil {
 
     public MinDepthUniquifierImpl(KeyExtractor<T, K> extractor, int concurrencyLevel) {
       this.extractor = extractor;
-      this.alreadySeenAtDepth = new MapMaker().concurrencyLevel(concurrencyLevel).makeMap();
+      this.alreadySeenAtDepth =
+          new ConcurrentHashMap<>(/*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f);
     }
 
     @Override