Expand `ActionExecutionMetadata.getKey()` method to accept an ArtifactExpander.
Computing a key which uniquely identifies whether 2 actions are equal is
generally impossible without the ability to expand tree artifacts. The source of
the problem happens for Starlark-defined actions which use `Args.add_all` with
a custom `map_each` function and `expand_directories` option enabled. For such
functions, we cannot know the real output of the execution until we can expand
the directory arguments.
Please consider an example:
```
def f(file):
if file.is_directory():
return file.path
return file.path + '_suffix'
directory = ... # input directory
args = ctx.actions.args()
args.add_all([directory], map_each=f, expand_directories=True)
ctx.actions.run(..., inputs=[directory], arguments=args)
```
If we make a change to `f`, which only affects the behavior for files, we
cannot detect that without actually expanding the directory:
```
def f(file):
if file.is_directory():
return file.path
return file.path + '_different_suffix'
```
Technically, we could have a digest identifying Starlark code and base the key
on that, but that is a feature which would limit the ability to expand Starlark
in the future and it does not fit the overall design of it. Additionally to
that, we could theoretically change the function in a way which does not affect
the output for the contents of a given directory, which would lead to
false-positive changes to the key. Due to those concerns, the solution to this
problem is to provide the artifact expander so that we can actually run the
Starlark function with the same parameters as if we were to construct the
command line.
This is a pure refactoring change in preparation to provide a fix for the bug.
We are adding an optional `ArtifactExpander` parameter which will only be used
in the future and, until then, is always null.
PiperOrigin-RevId: 320025538
diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index 10c5165..982afbb 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -471,7 +471,7 @@
ExtraActionInfo.Builder result =
ExtraActionInfo.newBuilder()
.setOwner(owner.getLabel().toString())
- .setId(getKey(actionKeyContext))
+ .setId(getKey(actionKeyContext, /*artifactExpander=*/ null))
.setMnemonic(getMnemonic());
Iterable<AspectDescriptor> aspectDescriptors = owner.getAspectDescriptors();
AspectDescriptor lastAspect = null;
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionAnalysisMetadata.java b/src/main/java/com/google/devtools/build/lib/actions/ActionAnalysisMetadata.java
index 4141183..fce3fb2 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionAnalysisMetadata.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionAnalysisMetadata.java
@@ -15,6 +15,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import java.util.Map;
@@ -85,8 +86,16 @@
*
* <p>Note the following exception: for actions that discover inputs, the key must change if any
* input names change or else action validation may falsely validate.
+ *
+ * <p>In case the {@link ArtifactExpander} is not provided, the key is not guaranteed to be
+ * correct. In fact, getting the key of an action is generally impossible until we have all the
+ * information necessary to execute the action. An example of this is when arguments to an action
+ * are defined as a lazy evaluation of Starlark over outputs of another action, after expanding
+ * directories. In such case, if the dependent action outputs a tree artifact, creating a truly
+ * unique key will depend on knowing the tree artifact contents. At analysis time, we only know
+ * about the tree artifact directory and we find what is in it only after we execute that action.
*/
- String getKey(ActionKeyContext actionKeyContext);
+ String getKey(ActionKeyContext actionKeyContext, @Nullable ArtifactExpander artifactExpander);
/**
* Returns a pretty string representation of this action, suitable for use in
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
index 8aad9ce..1ad94cf 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
@@ -337,7 +337,9 @@
reportChanged(handler, action);
actionCache.accountMiss(MissReason.DIFFERENT_FILES);
return true;
- } else if (!entry.getActionKey().equals(action.getKey(actionKeyContext))) {
+ } else if (!entry
+ .getActionKey()
+ .equals(action.getKey(actionKeyContext, /*artifactExpander=*/ null))) {
reportCommand(handler, action);
actionCache.accountMiss(MissReason.DIFFERENT_ACTION_KEY);
return true;
@@ -396,7 +398,9 @@
computeUsedEnv(action, clientEnv, remoteDefaultPlatformProperties);
ActionCache.Entry entry =
new ActionCache.Entry(
- action.getKey(actionKeyContext), usedEnvironment, action.discoversInputs());
+ action.getKey(actionKeyContext, /*artifactExpander=*/ null),
+ usedEnvironment,
+ action.discoversInputs());
for (Artifact output : action.getOutputs()) {
// Remove old records from the cache if they used different key.
String execPath = output.getExecPathString();
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionKeyCacher.java b/src/main/java/com/google/devtools/build/lib/actions/ActionKeyCacher.java
index 6992fec..b095660 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionKeyCacher.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionKeyCacher.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.actions;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.util.Fingerprint;
import javax.annotation.Nullable;
@@ -25,13 +26,16 @@
@Nullable private volatile String cachedKey = null;
@Override
- public final String getKey(ActionKeyContext actionKeyContext) {
+ public final String getKey(
+ ActionKeyContext actionKeyContext, @Nullable ArtifactExpander artifactExpander) {
if (cachedKey == null) {
synchronized (this) {
if (cachedKey == null) {
try {
Fingerprint fp = new Fingerprint();
- computeKey(actionKeyContext, fp);
+ // TODO(b/153904017): Make use of the provided artifactExpander and only cache if
+ // present.
+ computeKey(actionKeyContext, /*artifactExpander=*/ null, fp);
// Add a bool indicating whether the execution platform was set.
fp.addBoolean(getExecutionPlatform() != null);
@@ -61,6 +65,9 @@
* the ActionAnalysisMetadata. Perhaps ActionKeyCacher should just mandate subclasses provide a
* UUID and then add that UUID itself in getKey.
*/
- protected abstract void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected abstract void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException;
}
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Actions.java b/src/main/java/com/google/devtools/build/lib/actions/Actions.java
index 52eb3c4..a656568 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Actions.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Actions.java
@@ -76,7 +76,9 @@
Action actionA = (Action) a;
Action actionB = (Action) b;
- if (!actionA.getKey(actionKeyContext).equals(actionB.getKey(actionKeyContext))) {
+ if (!actionA
+ .getKey(actionKeyContext, /*artifactExpander=*/ null)
+ .equals(actionB.getKey(actionKeyContext, /*artifactExpander=*/ null))) {
return false;
}
// Don't bother to check input and output counts first; the expected result for these tests is
diff --git a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
index 3b6e9b8..dc2a280 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
@@ -14,6 +14,7 @@
package com.google.devtools.build.lib.actions;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -23,6 +24,7 @@
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.util.DetailedExitCode;
import com.google.devtools.build.lib.util.Fingerprint;
+import javax.annotation.Nullable;
/**
* FailAction is an Action that always fails to execute. (Used as scaffolding for rules we haven't
@@ -66,7 +68,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
}
diff --git a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
index e67f799..b627d07 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
@@ -16,12 +16,14 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
import com.google.devtools.build.lib.util.Fingerprint;
+import javax.annotation.Nullable;
/**
* An action that depends on a set of inputs and creates a single output file whenever it runs. This
@@ -57,7 +59,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
// TODO(bazel-team): Need to take middlemanType into account here.
// Only the set of inputs matters, and the dependency checker is
// responsible for considering those.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java b/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
index a7cc6fa..3d2d83f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
@@ -172,7 +172,9 @@
}
private static String getKey(ActionKeyContext actionKeyContext, ActionAnalysisMetadata action) {
- return action instanceof Action ? ((Action) action).getKey(actionKeyContext) : null;
+ return action instanceof Action
+ ? ((Action) action).getKey(actionKeyContext, /*artifactExpander=*/ null)
+ : null;
}
// See also Actions.canBeShared()
diff --git a/src/main/java/com/google/devtools/build/lib/actionsketch/Sketches.java b/src/main/java/com/google/devtools/build/lib/actionsketch/Sketches.java
index 1f82283..ad5b4cd 100644
--- a/src/main/java/com/google/devtools/build/lib/actionsketch/Sketches.java
+++ b/src/main/java/com/google/devtools/build/lib/actionsketch/Sketches.java
@@ -34,7 +34,8 @@
*/
public static BigInteger computeActionKey(
ActionAnalysisMetadata action, ActionKeyContext keyContext) {
- Hasher hasher = newHasher().putUnencodedChars(action.getKey(keyContext));
+ Hasher hasher =
+ newHasher().putUnencodedChars(action.getKey(keyContext, /*artifactExpander=*/ null));
for (Artifact output : action.getOutputs()) {
hasher.putUnencodedChars(output.getExecPath().getPathString());
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 4a976bc..02925d8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -1224,6 +1224,7 @@
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/util",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
@@ -1300,6 +1301,7 @@
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/util",
+ "//third_party:jsr305",
],
)
@@ -1313,6 +1315,7 @@
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/util",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
@@ -1330,6 +1333,7 @@
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/protobuf:failure_details_java_proto",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
@@ -1354,6 +1358,7 @@
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
@@ -1984,6 +1989,7 @@
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/protobuf:failure_details_java_proto",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
index 8c43ba2..b9ef8bd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
@@ -34,6 +34,7 @@
import com.google.protobuf.MessageLite;
import java.util.Collection;
import java.util.UUID;
+import javax.annotation.Nullable;
/**
* An action that is inserted into the build graph only to provide info
@@ -83,7 +84,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addUUID(uuid);
fp.addBytes(getInfo().toByteArray());
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
index dbc1470..d2482f4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
@@ -190,7 +190,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addBoolean(remotableSourceManifestActions);
runfiles.fingerprint(fp);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java
index 599e856..cfe01f5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java
@@ -22,6 +22,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -29,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import javax.annotation.Nullable;
/**
* Action to write a binary file.
@@ -73,7 +75,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addString(String.valueOf(makeExecutable));
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
index 15aa1e8..e436eea 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
@@ -35,6 +35,7 @@
import java.io.OutputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import javax.annotation.Nullable;
/**
* Action to write a file whose contents are known at analysis time.
@@ -252,7 +253,10 @@
/** Computes the Action key for this action by computing the fingerprint for the file contents. */
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addString(String.valueOf(makeExecutable));
fp.addString(getFileContents());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
index e0fbf18..7a72d63 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
@@ -21,6 +21,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -90,7 +91,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addPath(this.launcher.getExecPath());
fp.addString(this.launchInfo.fingerPrint);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWriteNestedSetOfPairAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWriteNestedSetOfPairAction.java
index 4ab985c..49eee16 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWriteNestedSetOfPairAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWriteNestedSetOfPairAction.java
@@ -20,6 +20,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -27,6 +28,7 @@
import com.google.devtools.build.lib.util.Pair;
import java.io.IOException;
import java.io.OutputStream;
+import javax.annotation.Nullable;
/**
* Lazily writes the content of a nested set of pairsToWrite to an output file.
@@ -34,7 +36,6 @@
* <p>For each pair <string1, string2> it writes a line string1:string2 to the output file.
*/
public final class LazyWriteNestedSetOfPairAction extends AbstractFileWriteAction {
- private static final String GUID = "cd68d80a-16fc-41dc-a3dd-ded5aa5f601f";
private final NestedSet<Pair<String, String>> pairsToWrite;
private String fileContents;
@@ -58,7 +59,10 @@
/** Computes the Action key for this action by computing the fingerprint for the file contents. */
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
actionKeyContext.addNestedSetToFingerprint(fp, pairsToWrite);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWritePathsFileAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWritePathsFileAction.java
index daa5e8b..e3462ba 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWritePathsFileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LazyWritePathsFileAction.java
@@ -22,12 +22,14 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.util.Fingerprint;
import java.io.IOException;
import java.io.OutputStream;
+import javax.annotation.Nullable;
/**
* Lazily writes the exec path of the given files separated by newline into a specified output file.
@@ -76,7 +78,10 @@
/** Computes the Action key for this action by computing the fingerprint for the file contents. */
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addBoolean(includeDerivedArtifacts);
fp.addString(getContents());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
index 92162aa..226eaf4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
@@ -45,6 +45,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import javax.annotation.Nullable;
/** Action to write a parameter file for a {@link CommandLine}. */
@Immutable // if commandLine is immutable
@@ -173,7 +174,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
fp.addString(GUID);
fp.addString(String.valueOf(makeExecutable));
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index 7a6a8f9..ffb775f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -437,7 +437,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
fp.addString(GUID);
commandLines.addToFingerprint(actionKeyContext, fp);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplate.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplate.java
index 9d76fa5..8611f70 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplate.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplate.java
@@ -26,6 +26,7 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.ActionTemplate;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
import com.google.devtools.build.lib.actions.CommandLine;
@@ -38,6 +39,7 @@
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.Map;
+import javax.annotation.Nullable;
/** An {@link ActionTemplate} that expands into {@link SpawnAction}s at execution time. */
public final class SpawnActionTemplate extends ActionKeyCacher
@@ -119,7 +121,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
TreeFileArtifact inputTreeFileArtifact =
TreeFileArtifact.createTreeOutput(inputTreeArtifact, "dummy_for_key");
@@ -130,7 +135,7 @@
ActionTemplateExpansionValue.key(
outputTreeArtifact.getArtifactOwner(), /*actionIndex=*/ 0));
SpawnAction dummyAction = createAction(inputTreeFileArtifact, outputTreeFileArtifact);
- dummyAction.computeKey(actionKeyContext, fp);
+ dummyAction.computeKey(actionKeyContext, artifactExpander, fp);
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
index 19304fe..9c7cadd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
@@ -24,6 +24,7 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.ActionResult;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.server.FailureDetails;
@@ -281,7 +282,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
// We don't normally need to add inputs to the key. In this case, however, the inputPath can be
// different from the actual input artifact.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
index ce05c09..a0bea51 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
@@ -165,7 +165,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addNullableString(filesetRoot);
fp.addBoolean(enableRunfiles);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
index 9b75cf5..6f61b29 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
@@ -28,6 +28,7 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.ActionResult;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.ArtifactPathResolver;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.SpawnContinuation;
@@ -181,7 +182,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addString(String.valueOf(makeExecutable));
fp.addString(template.getKey());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
index 7b86e16..c9def4d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
@@ -20,6 +20,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.CommandLineExpansionException;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.UserExecException;
@@ -34,6 +35,7 @@
import com.google.devtools.build.lib.server.FailureDetails.Spawn.Code;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.util.Fingerprint;
+import javax.annotation.Nullable;
/**
* Requests extra action info from shadowed action and writes it, in protocol buffer format, to an
@@ -76,10 +78,13 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
fp.addString(UUID);
- fp.addString(shadowedAction.getKey(actionKeyContext));
+ fp.addString(shadowedAction.getKey(actionKeyContext, artifactExpander));
fp.addBytes(shadowedAction.getExtraActionInfo(actionKeyContext).build().toByteArray());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionSpec.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionSpec.java
index 5d3e8a1..d22c659 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionSpec.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionSpec.java
@@ -130,7 +130,7 @@
String actionUniquifier =
actionToShadow.getPrimaryOutput().getExecPath().getBaseName()
+ "."
- + actionToShadow.getKey(owningRule.getActionKeyContext());
+ + actionToShadow.getKey(owningRule.getActionKeyContext(), /*artifactExpander=*/ null);
BashCommandConstructor constructor =
CommandHelper.buildBashCommandConstructor(
executionInfo, shExecutable, "." + actionUniquifier + ".extra_action_script.sh");
@@ -244,7 +244,7 @@
for (AspectDescriptor aspectDescriptor : aspectDescriptors) {
f.addString(aspectDescriptor.getDescription());
}
- f.addString(action.getKey(actionKeyContext));
+ f.addString(action.getKey(actionKeyContext, /*artifactExpander=*/ null));
return f.hexDigestAndReset();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/BaselineCoverageAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/BaselineCoverageAction.java
index 9cd30f9..b482c85 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/BaselineCoverageAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/BaselineCoverageAction.java
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
+import javax.annotation.Nullable;
/** Generates baseline (empty) coverage for the given non-test target. */
@VisibleForTesting
@@ -60,7 +61,10 @@
}
@Override
- public void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ public void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
// TODO(b/150305897): No UUID?
// TODO(b/150308417): Sort?
Artifacts.addToFingerprint(fp, instrumentedFiles.toList());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFileManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFileManifestAction.java
index db6f772..001fbaf 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFileManifestAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFileManifestAction.java
@@ -36,6 +36,7 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Arrays;
+import javax.annotation.Nullable;
/**
* Writes a manifest of instrumented source and metadata files.
@@ -76,7 +77,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
// TODO(b/150305897): use addUUID?
fp.addString(GUID);
// TODO(b/150308417): Not sorting is probably cheaper, might lead to unnecessary re-execution.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index 2fb04db..df0ad4e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
@@ -333,7 +333,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
// TODO(b/150305897): use addUUID?
fp.addString(GUID);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
index b491c94..bc0703e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
@@ -102,6 +102,7 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:failure_details_java_proto",
"//third_party:guava",
+ "//third_party:jsr305",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
index 8727680..49a7837 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
@@ -63,6 +63,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.TreeMap;
+import javax.annotation.Nullable;
/**
* Provides information about the workspace (e.g. source control context, current machine, current
@@ -249,7 +250,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {}
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {}
@Override
public boolean executeUnconditionally() {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
index 4de0391..359975b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
@@ -27,6 +27,7 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.ActionResult;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.ArtifactFactory;
import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.ArtifactRoot;
@@ -159,7 +160,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addStrings(command);
}
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java b/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
index 063c534..a4dfb1c 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
@@ -32,6 +32,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.ArtifactPathResolver;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.ExecutionRequirements;
@@ -241,7 +242,8 @@
}
@Override
- public String getKey(ActionKeyContext actionKeyContext) {
+ public String getKey(
+ ActionKeyContext actionKeyContext, @Nullable ArtifactExpander artifactExpander) {
throw new UnsupportedOperationException();
}
diff --git a/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphTextOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphTextOutputFormatterCallback.java
index 333bc6a..b95ce64 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphTextOutputFormatterCallback.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphTextOutputFormatterCallback.java
@@ -175,7 +175,7 @@
ActionExecutionMetadata actionExecutionMetadata = (ActionExecutionMetadata) action;
stringBuilder
.append(" ActionKey: ")
- .append(actionExecutionMetadata.getKey(actionKeyContext))
+ .append(actionExecutionMetadata.getKey(actionKeyContext, /*artifactExpander=*/ null))
.append('\n');
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java
index 2429cf6..7bacbb2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployInfoAction.java
@@ -35,6 +35,7 @@
import com.google.protobuf.InvalidProtocolBufferException;
import java.io.IOException;
import java.io.InputStream;
+import javax.annotation.Nullable;
/**
* Writes AndroidDeployInfo proto message. This proto describes how to deploy and launch an
@@ -116,7 +117,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
try (InputStream in = getByteString().newInput()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java
index 42db5a5..8885796 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java
@@ -33,6 +33,7 @@
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
/**
* An action that writes the a parameter file to {@code incremental_install.py} based on the command
@@ -178,7 +179,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index 60609d9..b908b35 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -1308,7 +1308,10 @@
/** For actions that discover inputs, the key must include input names. */
@Override
- public void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ public void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
computeKey(
actionKeyContext,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
index c4af6bc..e8e873c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
@@ -147,7 +147,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
CompileCommandLine commandLine =
CppCompileAction.buildCommandLine(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
index 87dd6d6..df38b54 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -362,7 +362,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
fp.addString(LINK_GUID);
fp.addString(ldExecutable.getPathString());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
index 5f012d5..492c4a6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
@@ -38,6 +38,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import javax.annotation.Nullable;
/**
* Creates C++ module map artifact genfiles. These are then passed to Clang to do dependency
@@ -230,7 +231,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addInt(privateHeaders.size());
for (Artifact artifact : privateHeaders) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
index 6b58460..46b6a4f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
@@ -39,6 +39,7 @@
import java.io.IOException;
import java.util.Map;
import java.util.SortedMap;
+import javax.annotation.Nullable;
/** This action creates a set of symbolic links. */
@AutoCodec
@@ -98,7 +99,10 @@
}
@Override
- public void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ public void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
for (Map.Entry<Artifact, Artifact> entry : symlinks.entrySet()) {
fp.addPath(entry.getKey().getExecPath());
fp.addPath(entry.getValue().getExecPath());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java
index 8a02b59..118d0c3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java
@@ -207,7 +207,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
try {
fp.addStrings(getArguments());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
index 2b92640..f3b1ec8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
@@ -43,6 +43,7 @@
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.io.IOException;
+import javax.annotation.Nullable;
/**
* Creates mangled symlinks in the solib directory for all shared libraries. Libraries that have a
@@ -92,7 +93,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addPath(symlink.getExecPath());
fp.addPath(getPrimaryInput().getExecPath());
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/UmbrellaHeaderAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/UmbrellaHeaderAction.java
index 78e1ba7..ac216f5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/UmbrellaHeaderAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/UmbrellaHeaderAction.java
@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import javax.annotation.Nullable;
/**
* Action for generating an umbrella header. All the headers are #included in the umbrella header.
@@ -122,7 +123,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addPath(umbrellaHeader.getExecPath());
fp.addInt(publicHeaders.size());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java
index 3670d8c..5031b5a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java
@@ -39,6 +39,7 @@
import java.io.Writer;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.annotation.Nullable;
/**
* An action that creates a C++ header containing the build information in the form of #define
@@ -147,7 +148,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addBoolean(writeStableInfo);
fp.addBoolean(writeVolatileInfo);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
index 0de2e1a..2489896 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
@@ -28,6 +28,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
@@ -426,7 +427,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
result.fingerprint(fp);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 0cb4b9f..6703ef7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -183,7 +183,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp)
throws CommandLineExpansionException {
fp.addUUID(GUID);
fp.addInt(classpathMode.ordinal());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java
index a2de16e..bb1a65c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java
@@ -37,6 +37,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
+import javax.annotation.Nullable;
/** An action that creates a Java properties file containing the build informations. */
@AutoCodec
@@ -193,7 +194,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(GUID);
fp.addString(keyTranslations.computeKey());
fp.addBoolean(includeVolatile);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
index 3a5b3bd..9e3c3e2 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -459,7 +459,7 @@
ArtifactPathResolver.createPathResolver(actionFileSystem, executorEngine.getExecRoot());
FileOutErr fileOutErr;
if (replayActionOutErr) {
- String actionKey = action.getKey(actionKeyContext);
+ String actionKey = action.getKey(actionKeyContext, /*artifactExpander=*/ null);
fileOutErr = actionLogBufferPathGenerator.persistent(actionKey, artifactPathResolver);
try {
fileOutErr.getErrorPath().delete();
@@ -536,7 +536,7 @@
if (replayActionOutErr) {
// TODO(ulfjack): This assumes that the stdout/stderr files are unmodified. It would be
// better to integrate them with the action cache and rerun the action when they change.
- String actionKey = action.getKey(actionKeyContext);
+ String actionKey = action.getKey(actionKeyContext, /*artifactExpander=*/ null);
FileOutErr fileOutErr = actionLogBufferPathGenerator.persistent(actionKey, pathResolver);
// Set the mightHaveOutput bit in FileOutErr. Otherwise hasRecordedOutput() doesn't check if
// the file exists and just returns false.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
index 8fe91c7..7357544 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
@@ -153,7 +153,8 @@
if (action instanceof ActionExecutionMetadata) {
ActionExecutionMetadata actionExecutionMetadata = (ActionExecutionMetadata) action;
actionBuilder
- .setActionKey(actionExecutionMetadata.getKey(getActionKeyContext()))
+ .setActionKey(
+ actionExecutionMetadata.getKey(getActionKeyContext(), /*artifactExpander=*/ null))
.setDiscoversInputs(actionExecutionMetadata.discoversInputs());
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/v2/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/v2/ActionGraphDump.java
index c3fe61a..f038d62 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/v2/ActionGraphDump.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/v2/ActionGraphDump.java
@@ -147,7 +147,8 @@
if (action instanceof ActionExecutionMetadata) {
ActionExecutionMetadata actionExecutionMetadata = (ActionExecutionMetadata) action;
actionBuilder
- .setActionKey(actionExecutionMetadata.getKey(getActionKeyContext()))
+ .setActionKey(
+ actionExecutionMetadata.getKey(getActionKeyContext(), /*artifactExpander=*/ null))
.setDiscoversInputs(actionExecutionMetadata.discoversInputs());
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ActionCacheCheckerTest.java b/src/test/java/com/google/devtools/build/lib/actions/ActionCacheCheckerTest.java
index 79822aa..d4f13e8 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ActionCacheCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ActionCacheCheckerTest.java
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.ActionCacheChecker.Token;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.cache.ActionCache;
import com.google.devtools.build.lib.actions.cache.CompactPersistentActionCache;
import com.google.devtools.build.lib.actions.cache.MetadataHandler;
@@ -47,6 +48,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -182,7 +184,10 @@
Action action =
new NullAction() {
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString("key1");
}
};
@@ -190,7 +195,10 @@
action =
new NullAction() {
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString("key2");
}
};
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
index e2acc26..ee5c884 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ResourceManagerTest.java
@@ -474,7 +474,8 @@
}
@Override
- public String getKey(ActionKeyContext actionKeyContext) {
+ public String getKey(
+ ActionKeyContext actionKeyContext, @Nullable Artifact.ArtifactExpander artifactExpander) {
throw new IllegalStateException();
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 9e12a2a..1f9d4ef 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -419,7 +419,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString("action");
}
@@ -471,7 +474,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString("Mock Action " + getPrimaryOutput());
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index acf4023..c84490d 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -37,6 +37,7 @@
import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
+import javax.annotation.Nullable;
/**
* A dummy action for testing. Its execution runs the specified
@@ -141,7 +142,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addPaths(Artifact.asSortedPathFragments(getOutputs()));
fp.addPaths(Artifact.asSortedPathFragments(getMandatoryInputs().toList()));
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/SourceManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/SourceManifestActionTest.java
index 96fa7dc..cead46e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/SourceManifestActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/SourceManifestActionTest.java
@@ -315,7 +315,7 @@
private String computeKey(SourceManifestAction action) {
Fingerprint fp = new Fingerprint();
- action.computeKey(actionKeyContext, fp);
+ action.computeKey(actionKeyContext, /*artifactExpander=*/ null, fp);
return fp.hexDigestAndReset();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java
index 69d7897..09f6636 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java
@@ -158,7 +158,8 @@
.setOutputPathMapper(IDENTITY_MAPPER)
.setMnemonics("ActionTemplate", "ExpandedAction")
.build(ActionsTestUtil.NULL_ACTION_OWNER);
- assertThat(actionTemplate2.getKey(keyContext)).isEqualTo(actionTemplate.getKey(keyContext));
+ assertThat(actionTemplate2.getKey(keyContext, /*artifactExpander=*/ null))
+ .isEqualTo(actionTemplate.getKey(keyContext, /*artifactExpander=*/ null));
}
@Test
@@ -186,7 +187,8 @@
.setOutputPathMapper(IDENTITY_MAPPER)
.setMnemonics("ActionTemplate", "ExpandedAction2")
.build(ActionsTestUtil.NULL_ACTION_OWNER);
- assertThat(actionTemplate2.getKey(keyContext)).isNotEqualTo(actionTemplate.getKey(keyContext));
+ assertThat(actionTemplate2.getKey(keyContext, /*artifactExpander=*/ null))
+ .isNotEqualTo(actionTemplate.getKey(keyContext, /*artifactExpander=*/ null));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
index 3385026..961e8b2 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
@@ -250,7 +250,7 @@
private String computeKey(TemplateExpansionAction action) {
Fingerprint fp = new Fingerprint();
- action.computeKey(actionKeyContext, fp);
+ action.computeKey(actionKeyContext, /*artifactExpander=*/ null, fp);
return fp.hexDigestAndReset();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 91c8873..0ed340d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -66,6 +66,7 @@
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
+import javax.annotation.Nullable;
/**
* Utilities for analysis phase tests.
@@ -257,7 +258,10 @@
}
@Override
- public void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {}
+ public void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {}
@Override
public Artifact getVolatileStatus() {
diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java b/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java
index abc0438..7cda804 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/util/FakeOwner.java
@@ -24,6 +24,7 @@
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.BuildConfigurationEvent;
import com.google.devtools.build.lib.actions.RunfilesSupplier;
import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
@@ -148,7 +149,8 @@
}
@Override
- public String getKey(ActionKeyContext actionKeyContext) {
+ public String getKey(
+ ActionKeyContext actionKeyContext, @Nullable ArtifactExpander artifactExpander) {
return "MockOwner.getKey";
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index e1f6ebc..99639cc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -160,7 +160,7 @@
private String computeKey(CreateIncSymlinkAction action) {
Fingerprint fp = new Fingerprint();
- action.computeKey(actionKeyContext, fp);
+ action.computeKey(actionKeyContext, /*artifactExpander=*/ null, fp);
return fp.hexDigestAndReset();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java
index 22b13e4..6ea22d9 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java
@@ -70,6 +70,7 @@
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -455,7 +456,8 @@
}
@Override
- public String getKey(ActionKeyContext actionKeyContext) {
+ public String getKey(
+ ActionKeyContext actionKeyContext, @Nullable Artifact.ArtifactExpander artifactExpander) {
Fingerprint fp = new Fingerprint();
fp.addPath(inputTreeArtifact.getPath());
fp.addPath(outputTreeArtifact.getPath());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
index 7806bed..2221c33 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
@@ -1163,7 +1163,8 @@
}
@Override
- public String getKey(ActionKeyContext actionKeyContext) {
+ public String getKey(
+ ActionKeyContext actionKeyContext, @Nullable Artifact.ArtifactExpander artifactExpander) {
Fingerprint fp = new Fingerprint();
fp.addPath(inputArtifact.getPath());
fp.addPath(outputArtifact.getPath());
@@ -1448,7 +1449,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(warningText);
fp.addPath(getPrimaryOutput().getExecPath());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
index 1c96330..eff3f41 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
@@ -224,7 +224,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addString(getPrimaryOutput().getExecPathString());
fp.addInt(executionCounter.get());
}
@@ -723,7 +726,10 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
fp.addInt(42);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TopDownActionCacheTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TopDownActionCacheTest.java
index a5a98fa..d630155 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TopDownActionCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TopDownActionCacheTest.java
@@ -198,8 +198,11 @@
}
@Override
- protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) {
- super.computeKey(actionKeyContext, fp);
+ protected void computeKey(
+ ActionKeyContext actionKeyContext,
+ @Nullable Artifact.ArtifactExpander artifactExpander,
+ Fingerprint fp) {
+ super.computeKey(actionKeyContext, artifactExpander, fp);
fp.addString(button.key);
}
}
