commit b4dfbca3d6fde0a752a97cbe85ebd3d77b40112e
author nharmata <nharmata@google.com> Thu Oct 28 08:20:28 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 28 08:21:55 2021 -0700
tree 76b904e216c66a38e1fc4507b49818836ff78939
parent c952ba7de57e2960a7dbdb5a0ad0774f1c8a42d5

Remove `SkyframeExecutor#newPkgFunctionCache` and `SkyframeExecutor#newCompiledBuildFileCache`.

We no longer have a need to customize these caches.

PiperOrigin-RevId: 406143404

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 690c8c7..da36b1d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -288,10 +288,10 @@
   // package twice (first time loading to find load()ed bzl files and declare Skyframe
   // dependencies).
   private final Cache<PackageIdentifier, LoadedPackageCacheEntry> packageFunctionCache =
-      newPkgFunctionCache();
+      Caffeine.newBuilder().build();
   // Cache of parsed BUILD files, for PackageFunction. Same motivation as above.
   private final Cache<PackageIdentifier, PackageFunction.CompiledBuildFile> compiledBuildFileCache =
-      newCompiledBuildFileCache();
+      Caffeine.newBuilder().build();
 
   // Cache of parsed bzl files, for use when we're inlining BzlCompileFunction in
   // BzlLoadFunction. See the comments in BzlLoadFunction for motivations and details.
@@ -1197,15 +1197,6 @@
     }
   }
 
-  protected Cache<PackageIdentifier, LoadedPackageCacheEntry> newPkgFunctionCache() {
-    return Caffeine.newBuilder().build();
-  }
-
-  protected Cache<PackageIdentifier, PackageFunction.CompiledBuildFile>
-      newCompiledBuildFileCache() {
-    return Caffeine.newBuilder().build();
-  }
-
   private void setShowLoadingProgress(boolean showLoadingProgressValue) {
     showLoadingProgress.set(showLoadingProgressValue);
   }