bzlmod: Remove overrides from DiscoveryValue and SelectionValue

(bazelbuild/bazel#13316) The overrides cannot be nicely encapsulated in SelectionValue because we need the overrides when fetching modules with non-registry overrides, which happens during discovery. Any consumers of overrides should get them from the ModuleFileValue of the root module directly instead. PiperOrigin-RevId: 384236547
luca-digrazia · Sep 4, 2022 · 4db3bab · 4db3bab
1 parent acb8ab3
commit 4db3bab
Show file tree

Hide file tree

Showing 6 changed files with 260 additions and 1,377 deletions.
diff --git a/...ild.bazel/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryFunction.java b/...ild.bazel/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryFunction.java
@@ -16,7 +16,6 @@
 package com.google.devtools.build.lib.bazel.bzlmod;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.bazel.bzlmod.ModuleFileValue.RootModuleFileValue;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -40,12 +39,11 @@ public class DiscoveryFunction implements SkyFunction {
   @Override
   public SkyValue compute(SkyKey skyKey, Environment env)
       throws SkyFunctionException, InterruptedException {
-    RootModuleFileValue root =
-        (RootModuleFileValue) env.getValue(ModuleFileValue.keyForRootModule());
+    ModuleFileValue root = (ModuleFileValue) env.getValue(ModuleFileValue.keyForRootModule());
     if (root == null) {
       return null;
     }
-    ModuleKey rootModuleKey = ModuleKey.create(root.getModule().getName(), Version.EMPTY);
+    ModuleKey rootModuleKey = ModuleKey.create(root.getModule().getName(), "");
     ImmutableMap<String, ModuleOverride> overrides = root.getOverrides();
     Map<ModuleKey, Module> depGraph = new HashMap<>();
     depGraph.put(
@@ -88,13 +86,13 @@ private static Module rewriteDepKeys(
       Module module, ImmutableMap<String, ModuleOverride> overrides, String rootModuleName) {
     return module.withDepKeysTransformed(
         depKey -> {
-          Version newVersion = depKey.getVersion();
+          String newVersion = depKey.getVersion();
 
           @Nullable ModuleOverride override = overrides.get(depKey.getName());
           if (override instanceof NonRegistryOverride || rootModuleName.equals(depKey.getName())) {
-            newVersion = Version.EMPTY;
+            newVersion = "";
           } else if (override instanceof SingleVersionOverride) {
-            Version overrideVersion = ((SingleVersionOverride) override).getVersion();
+            String overrideVersion = ((SingleVersionOverride) override).getVersion();
             if (!overrideVersion.isEmpty()) {
               newVersion = overrideVersion;
             }

diff --git a/...lbuild.bazel/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryValue.java b/...lbuild.bazel/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryValue.java
@@ -29,15 +29,11 @@ public abstract class DiscoveryValue implements SkyValue {
   @AutoCodec public static final SkyKey KEY = () -> SkyFunctions.DISCOVERY;
 
   public static DiscoveryValue create(
-      String rootModuleName,
-      ImmutableMap<ModuleKey, Module> depGraph,
-      ImmutableMap<String, ModuleOverride> overrides) {
-    return new AutoValue_DiscoveryValue(rootModuleName, depGraph, overrides);
+      String rootModuleName, ImmutableMap<ModuleKey, Module> depGraph) {
+    return new AutoValue_DiscoveryValue(rootModuleName, depGraph);
   }
 
   public abstract String getRootModuleName();
 
   public abstract ImmutableMap<ModuleKey, Module> getDepGraph();
-
-  public abstract ImmutableMap<String, ModuleOverride> getOverrides();
 }