From 105db844833c016550817662791e5c04efb91445 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <aehlig@google.com>
Date: Wed, 1 Mar 2017 17:12:09 +0000
Subject: BEP: Report pattern expansion failures

If expanding a pattern fails, report this on the build event protocol;
also include details of what happened.

--
Change-Id: I2bc9caf7c085911b80551d7892cc34f5e9961c7b
Reviewed-on: https://cr.bazel.build/8795
PiperOrigin-RevId: 148894326
MOS_MIGRATED_REVID=148894326
---
 .../build/lib/skyframe/PatternExpandingError.java  | 66 ++++++++++++++++++++++
 .../skyframe/SkyframeTargetPatternEvaluator.java   | 12 +++-
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java

(limited to 'src/main/java/com/google/devtools/build/lib/skyframe')

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java
new file mode 100644
index 0000000000..fd273e7fee
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java
@@ -0,0 +1,66 @@
+// Copyright 2016 The Bazel Authors. 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.common.collect.ImmutableList;
+import com.google.devtools.build.lib.buildeventstream.BuildEvent;
+import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
+import com.google.devtools.build.lib.buildeventstream.PathConverter;
+import java.util.Collection;
+import java.util.List;
+
+/** Event reporting about failure to expand a target pattern properly. */
+public final class PatternExpandingError implements BuildEvent {
+
+  private final List<String> pattern;
+  private final String message;
+  private final boolean skipped;
+
+  private PatternExpandingError(List<String> pattern, String message, boolean skipped) {
+    this.pattern = pattern;
+    this.message = message;
+    this.skipped = skipped;
+  }
+
+  public static PatternExpandingError failed(List<String> pattern, String message) {
+    return new PatternExpandingError(pattern, message, false);
+  }
+
+  public static PatternExpandingError skipped(String term, String message) {
+    return new PatternExpandingError(ImmutableList.of(term), message, true);
+  }
+
+  @Override
+  public BuildEventId getEventId() {
+    if (skipped) {
+      return BuildEventId.targetPatternSkipped(pattern);
+    } else {
+      return BuildEventId.targetPatternExpanded(pattern);
+    }
+  }
+
+  @Override
+  public Collection<BuildEventId> getChildrenEvents() {
+    return ImmutableList.<BuildEventId>of();
+  }
+
+  @Override
+  public BuildEventStreamProtos.BuildEvent asStreamProto(PathConverter pathConverter) {
+    BuildEventStreamProtos.LoadingFailure failure =
+        BuildEventStreamProtos.LoadingFailure.newBuilder().setDetails(message).build();
+    return GenericBuildEvent.protoChaining(this).setLoadingFailed(failure).build();
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
index 6fc79ef7e0..af3450e765 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
@@ -121,8 +121,13 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
       }
     }
     ImmutableList<SkyKey> skyKeys = builder.build();
-    return parseTargetPatternKeys(skyKeys, SkyframeExecutor.DEFAULT_THREAD_COUNT, keepGoing,
-        eventHandler, createTargetPatternEvaluatorUtil(policy, eventHandler, keepGoing));
+    return parseTargetPatternKeys(
+        targetPatterns,
+        skyKeys,
+        SkyframeExecutor.DEFAULT_THREAD_COUNT,
+        keepGoing,
+        eventHandler,
+        createTargetPatternEvaluatorUtil(policy, eventHandler, keepGoing));
   }
 
   private TargetPatternsResultBuilder createTargetPatternEvaluatorUtil(
@@ -134,6 +139,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
   }
 
   ResolvedTargets<Target> parseTargetPatternKeys(
+      List<String> targetPattern,
       Iterable<SkyKey> patternSkyKeys,
       int numThreads,
       boolean keepGoing,
@@ -178,6 +184,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
         }
         if (keepGoing) {
           eventHandler.handle(Event.error("Skipping '" + rawPattern + "': " + errorMessage));
+          eventHandler.post(PatternExpandingError.skipped(rawPattern, errorMessage));
         }
         finalTargetSetEvaluator.setError();
 
@@ -192,6 +199,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
       Preconditions.checkState(errorMessage != null, "unexpected errors: %s", result.errorMap());
       finalTargetSetEvaluator.setError();
       if (!keepGoing) {
+        eventHandler.post(PatternExpandingError.failed(targetPattern, errorMessage));
         throw new TargetParsingException(errorMessage);
       }
     }
-- 
cgit v1.2.3