commit a20b32690a71caf712d1d241f01fef16649562ba
author wyv <wyv@google.com> Wed Sep 08 10:25:18 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 08 10:26:28 2021 -0700
tree 0669e5bd5c2dd2f654eb73553ae2c261f9700bba
parent 40b0ec7d755d37bb8a0e65ba8d00811d2cca3a80

bzlmod: Consolidate resolution sky functions

(https://github.com/bazelbuild/bazel/issues/13316)

This CL merges DiscoveryFunction and SelectionFunction into one SkyFunction called BazelModuleResolutionFunction. The rationale is that we'll be adding some additional logic at the end of SelectionFunction to prepare for module extension resolution (coming in next CLs), and that logic does not really belong as part of "Selection". The previous split between DiscoveryFunction and SelectionFunction, besides semantics, was to facilitate testing; this is worked around by having a test SkyFunction for discovery within tests.

PiperOrigin-RevId: 395502681

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
index d955a26..a87eb89 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
@@ -155,8 +155,8 @@
       SkyFunctionName.createNonHermetic("MODULE_FILE");
   public static final SkyFunctionName BUILD_DRIVER =
       SkyFunctionName.createNonHermetic("BUILD_DRIVER");
-  public static final SkyFunctionName DISCOVERY = SkyFunctionName.createHermetic("DISCOVERY");
-  public static final SkyFunctionName SELECTION = SkyFunctionName.createHermetic("SELECTION");
+  public static final SkyFunctionName BAZEL_MODULE_RESOLUTION =
+      SkyFunctionName.createHermetic("BAZEL_MODULE_RESOLUTION");
 
   public static Predicate<SkyKey> isSkyFunction(final SkyFunctionName functionName) {
     return new Predicate<SkyKey>() {