Make TargetPatternKey implement SkyKey instead of wrapping in LegacySkyKey

Makes for much nicer client code.

PiperOrigin-RevId: 162454439

1 files changed, 8 insertions, 10 deletions

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 a0ccc8894c..c84e84946c 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
@@ -26,12 +26,12 @@ import com.google.devtools.build.lib.pkgcache.FilteringPolicies;
 import com.google.devtools.build.lib.pkgcache.FilteringPolicy;
 import com.google.devtools.build.lib.pkgcache.ParsingFailedEvent;
 import com.google.devtools.build.lib.pkgcache.TargetPatternEvaluator;
+import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey;
 import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternSkyKeyOrException;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.skyframe.ErrorInfo;
 import com.google.devtools.build.skyframe.EvaluationResult;
-import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.WalkableGraph;
 import java.util.Collection;
 import java.util.List;
@@ -105,7 +105,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
     Iterable<TargetPatternSkyKeyOrException> keysMaybe =
         TargetPatternValue.keys(targetPatterns, policy, offset);
 
-    ImmutableList.Builder<SkyKey> builder = ImmutableList.builder();
+    ImmutableList.Builder<TargetPatternKey> builder = ImmutableList.builder();
     for (TargetPatternSkyKeyOrException skyKeyOrException : keysMaybe) {
       try {
         builder.add(skyKeyOrException.getSkyKey());
@@ -122,7 +122,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
         eventHandler.handle(Event.error("Skipping '" + pattern + "': " + e.getMessage()));
       }
     }
-    ImmutableList<SkyKey> skyKeys = builder.build();
+    ImmutableList<TargetPatternKey> skyKeys = builder.build();
     return parseTargetPatternKeys(
         targetPatterns,
         skyKeys,
@@ -140,9 +140,9 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
         : new BuildTargetPatternsResultBuilder();
   }
 
-  ResolvedTargets<Target> parseTargetPatternKeys(
+  private ResolvedTargets<Target> parseTargetPatternKeys(
       List<String> targetPattern,
-      Iterable<SkyKey> patternSkyKeys,
+      Iterable<TargetPatternKey> patternSkyKeys,
       int numThreads,
       boolean keepGoing,
       ExtendedEventHandler eventHandler,
@@ -152,19 +152,17 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
         skyframeExecutor.targetPatterns(patternSkyKeys, numThreads, keepGoing, eventHandler);
 
     String errorMessage = null;
-    for (SkyKey key : patternSkyKeys) {
+    for (TargetPatternKey key : patternSkyKeys) {
       TargetPatternValue resultValue = result.get(key);
       if (resultValue != null) {
         ResolvedTargets<Label> results = resultValue.getTargets();
-        if (((TargetPatternValue.TargetPatternKey) key.argument()).isNegative()) {
+        if (key.isNegative()) {
           finalTargetSetEvaluator.addLabelsOfNegativePattern(results);
         } else {
           finalTargetSetEvaluator.addLabelsOfPositivePattern(results);
         }
       } else {
-        TargetPatternValue.TargetPatternKey patternKey =
-            (TargetPatternValue.TargetPatternKey) key.argument();
-        String rawPattern = patternKey.getPattern();
+        String rawPattern = key.getPattern();
         ErrorInfo error = result.errorMap().get(key);
         if (error == null) {
           Preconditions.checkState(!keepGoing);