Refactor TargetPatternPhaseFunction

- Make TargetPatternPhaseKey implement SkyKey
- Move the TargetParsingCompleteEvent posting into the function
- Split the time reporting out into TargetParsingPhaseTimeEvent

PiperOrigin-RevId: 162475743

2 files changed, 29 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
index 2a0763b8fc..64d4eb1f1e 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
@@ -36,7 +36,6 @@ public class TargetParsingCompleteEvent implements BuildEvent {
   private final ImmutableSet<Target> filteredTargets;
   private final ImmutableSet<Target> testFilteredTargets;
   private final ImmutableSet<Target> expandedTargets;
-  private final long timeInMs;
 
   /**
    * Construct the event.
@@ -47,10 +46,8 @@ public class TargetParsingCompleteEvent implements BuildEvent {
       Collection<Target> targets,
       Collection<Target> filteredTargets,
       Collection<Target> testFilteredTargets,
-      long timeInMs,
       List<String> originalTargetPattern,
       Collection<Target> expandedTargets) {
-    this.timeInMs = timeInMs;
     this.targets = ImmutableSet.copyOf(targets);
     this.filteredTargets = ImmutableSet.copyOf(filteredTargets);
     this.testFilteredTargets = ImmutableSet.copyOf(testFilteredTargets);
@@ -64,7 +61,6 @@ public class TargetParsingCompleteEvent implements BuildEvent {
         targets,
         ImmutableSet.<Target>of(),
         ImmutableSet.<Target>of(),
-        0,
         ImmutableList.<String>of(),
         targets);
   }
@@ -94,10 +90,6 @@ public class TargetParsingCompleteEvent implements BuildEvent {
     return testFilteredTargets;
   }
 
-  public long getTimeInMs() {
-    return timeInMs;
-  }
-
   @Override
   public BuildEventId getEventId() {
     return BuildEventId.targetPatternExpanded(originalTargetPattern);
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingPhaseTimeEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingPhaseTimeEvent.java
new file mode 100644
index 0000000000..7c70b28d19
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingPhaseTimeEvent.java
@@ -0,0 +1,29 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.pkgcache;
+
+import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable;
+
+/** This event is fired just after target pattern evaluation is completed. */
+public class TargetParsingPhaseTimeEvent implements Postable {
+  private final long timeInMs;
+
+  public TargetParsingPhaseTimeEvent(long timeInMs) {
+    this.timeInMs = timeInMs;
+  }
+
+  public long getTimeInMs() {
+    return timeInMs;
+  }
+}