Automated rollback of commit 526ec17843b931d41e7d7ff9a8d68d6c90bce1ec.
*** Reason for rollback ***
b/119190539
*** Original change description ***
Add a new BEP event for the location of output from the `query`, `cquery`, and `aquery` commands. Add a new common query flag --upload_query_output_using_bep that controls whether these commands print their output to the console or whether they upload them to remote storage using BEP.
RELNOTES: The new --upload_query_output_using_bep query/cquery/aquery flag causes query outputs to be uploaded via BEP.
PiperOrigin-RevId: 220530561
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java
index 12de98a..8009e32 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.buildeventstream.ProgressEvent;
import com.google.devtools.build.lib.util.ProcessUtils;
-import java.util.ArrayList;
import java.util.Collection;
/** This event raised to indicate that no build will be happening for the given command. */
@@ -32,89 +31,35 @@
private final Long startTimeMillis;
private final boolean separateFinishedEvent;
private final boolean showProgress;
- private final ImmutableList<BuildEventId> additionalChildrenEvents;
- private NoBuildEvent(
+ public NoBuildEvent(
String command,
Long startTimeMillis,
boolean separateFinishedEvent,
boolean showProgress,
- String id,
- ImmutableList<BuildEventId> additionalChildrenEvents) {
+ String id) {
this.command = command;
this.startTimeMillis = startTimeMillis;
this.separateFinishedEvent = separateFinishedEvent;
this.showProgress = showProgress;
this.id = id;
- this.additionalChildrenEvents = additionalChildrenEvents;
}
- public static Builder newBuilder() {
- return new Builder();
+ public NoBuildEvent(String command, Long startTimeMillis, boolean separateFinishedEvent) {
+ this(command, startTimeMillis, separateFinishedEvent, false, null);
}
- /** Builder for {@link NoBuildEvent}. */
- public static class Builder {
- private String command = null;
- private String id = null;
- private boolean showProgress = false;
- private Long startTimeMillis = null;
- private boolean separateFinishedEvent = false;
- private ArrayList<BuildEventId> additionalChildrenEvents = new ArrayList<>();
-
- private Builder() {
- }
-
- public Builder setCommand(String command) {
- this.command = command;
- return this;
- }
-
- public Builder setId(String id) {
- this.id = id;
- return this;
- }
-
- public Builder setShowProgress(boolean showProgress) {
- this.showProgress = showProgress;
- return this;
- }
-
- public Builder setStartTimeMillis(long startTimeMillis) {
- this.startTimeMillis = startTimeMillis;
- return this;
- }
-
- public Builder setSeparateFinishedEvent(boolean separateFinishedEvent) {
- this.separateFinishedEvent = separateFinishedEvent;
- return this;
- }
-
- public Builder addAdditionalChildrenEvents(Iterable<BuildEventId> additionalChildrenEvents) {
- additionalChildrenEvents.forEach(this.additionalChildrenEvents::add);
- return this;
- }
-
- public NoBuildEvent build() {
- return new NoBuildEvent(
- command,
- startTimeMillis,
- separateFinishedEvent,
- showProgress,
- id,
- ImmutableList.copyOf(additionalChildrenEvents));
- }
+ public NoBuildEvent() {
+ this(null, null, false);
}
@Override
public Collection<BuildEventId> getChildrenEvents() {
- ImmutableList.Builder allChildrenEventsBuilder = ImmutableList.builder();
- allChildrenEventsBuilder.add(ProgressEvent.INITIAL_PROGRESS_UPDATE);
- allChildrenEventsBuilder.addAll(additionalChildrenEvents);
if (separateFinishedEvent) {
- allChildrenEventsBuilder.add(BuildEventId.buildFinished());
+ return ImmutableList.of(ProgressEvent.INITIAL_PROGRESS_UPDATE, BuildEventId.buildFinished());
+ } else {
+ return ImmutableList.of(ProgressEvent.INITIAL_PROGRESS_UPDATE);
}
- return allChildrenEventsBuilder.build();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildRequestFinishedEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildRequestFinishedEvent.java
index ac82e9d..f1294f2 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildRequestFinishedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildRequestFinishedEvent.java
@@ -17,10 +17,7 @@
import com.google.devtools.build.lib.buildeventstream.BuildCompletingEvent;
import com.google.devtools.build.lib.util.ExitCode;
-/**
- * A {@link BuildEvent} indicating that a request (that does not involve building) should be treated
- * as finished.
- */
+/** {@link BuildEvent} indicating that a request that does not involve building as finished. */
public final class NoBuildRequestFinishedEvent extends BuildCompletingEvent {
public NoBuildRequestFinishedEvent(ExitCode exitCode, long finishTimeMillis) {
super(exitCode, finishTimeMillis);
