commit 70f7c802582130861844026e1c1cc5ab5f922c24
author Googler <jhorvitz@google.com> Mon Nov 06 07:44:15 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 06 07:45:33 2023 -0800
tree 95d18ca128adbe635d65a77c807a7f23197a7bd4
parent e1df5cdf7ad96db86f7a28d02d669faf7ef95359

Use `SkyKeyInterner` for more `SkyKey` types.

PiperOrigin-RevId: 579840409
Change-Id: I67eeea72f2bb935581f6f7afe71f0b72fb6f4c1a

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
index a80ba14..cbdd287 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
@@ -16,15 +16,14 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Interner;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.ActionLookupKey;
 import com.google.devtools.build.lib.actions.BasicActionLookupValue;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.concurrent.BlazeInterners;
 import com.google.devtools.build.lib.skyframe.config.BuildConfigurationKey;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
+import com.google.devtools.build.skyframe.SkyKey;
 
 /** Value that stores expanded actions from ActionTemplate. */
 public final class ActionTemplateExpansionValue extends BasicActionLookupValue {
@@ -40,8 +39,7 @@
   /** Key for {@link ActionTemplateExpansionValue} nodes. */
   @AutoCodec
   public static final class ActionTemplateExpansionKey implements ActionLookupKey {
-    private static final Interner<ActionTemplateExpansionKey> interner =
-        BlazeInterners.newWeakInterner();
+    private static final SkyKeyInterner<ActionTemplateExpansionKey> interner = SkyKey.newInterner();
 
     private final ActionLookupKey actionLookupKey;
     private final int actionIndex;
@@ -85,6 +83,11 @@
     }
 
     @Override
+    public SkyKeyInterner<ActionTemplateExpansionKey> getSkyKeyInterner() {
+      return interner;
+    }
+
+    @Override
     public int hashCode() {
       return 37 * actionLookupKey.hashCode() + actionIndex;
     }