Remove superfluous BuildEventId Java class. The protobuf is just as good, and it reduces complexity to not have these wrapper classes floating around.
Probably will have no noticeable effect on performance/memory, but can't hurt.
PiperOrigin-RevId: 304197948
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
index e34beea..ea0e769 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java
@@ -19,8 +19,9 @@
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
import com.google.devtools.build.lib.causes.Cause;
@@ -75,12 +76,13 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.targetCompleted(failedTarget.getLabel(), configuration);
+ return BuildEventIdUtil.targetCompleted(failedTarget.getLabel(), configuration);
}
@Override
public Collection<BuildEventId> getChildrenEvents() {
- return ImmutableList.copyOf(Iterables.transform(rootCauses.toList(), BuildEventId::fromCause));
+ return ImmutableList.copyOf(
+ Iterables.transform(rootCauses.toList(), cause -> cause.getIdProto()));
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisRootCauseEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisRootCauseEvent.java
index eddd056..8556f82 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisRootCauseEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisRootCauseEvent.java
@@ -19,8 +19,9 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.cmdline.Label;
@@ -52,9 +53,9 @@
public BuildEventId getEventId() {
// This needs to match AnalysisFailedCause.
if (configuration == null) {
- return BuildEventId.unconfiguredLabelId(label);
+ return BuildEventIdUtil.unconfiguredLabelId(label);
}
- return BuildEventId.configuredLabelId(label, configuration.getEventId());
+ return BuildEventIdUtil.configuredLabelId(label, configuration.getEventId());
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java
index a87bb35..5f27ce1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java
@@ -22,8 +22,9 @@
import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsInOutputGroup;
import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.OutputGroup;
import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
@@ -57,7 +58,7 @@
(rootCauses == null) ? NestedSetBuilder.<Cause>emptySet(Order.STABLE_ORDER) : rootCauses;
ImmutableList.Builder<BuildEventId> postedAfterBuilder = ImmutableList.builder();
for (Cause cause : getRootCauses().toList()) {
- postedAfterBuilder.add(BuildEventId.fromCause(cause));
+ postedAfterBuilder.add(cause.getIdProto());
}
this.postedAfter = postedAfterBuilder.build();
this.completionContext = completionContext;
@@ -108,7 +109,7 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.aspectCompleted(
+ return BuildEventIdUtil.aspectCompleted(
aspectValue.getLabel(),
configurationEventId,
aspectValue.getAspect().getDescriptor().getDescription());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java
index e54b211..f5796fa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java
@@ -17,8 +17,9 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
@@ -53,7 +54,7 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.aspectConfigured(target, aspect);
+ return BuildEventIdUtil.aspectConfigured(target, aspect);
}
@Override
@@ -61,10 +62,10 @@
ImmutableList.Builder<BuildEventId> childrenBuilder = ImmutableList.builder();
for (BuildConfiguration config : configurations) {
if (config != null) {
- childrenBuilder.add(BuildEventId.targetCompleted(target, config.getEventId()));
+ childrenBuilder.add(BuildEventIdUtil.targetCompleted(target, config.getEventId()));
} else {
childrenBuilder.add(
- BuildEventId.targetCompleted(target, BuildEventId.nullConfigurationId()));
+ BuildEventIdUtil.targetCompleted(target, BuildEventIdUtil.nullConfigurationId()));
}
}
return childrenBuilder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java
index 39d3b3f..3544319 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java
@@ -17,8 +17,9 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.events.ExtendedEventHandler;
@@ -46,17 +47,17 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.workspaceStatusId();
+ return BuildEventIdUtil.workspaceStatusId();
}
@Override
public Collection<BuildEventId> getChildrenEvents() {
- return ImmutableList.<BuildEventId>of();
+ return ImmutableList.of();
}
@Override
public Collection<BuildEventId> postedAfter() {
- return ImmutableList.<BuildEventId>of(BuildEventId.buildStartedId());
+ return ImmutableList.of(BuildEventIdUtil.buildStartedId());
}
@Override
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 e8ba823..e124cb4 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
@@ -17,8 +17,9 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.buildeventstream.ProgressEvent;
import com.google.devtools.build.lib.util.ProcessUtils;
@@ -56,7 +57,8 @@
@Override
public Collection<BuildEventId> getChildrenEvents() {
if (separateFinishedEvent) {
- return ImmutableList.of(ProgressEvent.INITIAL_PROGRESS_UPDATE, BuildEventId.buildFinished());
+ return ImmutableList.of(
+ ProgressEvent.INITIAL_PROGRESS_UPDATE, BuildEventIdUtil.buildFinished());
} else {
return ImmutableList.of(ProgressEvent.INITIAL_PROGRESS_UPDATE);
}
@@ -64,7 +66,7 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.buildStartedId();
+ return BuildEventIdUtil.buildStartedId();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
index f14f3ab..bcf5ee8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
@@ -34,8 +34,9 @@
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEvent.LocalFile.LocalFileType;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.File;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.OutputGroup;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.TargetComplete;
@@ -138,9 +139,9 @@
this.configuredTargetKey =
ConfiguredTargetKey.of(
targetAndData.getConfiguredTarget(), targetAndData.getConfiguration());
- postedAfterBuilder.add(BuildEventId.targetConfigured(aliasLabel));
+ postedAfterBuilder.add(BuildEventIdUtil.targetConfigured(aliasLabel));
for (Cause cause : getRootCauses().toList()) {
- postedAfterBuilder.add(BuildEventId.fromCause(cause));
+ postedAfterBuilder.add(cause.getIdProto());
}
this.postedAfter = postedAfterBuilder.build();
this.completionContext = completionContext;
@@ -149,7 +150,7 @@
this.testTimeoutSeconds = isTest ? getTestTimeoutSeconds(targetAndData) : null;
BuildConfiguration configuration = targetAndData.getConfiguration();
this.configEventId =
- configuration != null ? configuration.getEventId() : BuildEventId.nullConfigurationId();
+ configuration != null ? configuration.getEventId() : BuildEventIdUtil.nullConfigurationId();
this.configurationEvent = configuration != null ? configuration.toBuildEvent() : null;
this.testParams =
isTest
@@ -254,14 +255,14 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.targetCompleted(aliasLabel, configEventId);
+ return BuildEventIdUtil.targetCompleted(aliasLabel, configEventId);
}
@Override
public Collection<BuildEventId> getChildrenEvents() {
ImmutableList.Builder<BuildEventId> childrenBuilder = ImmutableList.builder();
for (Cause cause : getRootCauses().toList()) {
- childrenBuilder.add(BuildEventId.fromCause(cause));
+ childrenBuilder.add(cause.getIdProto());
}
if (isTest) {
// For tests, announce all the test actions that will minimally happen (except for
@@ -270,10 +271,10 @@
Label label = getLabel();
for (int run = 0; run < Math.max(testParams.getRuns(), 1); run++) {
for (int shard = 0; shard < Math.max(testParams.getShards(), 1); shard++) {
- childrenBuilder.add(BuildEventId.testResult(label, run, shard, configEventId));
+ childrenBuilder.add(BuildEventIdUtil.testResult(label, run, shard, configEventId));
}
}
- childrenBuilder.add(BuildEventId.testSummary(label, configEventId));
+ childrenBuilder.add(BuildEventIdUtil.testSummary(label, configEventId));
}
return childrenBuilder.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java
index d749cba..8fab9fd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java
@@ -17,8 +17,9 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration;
import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
@@ -55,7 +56,7 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.targetConfigured(target.getLabel());
+ return BuildEventIdUtil.targetConfigured(target.getLabel());
}
@Override
@@ -63,10 +64,12 @@
ImmutableList.Builder<BuildEventId> childrenBuilder = ImmutableList.builder();
for (BuildConfiguration config : configurations) {
if (config != null) {
- childrenBuilder.add(BuildEventId.targetCompleted(target.getLabel(), config.getEventId()));
+ childrenBuilder.add(
+ BuildEventIdUtil.targetCompleted(target.getLabel(), config.getEventId()));
} else {
childrenBuilder.add(
- BuildEventId.targetCompleted(target.getLabel(), BuildEventId.nullConfigurationId()));
+ BuildEventIdUtil.targetCompleted(
+ target.getLabel(), BuildEventIdUtil.nullConfigurationId()));
}
}
return childrenBuilder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index a3412fa..bb854cb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -34,8 +34,9 @@
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
@@ -906,7 +907,7 @@
}
public BuildEventId getEventId() {
- return BuildEventId.configurationId(checksum());
+ return BuildEventIdUtil.configurationId(checksum());
}
public BuildConfigurationEvent toBuildEvent() {
@@ -918,7 +919,7 @@
BuildEventStreamProtos.BuildEvent.Builder builder =
BuildEventStreamProtos.BuildEvent.newBuilder();
builder
- .setId(eventId.asStreamProto())
+ .setId(eventId)
.setConfiguration(
BuildEventStreamProtos.Configuration.newBuilder()
.setMnemonic(getMnemonic())
