aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
diff options
context:
space:
mode:
authorGravatar tomlu <tomlu@google.com>2018-06-18 16:16:36 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-18 16:18:08 -0700
commit9e91f20bb31e44b4be836996ac9d91af61e1e822 (patch)
tree7e7c116290099ef5a8e16e67a9d4f5a0c908fbf9 /src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
parentd4406d644efcf86327834a56b01cc212389e52e7 (diff)
Remove support for --discard_actions_after_execution.
The memory savings from this flag are not worth the complexity, and it interferes with action restarting. RELNOTES: Remove support for --discard_actions_after_execution. PiperOrigin-RevId: 201077905
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
index 0794901435..641e01bc0a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
@@ -13,7 +13,6 @@
// limitations under the License.
package com.google.devtools.build.lib.skyframe;
-import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -46,18 +45,15 @@ public class BuildInfoCollectionFunction implements SkyFunction {
private final ActionKeyContext actionKeyContext;
// Supplier only because the artifact factory has not yet been created at constructor time.
private final Supplier<ArtifactFactory> artifactFactory;
- private final Supplier<Boolean> removeActionsAfterEvaluation;
private final ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories;
BuildInfoCollectionFunction(
ActionKeyContext actionKeyContext,
Supplier<ArtifactFactory> artifactFactory,
- ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories,
- Supplier<Boolean> removeActionsAfterEvaluation) {
+ ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories) {
this.actionKeyContext = actionKeyContext;
this.artifactFactory = artifactFactory;
this.buildInfoFactories = buildInfoFactories;
- this.removeActionsAfterEvaluation = Preconditions.checkNotNull(removeActionsAfterEvaluation);
}
@Override
@@ -107,8 +103,7 @@ public class BuildInfoCollectionFunction implements SkyFunction {
} catch (ActionConflictException e) {
throw new IllegalStateException("Action conflicts not expected in build info: " + skyKey, e);
}
- return new BuildInfoCollectionValue(
- collection, generatingActions, removeActionsAfterEvaluation.get());
+ return new BuildInfoCollectionValue(collection, generatingActions);
}
@Override