commit d3501d8325e7ea054f06cd218fb3d182ca0ead13
author Googler <noreply@google.com> Wed Aug 15 13:39:01 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Aug 15 13:40:52 2018 -0700
tree c0dd95ce7145ae5f80d75961782f729bfe236817
parent dc9b3cd9b3105f40a59cee33d4f05dc19fcd13e4

Use ConcurrentHashMap instead of Cache where we aren't using any of the
LoadingCache's capabilities. According to profiles, using ConcurrentHashMap is
about 3x more efficient.

RELNOTES: None
PiperOrigin-RevId: 208874176

src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
index 9d2c94a..5820ac8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
@@ -14,8 +14,6 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.FileValue;
@@ -33,6 +31,7 @@
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 
@@ -43,8 +42,7 @@
  */
 public final class GlobFunction implements SkyFunction {
 
-  private final Cache<String, Pattern> regexPatternCache =
-      CacheBuilder.newBuilder().maximumSize(10000).concurrencyLevel(4).build();
+  private final ConcurrentHashMap<String, Pattern> regexPatternCache = new ConcurrentHashMap<>();
 
   private final boolean alwaysUseDirListing;