diff options
| author |  ulfjack <ulfjack@google.com> | 2018-05-29 05:17:35 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-29 05:18:35 -0700 |
| commit | 904a8d63833301f54c7df85bccc56ff67156afc5 (patch) | |
| tree | 3e272496bee7dee8f2d9c4690128e4f13cb323fe /src/main/java/com/google/devtools/build/lib/query2 | |
| parent | ab2431e1ef62d91230fdef49b2556bbe60c9de56 (diff) | |
Refactor root cause reporting in ConfiguredTargetFunction
We now track Causes instead of plain Labels, which will allow us to do better reporting in the future. Add basic tests.
PiperOrigin-RevId: 198380468
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/query2')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/BUILD | 1 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD index cb0dc139d8..b3ded139a2 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/BUILD +++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD @@ -27,6 +27,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/causes", "//src/main/java/com/google/devtools/build/lib/collect/compacthashset", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/concurrent", diff --git a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java index 8da9e0f565..a84386b36a 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java +++ b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java @@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationExcepti import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; +import com.google.devtools.build.lib.causes.Cause; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.events.Event; @@ -240,7 +241,7 @@ public class TransitionsOutputFormatterCallback extends CqueryThreadsafeCallback } @Override - protected Target getTarget(Target from, Label label, NestedSetBuilder<Label> rootCauses) + protected Target getTarget(Target from, Label label, NestedSetBuilder<Cause> rootCauses) throws InterruptedException { return partialResultMap.get(label); } |