commit dee781c6ab798818bf5bad2ec1b662f8849799f8
author Michajlo Matijkiw <michajlo@google.com> Fri May 22 23:25:34 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue May 26 08:12:11 2015 +0000
tree 140a93b51050972f0456fc42053a590437f8fa93
parent dfc9b62faa9e512df72bf8c8edca58e62d9d7160

Add runfiles to metadata caches and make them isFile aware

--
MOS_MIGRATED_REVID=94318260

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 7275222..59224fb 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
@@ -199,7 +199,7 @@
       throw new FileNotFoundException(artifact.prettyPrint() + " does not exist");
     }
     boolean isFile = data.isFile();
-    boolean useDigest = DigestUtils.useFileDigest(artifact, isFile, isFile ? data.getSize() : 0);
+    boolean useDigest = DigestUtils.useFileDigest(isFile, isFile ? data.getSize() : 0);
     if (useDigest && data.getDigest() != null) {
       // We do not need to store the FileArtifactValue separately -- the digest is in the file value
       // and that is all that is needed for this file's metadata.
@@ -301,7 +301,7 @@
     // Currently this method is used only for genrule input directory checks. If we need to call
     // this on output artifacts too, this could be more efficient.
     FileArtifactValue value = getInputFileArtifactValue(artifact);
-    if (value != null && value.getDigest() != null) {
+    if (value != null && value.isFile()) {
       return true;
     }
     return artifact.getPath().isFile();