When no new configured targets have been analyzed, only check for artifact conflicts if the current set of configured targets is not a subset of the largest set of configured targets that have been checked for conflicts.

Also rework the flow between SkyframeBuildView and SkyframeActionExecutor to remove the SkyframeExecutor middleman.

Also reword the error message in case of an ArtifactPrefixConflictException, since a clean should no longer be necessary.

PiperOrigin-RevId: 207322139

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
index adff0d0589..cc0332af6f 100644
--- a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
@@ -123,6 +123,9 @@ public interface MemoizingEvaluator {
   @Nullable
   SkyValue getExistingValue(SkyKey key) throws InterruptedException;
 
+  @Nullable
+  NodeEntry getExistingEntryAtLatestVersion(SkyKey key) throws InterruptedException;
+
   /**
    * Returns an error if and only if an earlier call to {@link #evaluate} created it; null
    * otherwise.
@@ -134,9 +137,6 @@ public interface MemoizingEvaluator {
   @Nullable
   ErrorInfo getExistingErrorForTesting(SkyKey key) throws InterruptedException;
 
-  @Nullable
-  NodeEntry getExistingEntryForTesting(SkyKey key) throws InterruptedException;
-
   /**
    * Tests that want finer control over the graph being used may provide a {@code transformer} here.
    * This {@code transformer} will be applied to the graph for each invalidation/evaluation.