diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java index 7d16bb20b31..eca9fd7df32 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java @@ -136,7 +136,7 @@ final void signalDepInternal(boolean childChanged, boolean isReady) { this); if (!isChanged()) { // Synchronization isn't needed here because the only caller is NodeEntry, which does it - // through the synchronized method signalDep. + // through the synchronized method signalDep(Version). if (childChanged) { dirtyState = DirtyState.NEEDS_REBUILDING; } else if (dirtyState == DirtyState.CHECK_DEPENDENCIES diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java index 9c43cb6b9de..bd453ca3ac4 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -140,7 +141,7 @@ public class InMemoryNodeEntry implements NodeEntry { * Object encapsulating dirty state of the object between when it is marked dirty and * re-evaluated. */ - @Nullable protected volatile DirtyBuildingState dirtyBuildingState = null; + @VisibleForTesting @Nullable protected volatile DirtyBuildingState dirtyBuildingState = null; private static final int NOT_EVALUATING_SENTINEL = -1; diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java index 6e8fb52a2c1..1dc471720b9 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -66,9 +66,6 @@ public void createEntry() { assertThat(entry.getTemporaryDirectDeps()).isEmpty(); } - private static final IntVersion ZERO_VERSION = IntVersion.of(0L); - private static final IntVersion ONE_VERSION = IntVersion.of(1L); - @Test public void signalEntry() throws InterruptedException { NodeEntry entry = new InMemoryNodeEntry(); @@ -76,7 +73,7 @@ public void signalEntry() throws InterruptedException { SkyKey dep1 = key("dep1"); addTemporaryDirectDep(entry, dep1); assertThat(entry.isReady()).isFalse(); - assertThat(entry.signalDep(ZERO_VERSION, dep1)).isTrue(); + assertThat(entry.signalDep()).isTrue(); assertThat(entry.isReady()).isTrue(); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep1); SkyKey dep2 = key("dep2"); @@ -84,14 +81,14 @@ public void signalEntry() throws InterruptedException { addTemporaryDirectDep(entry, dep2); addTemporaryDirectDep(entry, dep3); assertThat(entry.isReady()).isFalse(); - assertThat(entry.signalDep(ZERO_VERSION, dep2)).isFalse(); + assertThat(entry.signalDep()).isFalse(); assertThat(entry.isReady()).isFalse(); - assertThat(entry.signalDep(ZERO_VERSION, dep3)).isTrue(); + assertThat(entry.signalDep()).isTrue(); assertThat(entry.isReady()).isTrue(); assertThat(setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L)).isEmpty(); assertThat(entry.isDone()).isTrue(); - assertThat(entry.getVersion()).isEqualTo(ZERO_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(0L)); assertThat(entry.getDirectDeps()).containsExactly(dep1, dep2, dep3); } @@ -158,7 +155,7 @@ public void crashOnTooManySignals() { InMemoryNodeEntry entry = new InMemoryNodeEntry(); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. try { - entry.signalDep(ZERO_VERSION, null); + entry.signalDep(); fail(); } catch (IllegalStateException e) { // Expected. @@ -201,7 +198,7 @@ public void dirtyLifecycle() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -219,7 +216,7 @@ public void dirtyLifecycle() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ONE_VERSION, dep); + entry.signalDep(); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); assertThat(entry.isReady()).isTrue(); entry.markRebuilding(); @@ -233,7 +230,7 @@ public void changedLifecycle() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -253,7 +250,7 @@ public void changedLifecycle() throws InterruptedException { entry.markRebuilding(); assertThat(setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/1L)).containsExactly(parent); - assertThat(entry.getVersion()).isEqualTo(ONE_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(1L)); } @Test @@ -262,7 +259,7 @@ public void forceRebuildLifecycle() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/ null, /*graphVersion=*/ 0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -288,16 +285,15 @@ public void forceRebuildLifecycle() throws InterruptedException { assertThat(setValue(entry, new SkyValue() {}, /*errorInfo=*/ null, /*graphVersion=*/ 0L)) .containsExactly(parent); - assertThat(entry.getVersion()).isEqualTo(ZERO_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(0L)); } @Test public void markDirtyThenChanged() throws InterruptedException { NodeEntry entry = new InMemoryNodeEntry(); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. - SkyKey dep = key("dep"); - addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + addTemporaryDirectDep(entry, key("dep")); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -320,9 +316,8 @@ public void markDirtyThenChanged() throws InterruptedException { public void markChangedThenDirty() throws InterruptedException { NodeEntry entry = new InMemoryNodeEntry(); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. - SkyKey dep = key("dep"); - addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + addTemporaryDirectDep(entry, key("dep")); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -360,9 +355,8 @@ public void crashOnTwiceMarkedChanged() throws InterruptedException { public void crashOnTwiceMarkedDirty() throws InterruptedException { NodeEntry entry = new InMemoryNodeEntry(); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. - SkyKey dep = key("dep"); - addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + addTemporaryDirectDep(entry, key("dep")); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/ null, /*graphVersion=*/ 0L); entry.markDirty(DirtyType.DIRTY); try { @@ -443,7 +437,7 @@ public void pruneBeforeBuild() throws InterruptedException { SkyKey dep = key("dep"); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new SkyValue() {}, /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -460,11 +454,11 @@ public void pruneBeforeBuild() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(0L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.VERIFIED_CLEAN); assertThat(entry.markClean()).containsExactly(parent); assertThat(entry.isDone()).isTrue(); - assertThat(entry.getVersion()).isEqualTo(ZERO_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(0L)); } private static class IntegerValue implements SkyValue { @@ -491,7 +485,7 @@ public void pruneAfterBuild() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/0L); entry.markDirty(DirtyType.DIRTY); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. @@ -499,13 +493,13 @@ public void pruneAfterBuild() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.NEEDS_REBUILDING); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); entry.markRebuilding(); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/1L); assertThat(entry.isDone()).isTrue(); - assertThat(entry.getVersion()).isEqualTo(ZERO_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(0L)); } @Test @@ -514,7 +508,7 @@ public void noPruneWhenDetailsChange() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -531,7 +525,7 @@ public void noPruneWhenDetailsChange() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.NEEDS_REBUILDING); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); ReifiedSkyFunctionException exception = new ReifiedSkyFunctionException( @@ -555,9 +549,9 @@ public void pruneWhenDepGroupReordered() throws InterruptedException { SkyKey dep2InGroup = key("dep2InGroup"); addTemporaryDirectDep(entry, dep); addTemporaryDirectDeps(entry, dep1InGroup, dep2InGroup); - entry.signalDep(ZERO_VERSION, dep); - entry.signalDep(ZERO_VERSION, dep1InGroup); - entry.signalDep(ZERO_VERSION, dep2InGroup); + entry.signalDep(); + entry.signalDep(); + entry.signalDep(); setValue(entry, new IntegerValue(5), /*errorInfo=*/ null, /*graphVersion=*/ 0L); assertThat(entry.isDirty()).isFalse(); assertThat(entry.isDone()).isTrue(); @@ -573,13 +567,13 @@ public void pruneWhenDepGroupReordered() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.NEEDS_REBUILDING); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); entry.markRebuilding(); addTemporaryDirectDeps(entry, dep2InGroup, dep1InGroup); - assertThat(entry.signalDep(ONE_VERSION, dep2InGroup)).isFalse(); - assertThat(entry.signalDep(ONE_VERSION, dep1InGroup)).isTrue(); + assertThat(entry.signalDep()).isFalse(); + assertThat(entry.signalDep()).isTrue(); setValue(entry, new IntegerValue(5), /*errorInfo=*/ null, /*graphVersion=*/ 1L); assertThat(entry.isDone()).isTrue(); assertWithMessage("Version does not change when dep group reordered") @@ -593,7 +587,7 @@ public void errorInfoCannotBePruned() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); ReifiedSkyFunctionException exception = new ReifiedSkyFunctionException( new GenericFunctionException(new SomeErrorException("oops"), Transience.PERSISTENT), key("cause")); @@ -604,14 +598,14 @@ public void errorInfoCannotBePruned() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.NEEDS_REBUILDING); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); entry.markRebuilding(); setValue(entry, /*value=*/null, errorInfo, /*graphVersion=*/1L); assertThat(entry.isDone()).isTrue(); // ErrorInfo is treated as a NotComparableSkyValue, so it is not pruned. - assertThat(entry.getVersion()).isEqualTo(ONE_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(1L)); } @Test @@ -629,7 +623,7 @@ public boolean isEligibleForChangePruningOnUnchangedValue() { entry.addReverseDepAndCheckIfDone(null); entry.markRebuilding(); setValue(entry, new IntegerValue(5), /*errorInfo=*/ null, /*graphVersion=*/ 1L); - assertThat(entry.getVersion()).isEqualTo(ONE_VERSION); + assertThat(entry.getVersion()).isEqualTo(IntVersion.of(1L)); } @Test @@ -641,17 +635,17 @@ public void getDependencyGroup() throws InterruptedException { SkyKey dep3 = key("dep3"); addTemporaryDirectDeps(entry, dep, dep2); addTemporaryDirectDep(entry, dep3); - entry.signalDep(ZERO_VERSION, dep); - entry.signalDep(ZERO_VERSION, dep2); - entry.signalDep(ZERO_VERSION, dep3); + entry.signalDep(); + entry.signalDep(); + entry.signalDep(); setValue(entry, /*value=*/new IntegerValue(5), null, 0L); entry.markDirty(DirtyType.DIRTY); entry.addReverseDepAndCheckIfDone(null); // Restart evaluation. assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep, dep2); addTemporaryDirectDeps(entry, dep, dep2); - entry.signalDep(ZERO_VERSION, /*childForDebugging=*/ null); - entry.signalDep(ZERO_VERSION, /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(0L), /*childForDebugging=*/ null); + entry.signalDep(IntVersion.of(0L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep3); } @@ -668,8 +662,8 @@ public void maintainDependencyGroupAfterRemoval() throws InterruptedException { addTemporaryDirectDeps(entry, dep, dep2, dep3); addTemporaryDirectDep(entry, dep4); addTemporaryDirectDep(entry, dep5); - entry.signalDep(ZERO_VERSION, dep4); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); + entry.signalDep(); // Oops! Evaluation terminated with an error, but we're going to set this entry's value anyway. entry.removeUnfinishedDeps(ImmutableSet.of(dep2, dep3, dep5)); ReifiedSkyFunctionException exception = new ReifiedSkyFunctionException( @@ -681,7 +675,7 @@ public void maintainDependencyGroupAfterRemoval() throws InterruptedException { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(IntVersion.of(0L), /*childForDebugging=*/ null); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep4); } @@ -692,22 +686,22 @@ public void pruneWhenDepsChange() throws InterruptedException { entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/0L); entry.markDirty(DirtyType.DIRTY); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); assertThat(entry.getNextDirtyDirectDeps()).containsExactly(dep); addTemporaryDirectDep(entry, dep); - assertThat(entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null)).isTrue(); + assertThat(entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null)).isTrue(); assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.NEEDS_REBUILDING); assertThatNodeEntry(entry).hasTemporaryDirectDepsThat().containsExactly(dep); entry.markRebuilding(); addTemporaryDirectDep(entry, key("dep2")); - assertThat(entry.signalDep(ONE_VERSION, /*childForDebugging=*/ null)).isTrue(); + assertThat(entry.signalDep(IntVersion.of(1L), /*childForDebugging=*/ null)).isTrue(); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/1L); assertThat(entry.isDone()).isTrue(); - assertThatNodeEntry(entry).hasVersionThat().isEqualTo(ZERO_VERSION); + assertThatNodeEntry(entry).hasVersionThat().isEqualTo(IntVersion.of(0L)); } @Test @@ -719,7 +713,7 @@ public void checkDepsOneByOne() throws InterruptedException { SkyKey dep = key(Integer.toString(ii)); deps.add(dep); addTemporaryDirectDep(entry, dep); - entry.signalDep(ZERO_VERSION, dep); + entry.signalDep(); } setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/0L); entry.markDirty(DirtyType.DIRTY); @@ -728,7 +722,7 @@ public void checkDepsOneByOne() throws InterruptedException { for (int ii = 0; ii < 10; ii++) { assertThat(entry.getNextDirtyDirectDeps()).containsExactly(deps.get(ii)); addTemporaryDirectDep(entry, deps.get(ii)); - assertThat(entry.signalDep(ZERO_VERSION, /*childForDebugging=*/ null)).isTrue(); + assertThat(entry.signalDep(IntVersion.of(0L), /*childForDebugging=*/ null)).isTrue(); if (ii < 9) { assertThat(entry.getDirtyState()).isEqualTo(NodeEntry.DirtyState.CHECK_DEPENDENCIES); } else { @@ -761,7 +755,7 @@ public void testClone() throws InterruptedException { .addReverseDepAndCheckIfDone(null) .isEqualTo(DependencyState.NEEDS_SCHEDULING); addTemporaryDirectDep(entry, originalChild); - entry.signalDep(ZERO_VERSION, originalChild); + entry.signalDep(); entry.setValue(originalValue, version, null); entry.addReverseDepAndCheckIfDone(key("parent1")); InMemoryNodeEntry clone1 = entry.cloneNodeEntry(); @@ -774,7 +768,7 @@ public void testClone() throws InterruptedException { clone2.addReverseDepAndCheckIfDone(null); SkyKey newChild = key("newchild"); addTemporaryDirectDep(clone2, newChild); - clone2.signalDep(ONE_VERSION, newChild); + clone2.signalDep(); clone2.markRebuilding(); clone2.setValue(updatedValue, version.next(), null); @@ -815,8 +809,8 @@ public void getGroupedDirectDeps() throws InterruptedException { helper.endGroup(); entry.addTemporaryDirectDeps(helper); - for (SkyKey dep : depGroup) { - entry.signalDep(ZERO_VERSION, dep); + for (int i = 0; i < depGroup.size(); i++) { + entry.signalDep(); } } entry.setValue(new IntegerValue(42), IntVersion.of(42L), null);