Rename skyframe's TargetPattern to TargetPatternKey
There were two TargetPattern types, one in cmdline and one in skyframe.
This made things more confusing than they needed to be.
--
MOS_MIGRATED_REVID=94005358
diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index ebc2c96..ec84e1f 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -337,8 +337,8 @@
SkyKey patternKey = TargetPatternValue.key(pattern,
TargetPatternEvaluator.DEFAULT_FILTERING_POLICY, parserPrefix);
- TargetPatternValue.TargetPattern targetPattern =
- ((TargetPatternValue.TargetPattern) patternKey.argument());
+ TargetPatternValue.TargetPatternKey targetPatternKey =
+ ((TargetPatternValue.TargetPatternKey) patternKey.argument());
TargetParsingException targetParsingException = null;
if (graph.exists(patternKey)) {
@@ -361,11 +361,11 @@
} else {
// If the graph doesn't contain a value for this target pattern, try to directly evaluate
// it, by making use of packages already present in the graph.
- TargetPattern.Parser parser = new TargetPattern.Parser(targetPattern.getOffset());
+ TargetPattern.Parser parser = new TargetPattern.Parser(targetPatternKey.getOffset());
RecursivePackageProviderBackedTargetPatternResolver resolver =
new RecursivePackageProviderBackedTargetPatternResolver(provider, eventHandler,
- targetPattern.getPolicy(), pkgPath);
- TargetPattern parsedPattern = parser.parse(targetPattern.getPattern());
+ targetPatternKey.getPolicy(), pkgPath);
+ TargetPattern parsedPattern = parser.parse(targetPatternKey.getPattern());
try {
result.put(pattern, parsedPattern.eval(resolver));
} catch (TargetParsingException e) {
