Remove BuildConfiguration.cacheKey() and replace .shortCacheKey() with a .checksum() method that is computed from the checksum of the build options. Also remove Fragment.cacheKey() and Fragment.getName().

The reasoning is that within a single build, if two BuildConfigurations share the same BuildOptions, they must be the same because BuildConfiguration can only be a function of BuildOptions, specific targets (which stay the same during a build) and BlazeDirectories (which stay the same during the lifetime of a server). Between different builds if the configurations are recreated, they will always be considered different because Java reference equality (==) is used for comparing BuildConfigurations.

Also remove "Serializable" tags from configuration-related things.

--
MOS_MIGRATED_REVID=97107881

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index 5fa354e76c..ee7f99abc3 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -383,7 +383,7 @@ public abstract class AbstractAction implements Action {
     private final Label label;
     private final String configurationName;
     private final String configurationMnemonic;
-    private final String configurationKey;
+    private final String configurationChecksum;
     private final String targetKind;
     private final String additionalProgressInfo;
 
@@ -392,7 +392,7 @@ public abstract class AbstractAction implements Action {
       this.label = originalOwner.getLabel();
       this.configurationName = originalOwner.getConfigurationName();
       this.configurationMnemonic = originalOwner.getConfigurationMnemonic();
-      this.configurationKey = originalOwner.getConfigurationShortCacheKey();
+      this.configurationChecksum = originalOwner.getConfigurationChecksum();
       this.targetKind = originalOwner.getTargetKind();
       this.additionalProgressInfo = originalOwner.getAdditionalProgressInfo();
     }
@@ -418,8 +418,8 @@ public abstract class AbstractAction implements Action {
     }
 
     @Override
-    public String getConfigurationShortCacheKey() {
-      return configurationKey;
+    public String getConfigurationChecksum() {
+      return configurationChecksum;
     }
 
     @Override