commit 667e85dcc749adcd8003e64a56d45b22dfbf4856
author janakr <janakr@google.com> Wed Jan 24 10:42:19 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Jan 24 10:44:20 2018 -0800
tree b8420123aed2e4c875defa882483b3385e12cac6
parent 269d9bd849938af49a30950522bec9e1140cf599

Store a SkyKey inside BuildInfoCollectionValue.KeyAndConfig instead of a BuildConfiguration: BuildConfigurations are too heavy to be in SkyKeys.

This adds an extra dependency for BuildInfoCollectionValues, but there are not many in the graph, and the dep request is now batched, which is better than before.

PiperOrigin-RevId: 183106788

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
index 8695042..09ce2db 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
@@ -54,17 +54,19 @@
 
   public static BuildInfoKeyAndConfig key(
       BuildInfoFactory.BuildInfoKey key, BuildConfiguration config) {
-    return keyInterner.intern(new BuildInfoKeyAndConfig(key, config));
+    return keyInterner.intern(
+        new BuildInfoKeyAndConfig(key, ConfiguredTargetKey.keyFromConfiguration(config).key));
   }
 
   /** Key for BuildInfoCollectionValues. */
   public static class BuildInfoKeyAndConfig extends ActionLookupKey {
     private final BuildInfoFactory.BuildInfoKey infoKey;
-    private final BuildConfiguration config;
+    private final BuildConfigurationValue.Key configKey;
 
-    private BuildInfoKeyAndConfig(BuildInfoFactory.BuildInfoKey key, BuildConfiguration config) {
-      this.infoKey = Preconditions.checkNotNull(key, config);
-      this.config = Preconditions.checkNotNull(config, key);
+    private BuildInfoKeyAndConfig(
+        BuildInfoFactory.BuildInfoKey key, BuildConfigurationValue.Key configKey) {
+      this.infoKey = Preconditions.checkNotNull(key, configKey);
+      this.configKey = Preconditions.checkNotNull(configKey, key);
     }
 
     @Override
@@ -76,8 +78,8 @@
       return infoKey;
     }
 
-    BuildConfiguration getConfig() {
-      return config;
+    BuildConfigurationValue.Key getConfigKey() {
+      return configKey;
     }
 
     @Override
@@ -87,7 +89,7 @@
 
     @Override
     public int hashCode() {
-      return Objects.hash(infoKey, config);
+      return Objects.hash(infoKey, configKey);
     }
 
     @Override
@@ -102,7 +104,8 @@
         return false;
       }
       BuildInfoKeyAndConfig that = (BuildInfoKeyAndConfig) other;
-      return Objects.equals(this.infoKey, that.infoKey) && Objects.equals(this.config, that.config);
+      return Objects.equals(this.infoKey, that.infoKey)
+          && Objects.equals(this.configKey, that.configKey);
     }
   }
 }