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

3 files changed, 1 insertions, 31 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 565601bada..97d1408293 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -181,7 +181,7 @@ public final class ActionsTestUtil {
     }
 
     @Override
-    public final String getConfigurationShortCacheKey() {
+    public final String getConfigurationChecksum() {
       return "dummy-configuration";
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index 1c7c2e2e9a..dfa1cb36f5 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -24,9 +24,6 @@ import com.google.devtools.build.lib.rules.cpp.CppOptions;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.syntax.Label;
 import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.testutil.TestUtils;
-import com.google.devtools.build.lib.vfs.FileSystem;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.common.options.Options;
 
 import java.util.Map;
@@ -213,15 +210,6 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
         }
         return new Fragment() {
 
-          @Override
-          public String getName() {
-            return creates.toString();
-          }
-
-          @Override
-          public String cacheKey() {
-            return creates.toString();
-          }
         };
       }
     };
@@ -285,14 +273,4 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     // Legitimately null option:
     assertNull(create().getOptionValue("test_filter"));
   }
-
-  public void testSerialization() throws Exception {
-    FileSystem oldFileSystem = Path.getFileSystemForSerialization();
-    try {
-      Path.setFileSystemForSerialization(scratch.getFileSystem());
-      TestUtils.serializeObject(createCollection());
-    } finally {
-      Path.setFileSystemForSerialization(oldFileSystem);
-    }
-  }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
index 0915e64850..b797aa0b41 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
@@ -71,15 +71,7 @@ public class RuleClassTest extends PackageLoadingTestCase {
   };
 
   private static final class DummyFragment extends BuildConfiguration.Fragment {
-    @Override
-    public String getName() {
-      return "dummy-for-testing";
-    }
 
-    @Override
-    public String cacheKey() {
-      return "some cache key";
-    }
   }
 
   private static final Predicate<String> PREFERRED_DEPENDENCY_PREDICATE = Predicates.alwaysFalse();