From 41ab6db797bac30c8e39fc705254fef329b6fdbc Mon Sep 17 00:00:00 2001
From: Lukacs Berki <lberki@google.com>
Date: Tue, 31 Jan 2017 10:48:31 +0000
Subject: Simplify action input discovery by removing
 Action#getInputsWhenSkippingInputDiscovery().

This has the side effect of always allowing new inputs to be discovered when Action#discoversInputs() return true, but since those actions are very few and have mostly to do with C++, I think it's an acceptable tradeoff for th ecode being that much simpler.

--
PiperOrigin-RevId: 146098150
MOS_MIGRATED_REVID=146098150
---
 .../google/devtools/build/lib/actions/Action.java  | 26 ----------------------
 1 file changed, 26 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/actions/Action.java')

diff --git a/src/main/java/com/google/devtools/build/lib/actions/Action.java b/src/main/java/com/google/devtools/build/lib/actions/Action.java
index 12316b7264..6985fa2a1d 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Action.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Action.java
@@ -164,32 +164,6 @@ public interface Action extends ActionExecutionMetadata, Describable {
   Iterable<Artifact> discoverInputsStage2(SkyFunction.Environment env)
       throws ActionExecutionException, InterruptedException;
 
-  /**
-   * If an action does not know the exact set of inputs ahead of time, it will usually either do:
-   * <ul>
-   * <li> Execution time pruning: The action provides a superset set of inputs at action creation
-   *      time, and prunes inputs during {@link #execute}.
-   * <li> Input discovery: The action provides a subset of inputs at creation time, overwrites
-   *      {@link #discoverInputs} to return a superset of inputs depending on the execution context
-   *      and optionally prunes the inputs at the end of {@link #execute} to a required subset for
-   *      subsequent calls.
-   * </ul>
-   *
-   * This function allows an action that is set up for input discovery, and thus only provides a
-   * minimal set of inputs at creation time, to switch off input discovery depending on the
-   * execution context. To that end the action must:
-   * <ul>
-   * <li>Provide a subset of inputs at creation time
-   * <li>Return {@code null} from {@link #discoverInputs}, indicating no input discovery
-   * <li>Return a superset of inputs that might have been discovered otherwise from here;
-   *     this will usually be the set difference between the full set of inputs the action would get
-   *     when doing only execution time pruning and the minimal subset provided above.
-   * <li>Prune the set of inputs on execute
-   * </ul>
-   */
-  @Nullable
-  Iterable<Artifact> getInputsWhenSkippingInputDiscovery();
-
   /**
    * Method used to resolve action inputs based on the information contained in the action cache. It
    * will be called iff inputsKnown() is false for the given action instance and there is a related
-- 
cgit v1.2.3