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) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java
index 1ea4c0f..bd280dd 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.packages.NoSuchTargetException;
import com.google.devtools.build.lib.pkgcache.ParseFailureListener;
import com.google.devtools.build.lib.skyframe.PrepareDepsOfPatternsValue.TargetPatternSequence;
+import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey;
import com.google.devtools.build.lib.syntax.Label;
import com.google.devtools.build.skyframe.SkyFunction;
import com.google.devtools.build.skyframe.SkyKey;
@@ -70,7 +71,7 @@
TargetPatternValue resultValue = Preconditions.checkNotNull(
(TargetPatternValue) targetPatternValuesByKey.get(key).get());
ResolvedTargets<Label> results = resultValue.getTargets();
- if (((TargetPatternValue.TargetPattern) key.argument()).isNegative()) {
+ if (((TargetPatternKey) key.argument()).isNegative()) {
builder.filter(Predicates.not(Predicates.in(results.getTargets())));
} else {
builder.merge(results);
@@ -101,7 +102,7 @@
private static void handleTargetParsingException(EventHandler eventHandler,
boolean handlerIsParseFailureListener, SkyKey key, TargetParsingException e) {
- TargetPatternValue.TargetPattern pattern = (TargetPatternValue.TargetPattern) key.argument();
+ TargetPatternKey pattern = (TargetPatternKey) key.argument();
String rawPattern = pattern.getPattern();
String errorMessage = e.getMessage();
eventHandler.handle(Event.error("Skipping '" + rawPattern + "': " + errorMessage));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
index 0ea6fc2..979f322 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
@@ -145,15 +145,15 @@
TargetPatternValue resultValue = result.get(key);
if (resultValue != null) {
ResolvedTargets<Label> results = resultValue.getTargets();
- if (((TargetPatternValue.TargetPattern) key.argument()).isNegative()) {
+ if (((TargetPatternValue.TargetPatternKey) key.argument()).isNegative()) {
resolvedLabelsBuilder.filter(Predicates.not(Predicates.in(results.getTargets())));
} else {
resolvedLabelsBuilder.merge(results);
}
} else {
- TargetPatternValue.TargetPattern pattern =
- (TargetPatternValue.TargetPattern) key.argument();
- String rawPattern = pattern.getPattern();
+ TargetPatternValue.TargetPatternKey patternKey =
+ (TargetPatternValue.TargetPatternKey) key.argument();
+ String rawPattern = patternKey.getPattern();
ErrorInfo error = result.errorMap().get(key);
if (error == null) {
Preconditions.checkState(!keepGoing);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
index 1f4a91e..97aef98 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
@@ -45,8 +45,8 @@
@Override
public SkyValue compute(SkyKey key, Environment env) throws TargetPatternFunctionException,
InterruptedException {
- TargetPatternValue.TargetPattern patternKey =
- ((TargetPatternValue.TargetPattern) key.argument());
+ TargetPatternValue.TargetPatternKey patternKey =
+ ((TargetPatternValue.TargetPatternKey) key.argument());
TargetPattern.Parser parser = new TargetPattern.Parser(patternKey.getOffset());
ResolvedTargets<Target> resolvedTargets = null;
try {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
index 50cdc9b..1463140 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
@@ -107,8 +107,8 @@
return new SkyKey(SkyFunctions.TARGET_PATTERN,
pattern.startsWith("-")
// Don't apply filters to negative patterns.
- ? new TargetPattern(pattern.substring(1), FilteringPolicies.NO_FILTER, true, offset)
- : new TargetPattern(pattern, policy, false, offset));
+ ? new TargetPatternKey(pattern.substring(1), FilteringPolicies.NO_FILTER, true, offset)
+ : new TargetPatternKey(pattern, policy, false, offset));
}
/**
@@ -135,19 +135,19 @@
}
/**
- * A TargetPattern is a tuple of pattern (eg, "foo/..."), filtering policy, a relative pattern
+ * A TargetPatternKey is a tuple of pattern (eg, "foo/..."), filtering policy, a relative pattern
* offset, and whether it is a positive or negative match.
*/
@ThreadSafe
- public static class TargetPattern implements Serializable {
+ public static class TargetPatternKey implements Serializable {
private final String pattern;
private final FilteringPolicy policy;
private final boolean isNegative;
private final String offset;
- public TargetPattern(String pattern, FilteringPolicy policy,
- boolean isNegative, String offset) {
+ public TargetPatternKey(String pattern, FilteringPolicy policy,
+ boolean isNegative, String offset) {
this.pattern = Preconditions.checkNotNull(pattern);
this.policy = Preconditions.checkNotNull(policy);
this.isNegative = isNegative;
@@ -182,10 +182,10 @@
@Override
public boolean equals(Object obj) {
- if (!(obj instanceof TargetPattern)) {
+ if (!(obj instanceof TargetPatternKey)) {
return false;
}
- TargetPattern other = (TargetPattern) obj;
+ TargetPatternKey other = (TargetPatternKey) obj;
return other.isNegative == this.isNegative && other.pattern.equals(this.pattern) &&
other.offset.equals(this.offset) && other.policy.equals(this.policy);
