diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
5 files changed, 19 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java index c1619717bd..76a79b8177 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java +++ b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.actions.cache; -import com.google.common.collect.MapMaker; import com.google.devtools.build.lib.clock.Clock; import com.google.devtools.build.lib.concurrent.ThreadSafety.ConditionallyThreadSafe; import com.google.devtools.build.lib.util.CanonicalStringIndexer; @@ -25,6 +24,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** @@ -149,7 +149,7 @@ final class PersistentStringIndexer extends CanonicalStringIndexer { } private static <K, V> ConcurrentMap<K, V> newConcurrentMap(int expectedCapacity) { - return new MapMaker().initialCapacity(expectedCapacity).makeMap(); + return new ConcurrentHashMap<>(expectedCapacity); } } 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 diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java index ba442362d8..ae4b114134 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java @@ -16,11 +16,8 @@ package com.google.devtools.build.lib.skyframe; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Interner; -import com.google.common.collect.MapMaker; -import com.google.devtools.build.lib.concurrent.BlazeInterners; - +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - import javax.annotation.Nullable; /** @@ -28,8 +25,7 @@ import javax.annotation.Nullable; * given sample object via {@link #getCanonical}. */ public class InternerWithPresenceCheck<T> implements Interner<T> { - private final ConcurrentMap<T, T> map = - new MapMaker().concurrencyLevel(BlazeInterners.concurrencyLevel()).makeMap(); + private final ConcurrentMap<T, T> map = new ConcurrentHashMap<>(); @Override public T intern(T sample) { diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryGraphImpl.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryGraphImpl.java index 05029be98e..079ddba175 100644 --- a/src/main/java/com/google/devtools/build/skyframe/InMemoryGraphImpl.java +++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryGraphImpl.java @@ -18,12 +18,12 @@ import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.MapMaker; import com.google.common.collect.Maps; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; @@ -35,8 +35,7 @@ import javax.annotation.Nullable; */ public class InMemoryGraphImpl implements InMemoryGraph { - protected final ConcurrentMap<SkyKey, InMemoryNodeEntry> nodeMap = - new MapMaker().initialCapacity(1024).concurrencyLevel(200).makeMap(); + protected final ConcurrentMap<SkyKey, InMemoryNodeEntry> nodeMap = new ConcurrentHashMap<>(1024); private final boolean keepEdges; InMemoryGraphImpl() { |