From f6ad35fcde93f92c591778ed7db38d167f5bbc03 Mon Sep 17 00:00:00 2001
From: laurentlb <laurentlb@google.com>
Date: Thu, 13 Aug 2020 09:19:55 -0700
Subject: [PATCH] Delete --experimental_transparent_compression

The flag doesn't seem needed anymore.

RELNOTES: Removed the flag --experimental_transparent_compression.
PiperOrigin-RevId: 326460037
---
 .../lib/analysis/actions/Compression.java     |  5 ----
 .../lib/analysis/actions/FileWriteAction.java |  7 +++--
 .../analysis/config/BuildConfiguration.java   |  9 -------
 .../lib/analysis/config/CoreOptions.java      | 14 ----------
 .../analysis/actions/FileWriteActionTest.java | 26 -------------------
 5 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java
index 204610213d7df9..d27a6f973d2a2a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java
@@ -19,9 +19,4 @@ public enum Compression {
   DISALLOW,
   /** May compress. */
   ALLOW;
-
-  /** Maps true/false to allow/disallow respectively. */
-  public static Compression fromBoolean(boolean allow) {
-    return allow ? ALLOW : DISALLOW;
-  }
 }
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 e436eeae89fed1..af05fc13f8719f 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
@@ -149,9 +149,8 @@ public static FileWriteAction create(
   /**
    * Creates a new FileWriteAction instance.
    *
-   * <p>There are no inputs. Transparent compression is controlled by the {@code
-   * --experimental_transparent_compression} flag. No reference to the {@link
-   * ActionConstructionContext} will be maintained.
+   * <p>There are no inputs. No reference to the {@link ActionConstructionContext} will be
+   * maintained.
    *
    * @param context the action construction context
    * @param output the Artifact that will be created by executing this Action
@@ -169,7 +168,7 @@ public static FileWriteAction create(
         output,
         fileContents,
         makeExecutable,
-        context.getConfiguration().transparentCompression());
+        Compression.ALLOW);
   }
 
   private static final class CompressedString extends LazyString {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 4e399c3a64d71d..eb873f7f9d8d40 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -30,7 +30,6 @@
 import com.google.devtools.build.lib.actions.BuildConfigurationEvent;
 import com.google.devtools.build.lib.actions.CommandLines.CommandLineLimits;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
-import com.google.devtools.build.lib.analysis.actions.Compression;
 import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
@@ -708,14 +707,6 @@ public List<Label> getActionListeners() {
     return options.actionListeners;
   }
 
-  /**
-   * Returns whether FileWriteAction may transparently compress its contents in the analysis phase
-   * to save memory. Semantics are not affected.
-   */
-  public Compression transparentCompression() {
-    return Compression.fromBoolean(options.transparentCompression);
-  }
-
   /**
    * Returns whether we should trim configurations to only include the fragments needed to correctly
    * analyze a rule.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
index d7d890882040cf..ebfb6adf8f5a21 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -515,20 +515,6 @@ public String getTypeDescription() {
       help = "Use action_listener to attach an extra_action to existing build actions.")
   public List<Label> actionListeners;
 
-  // TODO(bazel-team): Either remove this flag once transparent compression is shown to not
-  // noticeably affect running time, or keep this flag and move it into a new configuration
-  // fragment.
-  @Option(
-      name = "experimental_transparent_compression",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
-      metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-      help =
-          "Enables gzip compression for the contents of FileWriteActions, which reduces "
-              + "memory usage in the analysis phase at the expense of additional time overhead.")
-  public boolean transparentCompression;
-
   @Option(
       name = "is host configuration",
       defaultValue = "false",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTest.java
index 98909dff31aeea..43f46c0eca0132 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTest.java
@@ -18,8 +18,6 @@
 
 import com.google.devtools.build.lib.actions.ActionOwner;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.util.LazyString;
 import java.util.Random;
 import org.junit.Test;
@@ -153,28 +151,4 @@ public String toString() {
     assertThat(action.getFileContents()).isEqualTo(backingContents);
     assertThat(contents.forced).isEqualTo(1);
   }
-
-  @Test
-  public void testTransparentCompressionFlagOn() throws Exception {
-    Artifact outputArtifact = getBinArtifactWithNoOwner("destination.txt");
-    String contents = generateLongRandomString();
-    useConfiguration("--experimental_transparent_compression=true");
-    ConfiguredTarget target = scratchConfiguredTarget("a", "a", "filegroup(name='a', srcs=[])");
-    RuleContext context = getRuleContext(target);
-    FileWriteAction action =
-        FileWriteAction.create(context, outputArtifact, contents, /*makeExecutable=*/ false);
-    assertThat(action.usesCompression()).isTrue();
-  }
-
-  @Test
-  public void testTransparentCompressionFlagOff() throws Exception {
-    Artifact outputArtifact = getBinArtifactWithNoOwner("destination.txt");
-    String contents = generateLongRandomString();
-    useConfiguration("--experimental_transparent_compression=false");
-    ConfiguredTarget target = scratchConfiguredTarget("a", "a", "filegroup(name='a', srcs=[])");
-    RuleContext context = getRuleContext(target);
-    FileWriteAction action =
-        FileWriteAction.create(context, outputArtifact, contents, /*makeExecutable=*/ false);
-    assertThat(action.usesCompression()).isFalse();
-  }
 }