commit b2a396b6091a07c1e9e5036e73dd14d2ff1ec818
author janakr <janakr@google.com> Thu Feb 15 12:42:38 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Feb 15 12:46:51 2018 -0800
tree 2119f4215f1616ab194299b0f8b5697d3857147d
parent c35fd4d82fefffc2888838531672bfe7855363f8

Add some more codecs to execution-phase SkyKeys.

PiperOrigin-RevId: 185883201

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 b8feb28..8ba11ee 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
@@ -21,6 +21,8 @@
 import com.google.devtools.build.lib.actions.ActionLookupValue;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.BlazeInterners;
+import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 
 /**
@@ -34,14 +36,17 @@
     super(actionKeyContext, ImmutableList.copyOf(expandedActions), removeActionsAfterEvaluation);
   }
 
-  private static final Interner<ActionTemplateExpansionKey> interner =
-      BlazeInterners.newWeakInterner();
-
   static ActionTemplateExpansionKey key(ActionLookupKey actionLookupKey, int actionIndex) {
-    return interner.intern(new ActionTemplateExpansionKey(actionLookupKey, actionIndex));
+    return ActionTemplateExpansionKey.of(actionLookupKey, actionIndex);
   }
 
+  @AutoCodec
   static final class ActionTemplateExpansionKey extends ActionLookupKey {
+    static final ObjectCodec<ActionTemplateExpansionKey> CODEC =
+        new ActionTemplateExpansionValue_ActionTemplateExpansionKey_AutoCodec();
+    private static final Interner<ActionTemplateExpansionKey> interner =
+        BlazeInterners.newWeakInterner();
+
     private final ActionLookupKey actionLookupKey;
     private final int actionIndex;
 
@@ -50,6 +55,12 @@
       this.actionIndex = actionIndex;
     }
 
+    @AutoCodec.VisibleForSerialization
+    @AutoCodec.Instantiator
+    static ActionTemplateExpansionKey of(ActionLookupKey actionLookupKey, int actionIndex) {
+      return interner.intern(new ActionTemplateExpansionKey(actionLookupKey, actionIndex));
+    }
+
     @Override
     public SkyFunctionName functionName() {
       return SkyFunctions.ACTION_TEMPLATE_EXPANSION;