Split up actions java library target.

Notably, this separates Artifact and related types so that they don't have to be tied in with the rest of the actions library.

Pulled some nested classes to the top level to achieve this and did some other drive-by cleanups, but otherwise just import statements and BUILD files.

RELNOTES: None.
PiperOrigin-RevId: 322699250

Author: justinhorvitz

src/main/java/com/google/devtools/build/lib/BUILD

@@ -275,7 +275,9 @@ java_library(
         ":runtime/blaze_command_result",
         ":runtime/command_dispatcher",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
+        "//src/main/java/com/google/devtools/build/lib/actions:middleman_type",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_options",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_phase_complete_event",

src/main/java/com/google/devtools/build/lib/actions/ActionAnalysisMetadata.java

@@ -211,41 +211,6 @@ NestedSet<Artifact> getInputFilesForExtraAction(ActionExecutionContext actionExe
   /** Returns the action type. Must not be {@code null}. */
   MiddlemanType getActionType();
 
-  /** The action type. */
-  enum MiddlemanType {
-
-    /** A normal action. */
-    NORMAL,
-
-    /** A normal middleman, which just encapsulates a list of artifacts. */
-    AGGREGATING_MIDDLEMAN,
-
-    /**
-     * A middleman that denotes a scheduling dependency.
-     *
-     * <p>If an action has dependencies through scheduling dependency middleman, those dependencies
-     * will get built before the action is run and the build will error out if they cannot be built,
-     * but the dependencies will not be considered inputs of the action.
-     *
-     * <p>This is useful in cases when an action <em>might</em> need some inputs, but that is only
-     * found out right before it gets executed. The most salient case is C++ compilation where all
-     * files that can possibly be included need to be built before the action is executed, but if
-     * include scanning is used, only a subset of them will end up as inputs.
-     */
-    SCHEDULING_DEPENDENCY_MIDDLEMAN,
-
-    /**
-     * A runfiles middleman, which is validated by the dependency checker, but is not expanded
-     * in blaze. Instead, the runfiles manifest is sent to remote execution client, which
-     * performs the expansion.
-     */
-    RUNFILES_MIDDLEMAN;
-
-    public boolean isMiddleman() {
-      return this != NORMAL;
-    }
-  }
-
   /**
    * Indicates whether this action has loose headers, or if this is an {@link ActionTemplate},
    * whether the expanded action(s) will have loose headers.

src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java

@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.actions.ActionAnalysisMetadata.MiddlemanType;
 import com.google.devtools.build.lib.actions.cache.ActionCache;
 import com.google.devtools.build.lib.actions.cache.DigestUtils;
 import com.google.devtools.build.lib.actions.cache.MetadataHandler;

src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java

@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.actions;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
@@ -46,7 +45,7 @@ public void expand(Artifact mm, Collection<? super Artifact> output) {
         // TODO(bazel-team): Consider expanding recursively or throwing an exception here.
         // Most likely, this code will cause silent errors if we ever have a middleman that
         // contains a middleman.
-        if (middlemanAction.getActionType() == Action.MiddlemanType.AGGREGATING_MIDDLEMAN) {
+        if (middlemanAction.getActionType() == MiddlemanType.AGGREGATING_MIDDLEMAN) {
           Artifact.addNonMiddlemanArtifacts(
               middlemanAction.getInputs().toList(), output, Functions.<Artifact>identity());
         }
@@ -147,12 +146,8 @@ public static List<ActionInput> expandArtifacts(
     return result;
   }
 
-  /** Formatter for execPath String output. Public because {@link Artifact} uses it directly. */
-  public static final Function<ActionInput, String> EXEC_PATH_STRING_FORMATTER =
-      ActionInput::getExecPathString;
-
   public static Iterable<String> toExecPaths(Iterable<? extends ActionInput> artifacts) {
-    return Iterables.transform(artifacts, EXEC_PATH_STRING_FORMATTER);
+    return Iterables.transform(artifacts, ActionInput::getExecPathString);
   }
 
   /** Returns the {@link Path} for an {@link ActionInput}. */

src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java

@@ -15,7 +15,6 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.SkyFunctions;
 import com.google.devtools.build.skyframe.ShareabilityOfValue;

src/main/java/com/google/devtools/build/lib/actions/ActionLookupKey.java

@@ -0,0 +1,25 @@
+// Copyright 2014 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.actions;
+
+import com.google.devtools.build.skyframe.SkyKey;
+
+/**
+ * {@link SkyKey} for an {@link ActionLookupValue}.
+ *
+ * <p>All subclasses of {@link ActionLookupValue} "own" artifacts with {@link ArtifactOwner}s that
+ * are subclasses of {@link ActionLookupKey}. This allows callers to easily find the value key,
+ * while remaining agnostic to what action lookup values actually exist.
+ */
+public interface ActionLookupKey extends ArtifactOwner, SkyKey {}

src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java

@@ -15,8 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact.SourceArtifact;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 import javax.annotation.Nullable;
 
@@ -61,15 +59,4 @@ default SourceArtifact getSourceArtifact() {
     return null;
   }
 
-  /**
-   * All subclasses of ActionLookupValue "own" artifacts with {@link ArtifactOwner}s that are
-   * subclasses of ActionLookupKey. This allows callers to easily find the value key, while
-   * remaining agnostic to what ActionLookupValues actually exist.
-   */
-  abstract class ActionLookupKey implements ArtifactOwner, SkyKey {
-    @Override
-    public Label getLabel() {
-      return null;
-    }
-  }
 }

src/main/java/com/google/devtools/build/lib/actions/ActionRegistry.java

@@ -24,5 +24,5 @@ public interface ActionRegistry {
   void registerAction(ActionAnalysisMetadata... actions);
 
   /** Get the key of the ConfiguredTarget/Aspect ultimately responsible for all these actions. */
-  ActionLookupValue.ActionLookupKey getOwner();
+  ActionLookupKey getOwner();
 }

src/main/java/com/google/devtools/build/lib/actions/ActionTemplate.java

@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
 import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
 import com.google.devtools.build.lib.analysis.platform.PlatformInfo;

src/main/java/com/google/devtools/build/lib/actions/Actions.java

@@ -22,7 +22,6 @@
 import com.google.common.escape.Escaper;
 import com.google.common.escape.Escapers;
 import com.google.common.flogger.GoogleLogger;
-import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.OutputFile;

src/main/java/com/google/devtools/build/lib/actions/Artifact.java

@@ -26,8 +26,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Streams;
-import com.google.devtools.build.lib.actions.ActionAnalysisMetadata.MiddlemanType;
-import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.actions.ArtifactResolver.ArtifactResolverSupplier;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelConstants;
@@ -299,12 +297,12 @@ boolean ownersEqual(Artifact other) {
 
     @Override
     public ArtifactOwner getArtifactOwner() {
-      return ArtifactOwner.NullArtifactOwner.INSTANCE;
+      return ArtifactOwner.NULL_OWNER;
     }
 
     @Override
     public Label getOwnerLabel() {
-      return ArtifactOwner.NullArtifactOwner.INSTANCE.getLabel();
+      return ArtifactOwner.NULL_OWNER.getLabel();
     }
 
     @Override
@@ -385,7 +383,7 @@ public final ActionLookupData getGeneratingActionKey() {
     }
 
     @Override
-    public final ActionLookupValue.ActionLookupKey getArtifactOwner() {
+    public final ActionLookupKey getArtifactOwner() {
       return owner instanceof ActionLookupData
           ? getGeneratingActionKey().getActionLookupKey()
           : (ActionLookupKey) owner;
@@ -549,11 +547,10 @@ public final Label getOwner() {
 
   /**
    * Gets the {@code ActionLookupKey} of the {@code ConfiguredTarget} that owns this artifact, if it
-   * was set. Otherwise, this should be a dummy value -- either {@link
-   * ArtifactOwner.NullArtifactOwner#INSTANCE} or a dummy owner set in tests. Such a dummy value
-   * should only occur for source artifacts if created without specifying the owner, or for special
-   * derived artifacts, such as target completion middleman artifacts, build info artifacts, and the
-   * like.
+   * was set. Otherwise, this should be a dummy value -- either {@link ArtifactOwner#NULL_OWNER} or
+   * a dummy owner set in tests. Such a dummy value should only occur for source artifacts if
+   * created without specifying the owner, or for special derived artifacts, such as target
+   * completion middleman artifacts, build info artifacts, and the like.
    */
   public abstract ArtifactOwner getArtifactOwner();
 
@@ -1135,7 +1132,7 @@ public SourceArtifact deserialize(DeserializationContext context, CodedInputStre
    * method.
    */
   public static void addExecPaths(Iterable<Artifact> artifacts, Collection<String> output) {
-    addNonMiddlemanArtifacts(artifacts, output, ActionInputHelper.EXEC_PATH_STRING_FORMATTER);
+    addNonMiddlemanArtifacts(artifacts, output, ActionInput::getExecPathString);
   }
 
   /**
@@ -1175,7 +1172,8 @@ public static Iterable<String> toRootRelativePaths(Iterable<Artifact> artifacts)
    * this method.
    */
   public static Iterable<String> toExecPaths(Iterable<Artifact> artifacts) {
-    return ActionInputHelper.toExecPaths(Iterables.filter(artifacts, MIDDLEMAN_FILTER));
+    return Iterables.transform(
+        Iterables.filter(artifacts, MIDDLEMAN_FILTER), ActionInput::getExecPathString);
   }
 
   /**

src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java

@@ -17,7 +17,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Striped;
-import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.actions.Artifact.SourceArtifact;
 import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -194,7 +193,7 @@ public SourceArtifact getSourceArtifact(PathFragment execPath, Root root, Artifa
 
   @Override
   public SourceArtifact getSourceArtifact(PathFragment execPath, Root root) {
-    return getSourceArtifact(execPath, root, ArtifactOwner.NullArtifactOwner.INSTANCE);
+    return getSourceArtifact(execPath, root, ArtifactOwner.NULL_OWNER);
   }
 
   private void validatePath(PathFragment rootRelativePath, ArtifactRoot root) {
@@ -544,7 +543,7 @@ private Artifact createArtifactIfNotValid(Root sourceRoot, PathFragment execPath
       }
     } else {
       // Must be a new artifact or artifact in the cache is stale, so create a new one.
-      artifact = getSourceArtifact(execPath, sourceRoot, ArtifactOwner.NullArtifactOwner.INSTANCE);
+      artifact = getSourceArtifact(execPath, sourceRoot, ArtifactOwner.NULL_OWNER);
     }
     return artifact;
   }

src/main/java/com/google/devtools/build/lib/actions/ArtifactOwner.java

@@ -13,36 +13,35 @@
 // limitations under the License.
 package com.google.devtools.build.lib.actions;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
+import javax.annotation.Nullable;
 
 /**
  * An interface for {@code ActionLookupKey}, or at least for a {@link Label}. Only tests and
  * internal {@link Artifact}-generators should implement this interface -- otherwise, {@code
  * ActionLookupKey} and its subclasses should be the only implementation.
  */
 public interface ArtifactOwner {
+
+  @Nullable
   Label getLabel();
 
   /**
    * An {@link ArtifactOwner} that just returns null for its label. Only for use with resolved
    * source artifacts and tests.
    */
-  class NullArtifactOwner implements ArtifactOwner {
-    @AutoCodec @VisibleForTesting
-    public static final NullArtifactOwner INSTANCE = new NullArtifactOwner();
-
-    private NullArtifactOwner() {}
-
-    @Override
-    public Label getLabel() {
-      return null;
-    }
+  @SerializationConstant
+  ArtifactOwner NULL_OWNER =
+      new ArtifactOwner() {
+        @Override
+        public Label getLabel() {
+          return null;
+        }
 
-    @Override
-    public String toString() {
-      return "NULL_OWNER";
-    }
-  }
+        @Override
+        public String toString() {
+          return "NULL_OWNER";
+        }
+      };
 }

src/main/java/com/google/devtools/build/lib/actions/Artifacts.java

@@ -16,12 +16,12 @@
 import com.google.devtools.build.lib.util.Fingerprint;
 import java.util.Collection;
 
-/** Helper functions for dealing with {@link Artifacts} */
+/** Helper functions for dealing with {@link Artifact}s. */
 public final class Artifacts {
 
   private Artifacts() {}
 
-  public static void addToFingerprint(Fingerprint fp, Artifact artifact) {
+  private static void addToFingerprint(Fingerprint fp, Artifact artifact) {
     fp.addString(artifact.getExecPathString());
   }