commit 73b4c40d9670aa94606f34c32389622b1aaf395e
author Googler <noreply@google.com> Fri Jun 05 10:04:55 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 05 10:06:11 2020 -0700
tree cbe590dce1d0a05a66ee06c2766c28de789355e8
parent 241d600cc404ee920c2e42bb072d064f6cca907a

Skip a lookup for action template expansion outputs.

This resolves a TODO now that we have a method to distinguish between the two types of TreeFileArtifacts. Template expansion outputs won't be stored in a tree artifact, so we can skip that lookup for them.

RELNOTES: None.
PiperOrigin-RevId: 314947630

src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
index ed3404f..7614571 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
@@ -267,8 +267,7 @@
     }
     // This artifact was not injected directly to the store, but it may have been injected as part
     // of a tree artifact.
-    // TODO(jhorvitz): We can skip this for action template expansion artifacts.
-    if (artifact.hasParent()) {
+    if (artifact.isChildOfDeclaredDirectory()) {
       TreeArtifactValue tree = store.getTreeArtifactData(artifact.getParent());
       if (tree != null) {
         value = tree.getChildValues().get(artifact);