commit c608f65820230becc01f00a9b2acf24a1b033ce3
author janakr <janakr@google.com> Fri Sep 21 10:32:41 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Sep 21 10:34:05 2018 -0700
tree 3ee4738bbf14b5e763df18d57c029ad460fed728
parent 6d2bfa47133fa8d93571ea61d3659ef6adcdd994

Make TargetPatternPhaseValue#getTargets and #getTestsToRun interrupt-safe.

PiperOrigin-RevId: 214006540

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java
index 224ea7e..bf6337c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java
@@ -32,6 +32,7 @@
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -64,38 +65,34 @@
     this.workspaceName = workspaceName;
   }
 
+  private static ImmutableSet<Target> getTargetsFromLabels(
+      Collection<Label> labels, ExtendedEventHandler eventHandler, PackageManager packageManager)
+      throws InterruptedException {
+    ImmutableSet.Builder<Target> result = ImmutableSet.builderWithExpectedSize(labels.size());
+    for (Label label : labels) {
+      try {
+        result.add(
+            packageManager
+                .getPackage(eventHandler, label.getPackageIdentifier())
+                .getTarget(label.getName()));
+      } catch (NoSuchTargetException | NoSuchPackageException e) {
+        throw new IllegalStateException(
+            "Failed to get preloaded package from TargetPatternPhaseValue for " + label, e);
+      }
+    }
+    return result.build();
+  }
+
   public ImmutableSet<Target> getTargets(
-      ExtendedEventHandler eventHandler, PackageManager packageManager) {
-    return targetLabels
-        .stream()
-        .map(
-            (label) -> {
-              try {
-                return packageManager
-                    .getPackage(eventHandler, label.getPackageIdentifier())
-                    .getTarget(label.getName());
-              } catch (NoSuchPackageException | NoSuchTargetException | InterruptedException e) {
-                throw new RuntimeException("Failed to get package from TargetPatternPhaseValue", e);
-              }
-            })
-        .collect(ImmutableSet.toImmutableSet());
+      ExtendedEventHandler eventHandler, PackageManager packageManager)
+      throws InterruptedException {
+    return getTargetsFromLabels(targetLabels, eventHandler, packageManager);
   }
 
   public ImmutableSet<Target> getTestsToRun(
-      ExtendedEventHandler eventHandler, PackageManager packageManager) {
-    return testsToRunLabels
-        .stream()
-        .map(
-            (label) -> {
-              try {
-                return packageManager
-                    .getPackage(eventHandler, label.getPackageIdentifier())
-                    .getTarget(label.getName());
-              } catch (NoSuchPackageException | NoSuchTargetException | InterruptedException e) {
-                throw new RuntimeException("Failed to get package from TargetPatternPhaseValue", e);
-              }
-            })
-        .collect(ImmutableSet.toImmutableSet());
+      ExtendedEventHandler eventHandler, PackageManager packageManager)
+      throws InterruptedException {
+    return getTargetsFromLabels(testsToRunLabels, eventHandler, packageManager);
   }
 
   public ImmutableSet<Label> getTargetLabels() {