commit 8470e433858e77a096f433e99e884d9b391f1ba7
author jhorvitz <jhorvitz@google.com> Tue Dec 14 09:51:17 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Dec 14 09:53:13 2021 -0800
tree a5d4a955af7c6bb7ab49a65ca4c419ae61678a60
parent 583db2d04f66b60858535cc3d98393760d2eb7d9

Always create a `CrossServerUnshareableActionExecutionValue` if the `ActionLookupData` key is marked as never shareable.

It does not make sense for an unshareable key to produce a shareable value. I will enforce this in an upcoming change.

PiperOrigin-RevId: 416328205

src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 531a76b..37edcb0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -153,9 +153,7 @@
     actions.add(action);
     file(input2.getPath(), "contents");
     file(input1.getPath(), "source contents");
-    evaluate(
-        Iterables.toArray(
-            Artifact.keys(ImmutableSet.of(input2, input1, input2, tree)), SkyKey.class));
+    evaluate(Iterables.toArray(Artifact.keys(ImmutableSet.of(input2, input1, tree)), SkyKey.class));
     SkyValue value = evaluateArtifactValue(output);
     ArrayList<Pair<Artifact, ?>> inputs = new ArrayList<>();
     inputs.addAll(((RunfilesArtifactValue) value).getFileArtifacts());
@@ -341,8 +339,8 @@
             ImmutableMap.of(artifact1, metadata1, artifact3, FileArtifactValue.DEFAULT_MIDDLEMAN),
             ImmutableMap.of(treeArtifact, tree),
             ImmutableList.of(filesetOutputSymlink),
-            null,
-            true);
+            /*discoveredModules=*/ null,
+            /*shareable=*/ false);
     new SerializationTester(actionExecutionValue)
         .addDependency(FileSystem.class, root.getFileSystem())
         .addDependency(
@@ -532,11 +530,11 @@
         throw new IllegalStateException(e);
       }
       return ActionExecutionValue.create(
-          artifactData,
-          treeArtifactData,
+          ImmutableMap.copyOf(artifactData),
+          ImmutableMap.copyOf(treeArtifactData),
           /*outputSymlinks=*/ null,
           /*discoveredModules=*/ null,
-          /*actionDependsOnBuildId=*/ false);
+          /*shareable=*/ true);
     }
   }
 }