Move newly created protos to analysis package.
These may be reused by configured query, so rather move it early before
consumers starts depending on the old name.
RELNOTES: None
PiperOrigin-RevId: 186633754
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 8bbea92..77ffe93 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -529,7 +529,7 @@
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
"//src/main/java/com/google/devtools/common/options:invocation_policy",
- "//src/main/protobuf:action_graph_java_proto",
+ "//src/main/protobuf:analysis_java_proto",
"//src/main/protobuf:extra_actions_base_java_proto",
"//src/main/protobuf:invocation_policy_java_proto",
"//src/main/protobuf:test_status_java_proto",
@@ -1167,7 +1167,7 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/java/com/google/devtools/common/options:invocation_policy",
"//src/main/protobuf:action_cache_java_proto",
- "//src/main/protobuf:action_graph_java_proto",
+ "//src/main/protobuf:analysis_java_proto",
"//src/main/protobuf:bazel_flags_java_proto",
"//src/main/protobuf:build_java_proto",
"//src/main/protobuf:command_line_java_proto",
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
index 4fb164b..35d3800 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
@@ -16,7 +16,7 @@
import static java.util.stream.Collectors.toList;
-import com.google.devtools.build.lib.actions.ActionGraphProtos.ActionGraphContainer;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.packages.Attribute;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index de51557..1652a76 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -30,11 +30,11 @@
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
-import com.google.devtools.build.lib.actions.ActionGraphProtos;
-import com.google.devtools.build.lib.actions.ActionGraphProtos.ActionGraphContainer;
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.AnalysisProtos;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.BuildView;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -802,8 +802,8 @@
if (!knownRuleClassStrings.containsKey(ruleClassString)) {
String targetId = String.valueOf(knownRuleClassStrings.size());
knownRuleClassStrings.put(ruleClassString, targetId);
- ActionGraphProtos.RuleClass.Builder ruleClassBuilder =
- ActionGraphProtos.RuleClass.newBuilder().setId(targetId).setName(ruleClassString);
+ AnalysisProtos.RuleClass.Builder ruleClassBuilder =
+ AnalysisProtos.RuleClass.newBuilder().setId(targetId).setName(ruleClassString);
actionGraphBuilder.addRuleClasses(ruleClassBuilder.build());
}
return knownRuleClassStrings.get(ruleClassString);
@@ -813,7 +813,7 @@
if (!knownTargets.containsKey(label)) {
String targetId = String.valueOf(knownTargets.size());
knownTargets.put(label, targetId);
- ActionGraphProtos.Target.Builder targetBuilder = ActionGraphProtos.Target.newBuilder();
+ AnalysisProtos.Target.Builder targetBuilder = AnalysisProtos.Target.newBuilder();
targetBuilder.setId(targetId).setLabel(label.toString());
if (ruleClassString != null) {
targetBuilder.setRuleClassId(ruleClassStringToId(ruleClassString));
@@ -827,8 +827,8 @@
if (!knownConfigurations.containsKey(buildConfiguration)) {
String configurationId = String.valueOf(knownConfigurations.size());
knownConfigurations.put(buildConfiguration, configurationId);
- ActionGraphProtos.Configuration configurationProto =
- ActionGraphProtos.Configuration.newBuilder()
+ AnalysisProtos.Configuration configurationProto =
+ AnalysisProtos.Configuration.newBuilder()
.setMnemonic(buildConfiguration.getMnemonic())
.setPlatformName(buildConfiguration.getPlatformName())
.setId(configurationId)
@@ -842,8 +842,8 @@
if (!knownArtifacts.containsKey(artifact)) {
String artifactId = String.valueOf(knownArtifacts.size());
knownArtifacts.put(artifact, artifactId);
- ActionGraphProtos.Artifact artifactProto =
- ActionGraphProtos.Artifact.newBuilder()
+ AnalysisProtos.Artifact artifactProto =
+ AnalysisProtos.Artifact.newBuilder()
.setId(artifactId)
.setExecPath(artifact.getExecPathString())
.setIsTreeArtifact(artifact.isTreeArtifact())
@@ -857,9 +857,8 @@
if (!knownNestedSets.containsKey(nestedSetView.identifier())) {
String nestedSetId = String.valueOf(knownNestedSets.size());
knownNestedSets.put(nestedSetView.identifier(), nestedSetId);
- ActionGraphProtos.DepSetOfFiles.Builder depSetBuilder =
- ActionGraphProtos.DepSetOfFiles.newBuilder()
- .setId(nestedSetId);
+ AnalysisProtos.DepSetOfFiles.Builder depSetBuilder =
+ AnalysisProtos.DepSetOfFiles.newBuilder().setId(nestedSetId);
for (NestedSetView<Artifact> transitiveNestedSet : nestedSetView.transitives()) {
depSetBuilder.addTransitiveDepSetIds(depSetToId(transitiveNestedSet));
}
@@ -875,14 +874,14 @@
if (!knownAspectDescriptors.containsKey(aspectDescriptor)) {
String aspectDescriptorId = String.valueOf(knownAspectDescriptors.size());
knownAspectDescriptors.put(aspectDescriptor, aspectDescriptorId);
- ActionGraphProtos.AspectDescriptor.Builder aspectDescriptorBuilder =
- ActionGraphProtos.AspectDescriptor.newBuilder()
+ AnalysisProtos.AspectDescriptor.Builder aspectDescriptorBuilder =
+ AnalysisProtos.AspectDescriptor.newBuilder()
.setId(aspectDescriptorId)
.setName(aspectDescriptor.getAspectClass().getName());
for (Entry<String, String> parameter :
aspectDescriptor.getParameters().getAttributes().entries()) {
- ActionGraphProtos.KeyValuePair.Builder keyValuePairBuilder =
- ActionGraphProtos.KeyValuePair.newBuilder();
+ AnalysisProtos.KeyValuePair.Builder keyValuePairBuilder =
+ AnalysisProtos.KeyValuePair.newBuilder();
keyValuePairBuilder
.setKey(parameter.getKey())
.setValue(parameter.getValue());
@@ -955,8 +954,8 @@
Preconditions.checkState(configuredTarget instanceof RuleConfiguredTarget);
Label label = configuredTarget.getLabel();
String ruleClassString = ((RuleConfiguredTarget) configuredTarget).getRuleClassString();
- ActionGraphProtos.Action.Builder actionBuilder =
- ActionGraphProtos.Action.newBuilder()
+ AnalysisProtos.Action.Builder actionBuilder =
+ AnalysisProtos.Action.newBuilder()
.setMnemonic(action.getMnemonic())
.setTargetId(actionGraphIdCache.targetToId(label, ruleClassString));
@@ -974,8 +973,8 @@
// environment as well.
ImmutableMap<String, String> fixedEnvironment = spawnAction.getEnvironment();
for (Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) {
- ActionGraphProtos.KeyValuePair.Builder keyValuePairBuilder =
- ActionGraphProtos.KeyValuePair.newBuilder();
+ AnalysisProtos.KeyValuePair.Builder keyValuePairBuilder =
+ AnalysisProtos.KeyValuePair.newBuilder();
keyValuePairBuilder
.setKey(environmentVariable.getKey())
.setValue(environmentVariable.getValue());
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index afc787b..ed4bfc5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -41,7 +41,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionContextFactory;
import com.google.devtools.build.lib.actions.ActionExecutionStatusReporter;
import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.actions.ActionGraphProtos.ActionGraphContainer;
import com.google.devtools.build.lib.actions.ActionInputFileCache;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionKeyContext;
@@ -55,6 +54,7 @@
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.FileStateType;
import com.google.devtools.build.lib.actions.ResourceManager;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
import com.google.devtools.build.lib.analysis.AspectCollection;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index cdb557a..2223fb5 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -14,7 +14,7 @@
FILES = [
"action_cache",
- "action_graph",
+ "analysis",
"android_deploy_info",
"bazel_flags",
"build",
diff --git a/src/main/protobuf/action_graph.proto b/src/main/protobuf/analysis.proto
similarity index 91%
rename from src/main/protobuf/action_graph.proto
rename to src/main/protobuf/analysis.proto
index fdb49d7..ec7e7fd 100644
--- a/src/main/protobuf/action_graph.proto
+++ b/src/main/protobuf/analysis.proto
@@ -14,10 +14,10 @@
syntax = "proto3";
-package action_graph;
+package analysis;
-option java_package = "com.google.devtools.build.lib.actions";
-option java_outer_classname = "ActionGraphProtos";
+option java_package = "com.google.devtools.build.lib.analysis";
+option java_outer_classname = "AnalysisProtos";
// Container for the action graph properties.
message ActionGraphContainer {
@@ -34,7 +34,7 @@
// file.
message Artifact {
// Identifier for this artifact; this is an opaque string, only valid for this
- // particular dump of the action graph.
+ // particular dump of the analysis.
string id = 1;
// The relative path of the file within the execution root.
@@ -88,7 +88,7 @@
// associated with an action.
message Target {
// Identifier for this target; this is an opaque string, only valid for this
- // particular dump of the action graph.
+ // particular dump of the analysis.
string id = 1;
// Label of the target, e.g. //foo:bar.
@@ -100,7 +100,7 @@
message RuleClass {
// Identifier for this rule class; this is an opaque string, only valid for
- // this particular dump of the action graph.
+ // this particular dump of the analysis.
string id = 1;
// Name of the rule class, e.g. cc_library.
@@ -110,7 +110,7 @@
// Represents an invocation specific descriptor of an aspect.
message AspectDescriptor {
// Identifier for this aspect descriptor; this is an opaque string, only valid
- // for the particular dump of the action graph.
+ // for the particular dump of the analysis.
string id = 1;
// The name of the corresponding aspect. For native aspects, it's the Java
@@ -126,7 +126,7 @@
message DepSetOfFiles {
// Identifier for this named set of files; this is an opaque string, only
- // valid for the particular dump of the action graph.
+ // valid for the particular dump of the analysis.
string id = 1;
// Other transitively included named set of files.
@@ -138,7 +138,7 @@
message Configuration {
// Identifier for this configuration; this is an opaque string, only valid for
- // the particular dump of the action graph.
+ // the particular dump of the analysis.
string id = 1;
// The mnemonic representing the build configuration.
