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 ceb4b3958ec0f4..efe3e5a212c394 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/BUILD +++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD @@ -114,7 +114,7 @@ java_library( "//src/main/java/net/starlark/java/annot", "//src/main/java/net/starlark/java/eval", "//src/main/java/net/starlark/java/syntax", - "//src/main/protobuf:analysis_java_proto", + "//src/main/protobuf:analysis_v2_java_proto", "//src/main/protobuf:build_java_proto", "//src/main/protobuf:failure_details_java_proto", "//third_party:auto_value", diff --git a/src/main/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallback.java index bbd17c9c697861..5aa11791fa2c79 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallback.java +++ b/src/main/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallback.java @@ -16,7 +16,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; -import com.google.devtools.build.lib.analysis.AnalysisProtos; +import com.google.devtools.build.lib.analysis.AnalysisProtosV2; import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.ExtendedEventHandler; @@ -63,7 +63,7 @@ public String formatName() { private final SkyframeExecutor skyframeExecutor; private final JsonFormat.Printer jsonPrinter = JsonFormat.printer(); - private AnalysisProtos.CqueryResult.Builder protoResult; + private AnalysisProtosV2.CqueryResult.Builder protoResult; private KeyedConfiguredTarget currentTarget; @@ -83,7 +83,7 @@ public String formatName() { @Override public void start() { - protoResult = AnalysisProtos.CqueryResult.newBuilder(); + protoResult = AnalysisProtosV2.CqueryResult.newBuilder(); } @Override @@ -126,7 +126,7 @@ public String getName() { } @VisibleForTesting - public AnalysisProtos.CqueryResult getProtoResult() { + public AnalysisProtosV2.CqueryResult getProtoResult() { return protoResult.build(); } @@ -136,8 +136,8 @@ public void processOutput(Iterable partialResult) ConfiguredProtoOutputFormatter formatter = new ConfiguredProtoOutputFormatter(); formatter.setOptions(options, resolver, skyframeExecutor.getHashFunction()); for (KeyedConfiguredTarget keyedConfiguredTarget : partialResult) { - AnalysisProtos.ConfiguredTarget.Builder builder = - AnalysisProtos.ConfiguredTarget.newBuilder(); + AnalysisProtosV2.ConfiguredTarget.Builder builder = + AnalysisProtosV2.ConfiguredTarget.newBuilder(); // Re: testing. Since this formatter relies on the heavily tested ProtoOutputFormatter class // for all its work with targets, ProtoOuputFormatterCallbackTest doesn't test any of the @@ -149,7 +149,7 @@ public void processOutput(Iterable partialResult) if (options.protoIncludeConfigurations) { String checksum = keyedConfiguredTarget.getConfigurationChecksum(); builder.setConfiguration( - AnalysisProtos.Configuration.newBuilder().setChecksum(String.valueOf(checksum))); + AnalysisProtosV2.Configuration.newBuilder().setChecksum(String.valueOf(checksum))); } protoResult.addResults(builder.build()); diff --git a/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD b/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD index f849edb84d2eb4..0a1817c8061a20 100644 --- a/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD +++ b/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD @@ -130,7 +130,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/query2/engine", "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers", "//src/main/java/com/google/devtools/build/lib/util:filetype", - "//src/main/protobuf:analysis_java_proto", + "//src/main/protobuf:analysis_v2_java_proto", "//src/main/protobuf:build_java_proto", "//src/test/java/com/google/devtools/build/lib/analysis/util", "//src/test/java/com/google/devtools/build/lib/query2/testutil", diff --git a/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java b/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java index d0d6e8e5eccf0b..0cc0cd6bf5b581 100644 --- a/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java +++ b/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java @@ -19,7 +19,7 @@ import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; -import com.google.devtools.build.lib.analysis.AnalysisProtos; +import com.google.devtools.build.lib.analysis.AnalysisProtosV2; import com.google.devtools.build.lib.analysis.config.TransitionFactories; import com.google.devtools.build.lib.analysis.util.MockRule; import com.google.devtools.build.lib.events.Event; @@ -91,7 +91,7 @@ public void testSelectInAttribute() throws Exception { " values = {'foo': 'cat'}", ")"); - AnalysisProtos.ConfiguredTarget myRuleProto = + AnalysisProtosV2.ConfiguredTarget myRuleProto = (Iterables.getOnlyElement(getOutput("//test:my_rule").getResultsList())); List attributes = myRuleProto.getTarget().getRule().getAttributeList(); for (Build.Attribute attribute : attributes) { @@ -141,7 +141,7 @@ public void testConfigurationHash() throws Exception { "simple_rule(name = 'dep')"); // Assert checksum from proto is proper checksum. - AnalysisProtos.ConfiguredTarget myRuleProto = + AnalysisProtosV2.ConfiguredTarget myRuleProto = Iterables.getOnlyElement(getOutput("//test:my_rule").getResultsList()); KeyedConfiguredTarget myRule = Iterables.getOnlyElement(eval("//test:my_rule")); @@ -149,11 +149,11 @@ public void testConfigurationHash() throws Exception { .isEqualTo(myRule.getConfigurationChecksum()); // Assert checksum for two configured targets in proto are not the same. - List protoDeps = + List protoDeps = getOutput("deps(//test:my_rule)").getResultsList(); assertThat(protoDeps).hasSize(2); - Iterator protoDepsIterator = protoDeps.iterator(); + Iterator protoDepsIterator = protoDeps.iterator(); assertThat(protoDepsIterator.next().getConfiguration().getChecksum()) .isNotEqualTo(protoDepsIterator.next().getConfiguration().getChecksum()); } @@ -166,7 +166,7 @@ public void testAlias() throws Exception { "simple_rule(name = 'my_rule')", "alias(name = 'my_alias', actual = ':my_rule')"); - AnalysisProtos.ConfiguredTarget alias = + AnalysisProtosV2.ConfiguredTarget alias = Iterables.getOnlyElement(getOutput("//test:my_alias").getResultsList()); assertThat(alias.getTarget().getRule().getName()).isEqualTo("//test:my_alias"); @@ -196,7 +196,7 @@ public void testAlias_withSelect() throws Exception { getHelper().useConfiguration("--foo=woof"); helper.setQuerySettings(Setting.NO_IMPLICIT_DEPS); - List myAliasRuleProto = + List myAliasRuleProto = getOutput("deps(//test:my_alias_rule)").getResultsList(); List depNames = new ArrayList<>(myAliasRuleProto.size()); @@ -210,7 +210,7 @@ private MockRule getSimpleRule() { return () -> MockRule.define("simple_rule"); } - private AnalysisProtos.CqueryResult getOutput(String queryExpression) throws Exception { + private AnalysisProtosV2.CqueryResult getOutput(String queryExpression) throws Exception { QueryExpression expression = QueryParser.parse(queryExpression, getDefaultFunctions()); Set targetPatternSet = new LinkedHashSet<>(); expression.collectTargetPatterns(targetPatternSet);