Adds TransitiveTraversalFunction that loads transitive deps of a target

Unlike TransitiveTargetFunction, it does not return nested sets of the
traversed targets. Used primarily for its side effects of loading the
transitive targets into the graph.

--
MOS_MIGRATED_REVID=99388411

7 files changed, 158 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index 6fd5512ef8..cc2068ca26 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -51,7 +51,7 @@ import com.google.devtools.build.lib.skyframe.RecursivePackageProviderBackedTarg
 import com.google.devtools.build.lib.skyframe.SkyFunctions;
 import com.google.devtools.build.lib.skyframe.TargetPatternValue;
 import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey;
-import com.google.devtools.build.lib.skyframe.TransitiveTargetValue;
+import com.google.devtools.build.lib.skyframe.TransitiveTraversalValue;
 import com.google.devtools.build.lib.syntax.Label;
 import com.google.devtools.build.skyframe.EvaluationResult;
 import com.google.devtools.build.skyframe.SkyFunctionName;
@@ -435,7 +435,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> {
     @Override
     public Label apply(SkyKey skyKey) {
       SkyFunctionName functionName = skyKey.functionName();
-      if (!functionName.equals(SkyFunctions.TRANSITIVE_TARGET)) {
+      if (!functionName.equals(SkyFunctions.TRANSITIVE_TRAVERSAL)) {
         // Skip non-targets.
         return null;
       }
@@ -484,7 +484,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> {
     return Iterables.transform(targets, new Function<Target, SkyKey>() {
       @Override
       public SkyKey apply(Target target) {
-        return TransitiveTargetValue.key(target.getLabel());
+        return TransitiveTraversalValue.key(target.getLabel());
       }
     });
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
index 6fbfe574b1..f236f34cae 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
@@ -145,7 +145,7 @@ public class PrepareDepsOfPatternFunction implements SkyFunction {
       Label label = TargetPatternResolverUtil.label(targetName);
       try {
         Target target = packageProvider.getTarget(env.getListener(), label);
-        SkyKey key = TransitiveTargetValue.key(target.getLabel());
+        SkyKey key = TransitiveTraversalValue.key(target.getLabel());
         SkyValue token =
             env.getValueOrThrow(key, NoSuchPackageException.class, NoSuchTargetException.class);
         if (token == null) {
@@ -176,7 +176,7 @@ public class PrepareDepsOfPatternFunction implements SkyFunction {
             TargetPatternResolverUtil.resolvePackageTargets(pkg, policy);
         ImmutableList.Builder<SkyKey> builder = ImmutableList.builder();
         for (Target target : packageTargets.getTargets()) {
-          builder.add(TransitiveTargetValue.key(target.getLabel()));
+          builder.add(TransitiveTraversalValue.key(target.getLabel()));
         }
         ImmutableList<SkyKey> skyKeys = builder.build();
         env.getValuesOrThrow(skyKeys, NoSuchPackageException.class, NoSuchTargetException.class);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
index 93a0ccfd60..97d5ab0405 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
@@ -140,7 +140,7 @@ public class PrepareDepsOfTargetsUnderDirectoryFunction implements SkyFunction {
         TargetPatternResolverUtil.resolvePackageTargets(pkg, filteringPolicy);
     ImmutableList.Builder<SkyKey> builder = ImmutableList.builder();
     for (Target target : packageTargets.getTargets()) {
-      builder.add(TransitiveTargetValue.key(target.getLabel()));
+      builder.add(TransitiveTraversalValue.key(target.getLabel()));
     }
     ImmutableList<SkyKey> skyKeys = builder.build();
     env.getValuesOrThrow(skyKeys, NoSuchPackageException.class, NoSuchTargetException.class);
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 f8d8febf55..2698cd7535 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
@@ -51,6 +51,8 @@ public final class SkyFunctions {
   public static final SkyFunctionName RECURSIVE_PKG = SkyFunctionName.create("RECURSIVE_PKG");
   public static final SkyFunctionName TRANSITIVE_TARGET =
       SkyFunctionName.create("TRANSITIVE_TARGET");
+  public static final SkyFunctionName TRANSITIVE_TRAVERSAL =
+      SkyFunctionName.create("TRANSITIVE_TRAVERSAL");
   public static final SkyFunctionName CONFIGURED_TARGET =
       SkyFunctionName.create("CONFIGURED_TARGET");
   public static final SkyFunctionName ASPECT = SkyFunctionName.create("ASPECT");
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index a06a9dacde..cf2223980f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -317,6 +317,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
         numPackagesLoaded));
     map.put(SkyFunctions.TARGET_MARKER, new TargetMarkerFunction());
     map.put(SkyFunctions.TRANSITIVE_TARGET, new TransitiveTargetFunction(ruleClassProvider));
+    map.put(SkyFunctions.TRANSITIVE_TRAVERSAL, new TransitiveTraversalFunction());
     map.put(SkyFunctions.CONFIGURED_TARGET,
         new ConfiguredTargetFunction(new BuildViewProvider()));
     map.put(SkyFunctions.ASPECT, new AspectFunction(new BuildViewProvider()));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java
new file mode 100644
index 0000000000..910c8c31b3
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java
@@ -0,0 +1,91 @@
+// Copyright 2014 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.skyframe;
+
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.packages.NoSuchPackageException;
+import com.google.devtools.build.lib.packages.NoSuchTargetException;
+import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.skyframe.TransitiveTraversalFunction.DummyAccumulator;
+import com.google.devtools.build.lib.syntax.Label;
+import com.google.devtools.build.skyframe.SkyKey;
+import com.google.devtools.build.skyframe.SkyValue;
+import com.google.devtools.build.skyframe.ValueOrException2;
+
+import java.util.Map.Entry;
+
+/**
+ * This class is like {@link TransitiveTargetFunction}, but the values it returns do not contain
+ * {@link NestedSet}s. It should be used only when the side-effects of {@link
+ * TransitiveTargetFunction} are desired (i.e., loading transitive targets and their packages, and
+ * emitting error events).
+ */
+public class TransitiveTraversalFunction extends TransitiveBaseTraversalFunction<DummyAccumulator> {
+
+  @Override
+  SkyKey getKey(Label label) {
+    return TransitiveTraversalValue.key(label);
+  }
+
+  @Override
+  DummyAccumulator processTarget(Label label, TargetAndErrorIfAny targetAndErrorIfAny) {
+    return DummyAccumulator.INSTANCE;
+  }
+
+  @Override
+  void processDeps(DummyAccumulator processedTargets, EventHandler eventHandler,
+      TargetAndErrorIfAny targetAndErrorIfAny,
+      Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>>
+          depEntries) {
+    Target target = targetAndErrorIfAny.getTarget();
+    for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry :
+        depEntries) {
+      Label depLabel = (Label) entry.getKey().argument();
+      TransitiveTraversalValue transitiveTraversalValue;
+      try {
+        transitiveTraversalValue = (TransitiveTraversalValue) entry.getValue().get();
+        if (transitiveTraversalValue == null) {
+          continue;
+        }
+      } catch (NoSuchPackageException | NoSuchTargetException e) {
+        maybeReportErrorAboutMissingEdge(target, depLabel, e, eventHandler);
+        continue;
+      }
+      if (transitiveTraversalValue.getErrorLoadingTarget() != null) {
+        maybeReportErrorAboutMissingEdge(target, depLabel,
+            transitiveTraversalValue.getErrorLoadingTarget(), eventHandler);
+      }
+    }
+  }
+
+  @Override
+  SkyValue computeSkyValue(TargetAndErrorIfAny targetAndErrorIfAny,
+      DummyAccumulator processedTargets) {
+    NoSuchTargetException errorLoadingTarget = targetAndErrorIfAny.getErrorLoadingTarget();
+    return errorLoadingTarget == null
+        ? TransitiveTraversalValue.SUCCESSFUL_TRANSITIVE_TRAVERSAL_VALUE
+        : TransitiveTraversalValue.unsuccessfulTransitiveTraversal(errorLoadingTarget);
+  }
+
+  /**
+   * Because {@link TransitiveTraversalFunction} is invoked only when its side-effects are desired,
+   * this value accumulator has nothing to keep track of.
+   */
+  static class DummyAccumulator {
+    static final DummyAccumulator INSTANCE = new DummyAccumulator();
+
+    private DummyAccumulator() {}
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalValue.java
new file mode 100644
index 0000000000..8216381994
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalValue.java
@@ -0,0 +1,58 @@
+// Copyright 2014 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.skyframe;
+
+import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
+import com.google.devtools.build.lib.packages.NoSuchTargetException;
+import com.google.devtools.build.lib.syntax.Label;
+import com.google.devtools.build.skyframe.SkyKey;
+import com.google.devtools.build.skyframe.SkyValue;
+
+import javax.annotation.Nullable;
+
+/**
+ * A <i>transitive</i> target reference that, when built in skyframe, loads the entire
+ * transitive closure of a target. Contains no information about the targets traversed.
+ */
+@Immutable
+@ThreadSafe
+public class TransitiveTraversalValue implements SkyValue {
+
+  @Nullable
+  private final NoSuchTargetException errorLoadingTarget;
+
+  static final TransitiveTraversalValue SUCCESSFUL_TRANSITIVE_TRAVERSAL_VALUE =
+      new TransitiveTraversalValue(null);
+
+  private TransitiveTraversalValue(@Nullable NoSuchTargetException errorLoadingTarget) {
+    this.errorLoadingTarget = errorLoadingTarget;
+  }
+
+  static TransitiveTraversalValue unsuccessfulTransitiveTraversal(
+      NoSuchTargetException errorLoadingTarget) {
+    return new TransitiveTraversalValue(errorLoadingTarget);
+  }
+
+  /** Returns the error, if any, from loading the target. */
+  @Nullable
+  public NoSuchTargetException getErrorLoadingTarget() {
+    return errorLoadingTarget;
+  }
+
+  @ThreadSafe
+  public static SkyKey key(Label label) {
+    return new SkyKey(SkyFunctions.TRANSITIVE_TRAVERSAL, label);
+  }
+}