From d6eb5de1fab9f9a83b527e52bc7c3e64c19c209b Mon Sep 17 00:00:00 2001 From: Googler Date: Sun, 9 Dec 2018 16:18:57 -0800 Subject: [PATCH] Increase visibility on node methods for internal use cases. PiperOrigin-RevId: 224740251 --- .../devtools/build/skyframe/DirtyBuildingState.java | 2 +- .../google/devtools/build/skyframe/InMemoryNodeEntry.java | 8 ++++---- .../devtools/build/skyframe/InMemoryNodeEntryTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java b/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java index 7f620f7b18291c..ea5ec3466b0d96 100644 --- a/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java +++ b/src/main/java/com/google/devtools/build/skyframe/DirtyBuildingState.java @@ -156,7 +156,7 @@ && getNumOfGroupsInLastBuildDirectDeps() == dirtyDirectDepIndex) { *

Changes in direct deps do not force this to return false. Only the value is * considered. */ - final boolean unchangedFromLastBuild(SkyValue newValue) throws InterruptedException { + public final boolean unchangedFromLastBuild(SkyValue newValue) throws InterruptedException { checkFinishedBuildingWhenAboutToSetValue(); return !(newValue instanceof NotComparableSkyValue) && getLastBuildValue().equals(newValue); } 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 6a4e52c9ab6dd9..f0dadac39d38d2 100644 --- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java +++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java @@ -324,13 +324,13 @@ public synchronized Set setValue(SkyValue value, Version version) } /** - * Returns {@code true} if this node is eligible to be change pruned when its value has not + * Returns {@code true} if this node is eligible to be change-pruned when its value has not * changed from the last build. * - *

Implementations need not check whether the value has changed - this will only be called if - * the value has not changed. + *

Implementations need not check whether the value has changed - nodes will only be + * change-pruned if the value has not changed. */ - protected boolean isEligibleForChangePruning() { + public boolean isEligibleForChangePruning() { return true; } diff --git a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java index 34a361a042c680..ef26381e6e8af1 100644 --- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -613,7 +613,7 @@ public void ineligibleForPruning() throws InterruptedException { NodeEntry entry = new InMemoryNodeEntry() { @Override - protected boolean isEligibleForChangePruning() { + public boolean isEligibleForChangePruning() { return false; } };