aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
diff options
context:
space:
mode:
authorGravatar Nathan Harmata <nharmata@google.com>2015-11-10 03:24:01 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-11-10 10:28:30 +0000
commit8cd2978e429bdc178e06c0cb42f7ba73cabaeeb5 (patch)
treeda3d1149e3a485fc83686efe96c98cb9e4f456c4 /src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
parente040fe994c2da2b211858f7985fb736962a4499b (diff)
Allow FilesystemValueChecker to operate on a WalkableGraph and add TODOs for replacing MemoizingEvaluator#getValues et al with WalkableGraph usage. I initially attempted to do this but punted once I realized how much work it would be.
Also make DirectoryListingStateValue and FileStateValue public for use in outside callers of FilesystemValueChecker. -- MOS_MIGRATED_REVID=107447425
Diffstat (limited to 'src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java')
-rw-r--r--src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
index e35cc54c3d..a16ff87355 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -153,7 +153,8 @@ public final class InMemoryMemoizingEvaluator implements MemoizingEvaluator {
// It clears the internal data structures after getDiff is called and will not return
// diffs for historical versions. This makes the following code sensitive to interrupts.
// Ideally we would simply not update lastGraphVersion if an interrupt occurs.
- Diff diff = differencer.getDiff(lastGraphVersion, version);
+ Diff diff = differencer.getDiff(new DelegatingWalkableGraph(graph), lastGraphVersion,
+ version);
valuesToInject.putAll(diff.changedKeysWithNewValues());
invalidate(diff.changedKeysWithoutNewValues());
pruneInjectedValues(valuesToInject);