commit 5ce05a01633e972eee6f3ed8e9de06c34ba1cd40
author Jakob Buchgraber <buchgr@google.com> Tue Feb 26 12:52:38 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 26 12:54:44 2019 -0800
tree 7fdae5f5456f0e1cf0fd30f98db4254f8f12a037
parent 54e70a02adc7848fe08a4a244fd012a0d7a86b12

retain the OutputStore when include scanning

this avoids information loss about injected output
metadata. this change resolves the TODO.

Progress towards #6862

Closes #7268.

PiperOrigin-RevId: 235774773

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
index 14530b4..f14c119 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
@@ -744,10 +744,6 @@
             state.inputArtifactData.putWithNoDepOwner(
                 ArtifactSkyKey.artifact(entry.getKey()), (FileArtifactValue) entry.getValue());
           }
-          // TODO(ulfjack): This causes information loss about omitted and injected outputs. Also
-          // see the documentation on MetadataHandler.artifactOmitted. This works by accident
-          // because markOmitted is only called for remote execution, and this code only gets
-          // executed for local execution.
           metadataHandler =
               new ActionMetadataHandler(
                   state.inputArtifactData,
@@ -755,7 +751,7 @@
                   action.getOutputs(),
                   tsgm.get(),
                   metadataHandler.getArtifactPathResolver(),
-                  state.actionFileSystem == null ? new OutputStore() : new MinimalOutputStore());
+                  metadataHandler.getOutputStore());
         }
       }
       Preconditions.checkState(!env.valuesMissing(), action);