commit d4a6ca0c2c11191fa9e2a6f63fd502b3f0ac6772
author shahan <shahan@google.com> Wed Oct 03 11:41:28 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Oct 03 11:42:48 2018 -0700
tree c74585030c8dcfdf0bc14108c10b1c5a388d138e
parent c5bb9b018764c257cf9d36c0e310423ec61a4594

Allows subclasses of InMemoryNodeEntry to determine whether a child has actually changed.

PiperOrigin-RevId: 215598031

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 25b867f..d0f0703 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -311,16 +311,21 @@
           isDirty() && getDirtyBuildingState().getDirtyState() == DirtyState.FORCED_REBUILDING;
       // If this is a new value, or it has changed since the last build, set the version to the
       // current graph version.
-      Preconditions.checkState(
-          forcedRebuild || !this.lastChangedVersion.equals(version),
-          "Changed value but with the same version? %s %s %s",
-          this.lastChangedVersion,
-          version,
-          this);
+      if (!forcedRebuild && this.lastChangedVersion.equals(version)) {
+        logError(
+            new IllegalStateException(
+                "Changed value but with the same version? "
+                    + this.lastChangedVersion
+                    + " "
+                    + version
+                    + " "
+                    + this));
+      }
+      // If this is a new value, or it has changed since the last build, set the version to the
+      // current graph version.
       this.lastChangedVersion = version;
       this.value = value;
     }
-
     return setStateFinishedAndReturnReverseDepsToSignal();
   }
 
@@ -449,7 +454,8 @@
     Preconditions.checkState(isEvaluating(), this);
     signaledDeps++;
     if (isDirty()) {
-      dirtyBuildingState.signalDepInternal(!childVersion.atMost(lastEvaluatedVersion), isReady());
+      dirtyBuildingState.signalDepInternal(
+          hasChildChanged(lastEvaluatedVersion, childVersion), isReady());
     }
     return isReady();
   }
@@ -640,6 +646,20 @@
     return isReady(getNumTemporaryDirectDeps());
   }
 
+  /** True if the child has changed since the last evaluated version. */
+  protected boolean hasChildChanged(Version lastEvaluatedVersion, Version childVersion) {
+    // childVersion > lastEvaluatedVersion
+    return !childVersion.atMost(lastEvaluatedVersion);
+  }
+
+  protected int getSignaledDeps() {
+    return signaledDeps;
+  }
+
+  protected void logError(RuntimeException error) {
+    throw error;
+  }
+
   /** Returns whether all known children of this node have signaled that they are done. */
   private boolean isReady(int numDirectDeps) {
     Preconditions.checkState(signaledDeps <= numDirectDeps, "%s %s", numDirectDeps, this);