commit bfd4e2461556a67502c80c84c0228b8c91955623
author Googler <noreply@google.com> Fri Jul 15 22:23:37 2016 +0000
committer Yun Peng <pcloudy@google.com> Mon Jul 18 10:44:37 2016 +0000
tree 554c56e1e90f9c6b93bdec7a3b10ec5629c7693f
parent a66a56b108c04f05efcb9b965361d692435acc59

Model the TopLevelArtifactContext as an argument to the CompletionFunction rather than a PRECOMPUTED value.

Having a stale TopLevelArtifactContext leads to invalidation of all the top level target nodes, causing time wasted due to a lot of cache hits for a null build.

--
MOS_MIGRATED_REVID=127585059

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java
index 22b0ee0..45c17fa 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java
@@ -13,8 +13,11 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
+import com.google.auto.value.AutoValue;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
+import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
+import com.google.devtools.build.lib.skyframe.AspectValue.AspectKey;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 
@@ -34,14 +37,29 @@
     return aspectValue;
   }
 
-  public static Iterable<SkyKey> keys(Collection<AspectValue> targets) {
+  public static Iterable<SkyKey> keys(
+      Collection<AspectValue> targets, final TopLevelArtifactContext ctx) {
     return Iterables.transform(
         targets,
         new Function<AspectValue, SkyKey>() {
           @Override
           public SkyKey apply(AspectValue aspectValue) {
-            return SkyKey.create(SkyFunctions.ASPECT_COMPLETION, aspectValue.getKey());
+            return SkyKey.create(
+                SkyFunctions.ASPECT_COMPLETION,
+                AspectCompletionKey.create(aspectValue.getKey(), ctx));
           }
         });
   }
+
+ @AutoValue
+ abstract static class AspectCompletionKey {
+    public static AspectCompletionKey create(
+        AspectKey aspectKey, TopLevelArtifactContext topLevelArtifactContext) {
+      return new AutoValue_AspectCompletionValue_AspectCompletionKey(
+          aspectKey, topLevelArtifactContext);
+    }
+
+    public abstract AspectKey aspectKey();
+    public abstract TopLevelArtifactContext topLevelArtifactContext();
+  }
 }