commit dd4c47fb431ccb72322154416dd3fe1f62938a52
author janakr <janakr@google.com> Fri Feb 08 17:03:19 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Fri Feb 08 17:05:27 2019 -0800
tree 1671d3a00f154adfb56ab52bb8d763d4057905b6
parent 5a02ad3c787451312d3b9dee997809f627ce08f5

Tolerate the situation of injecting nodes that already exist into an edgeless graph. This can happen if the previous Bazel command ends after an injection is planned, but before it happens, and the next build is edgeless (the first build could be edgeless too, doesn't matter).

Also make InMemoryNodeEntry#toString tolerant to not having deps.

PiperOrigin-RevId: 233152512

src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
index f72d069..bf76f6d 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -751,7 +751,11 @@
         .add("value", value)
         .add("lastChangedVersion", lastChangedVersion)
         .add("lastEvaluatedVersion", lastEvaluatedVersion)
-        .add("directDeps", isDone() ? GroupedList.create(directDeps) : directDeps)
+        .add(
+            "directDeps",
+            isDone() && keepEdges() != KeepEdgesPolicy.NONE
+                ? GroupedList.create(directDeps)
+                : directDeps)
         .add("signaledDeps", signaledDeps)
         .add("reverseDeps", ReverseDepsUtility.toString(this))
         .add("dirtyBuildingState", dirtyBuildingState);