diff options
23 files changed, 63 insertions, 75 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java index f742683b1a..e292b9d676 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java @@ -135,7 +135,7 @@ public class BazelRepositoryModule extends BlazeModule { new RepositoryDelegatorFunction(directories, repositoryHandlers, isFetch)); // Helper SkyFunctions. - builder.put(SkyFunctionName.computed(HttpDownloadFunction.NAME), new HttpDownloadFunction()); + builder.put(SkyFunctionName.create(HttpDownloadFunction.NAME), new HttpDownloadFunction()); builder.put(JarFunction.NAME, new JarFunction()); builder.put(ZipFunction.NAME, new ZipFunction()); return builder.build(); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpArchiveFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpArchiveFunction.java index b5cdb9bde6..d404becab1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpArchiveFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpArchiveFunction.java @@ -93,7 +93,7 @@ public class HttpArchiveFunction extends RepositoryFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(HttpArchiveRule.NAME.toUpperCase()); + return SkyFunctionName.create(HttpArchiveRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpDownloadFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpDownloadFunction.java index 022d0dc000..2b3990b8e4 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpDownloadFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpDownloadFunction.java @@ -76,7 +76,7 @@ public class HttpDownloadFunction implements SkyFunction { } String sha256 = mapper.get("sha256", Type.STRING); return new SkyKey( - SkyFunctionName.computed(NAME), + SkyFunctionName.create(NAME), new HttpDownloadFunction.HttpDescriptor(url, sha256, outputDirectory)); } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpJarFunction.java index 56e5e55df2..c4cc86fe98 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpJarFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/HttpJarFunction.java @@ -40,7 +40,7 @@ public class HttpJarFunction extends HttpArchiveFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(HttpJarRule.NAME.toUpperCase()); + return SkyFunctionName.create(HttpJarRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/JarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/JarFunction.java index e519a171db..db11150f00 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/JarFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/JarFunction.java @@ -34,7 +34,7 @@ import javax.annotation.Nullable; */ public class JarFunction implements SkyFunction { - public static final SkyFunctionName NAME = SkyFunctionName.computed("JAR_FUNCTION"); + public static final SkyFunctionName NAME = SkyFunctionName.create("JAR_FUNCTION"); /** * The .jar can be used compressed, so this just exposes it in a way Bazel can use. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/LocalRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/LocalRepositoryFunction.java index 54669a5a37..cd7d6ac489 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/LocalRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/LocalRepositoryFunction.java @@ -84,7 +84,7 @@ public class LocalRepositoryFunction extends RepositoryFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(LocalRepositoryRule.NAME.toUpperCase()); + return SkyFunctionName.create(LocalRepositoryRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java index fce3328d19..068e25fc36 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java @@ -109,7 +109,7 @@ public class MavenJarFunction extends HttpArchiveFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(Ascii.toUpperCase(MavenJarRule.NAME)); + return SkyFunctionName.create(Ascii.toUpperCase(MavenJarRule.NAME)); } /** diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewHttpArchiveFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewHttpArchiveFunction.java index 30ad5c888a..1002fbed05 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewHttpArchiveFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewHttpArchiveFunction.java @@ -38,7 +38,7 @@ public class NewHttpArchiveFunction extends HttpArchiveFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(NewHttpArchiveRule.NAME); + return SkyFunctionName.create(NewHttpArchiveRule.NAME); } @Nullable diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewLocalRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewLocalRepositoryFunction.java index eb01bebb37..6cd887f954 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewLocalRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewLocalRepositoryFunction.java @@ -60,7 +60,7 @@ public class NewLocalRepositoryFunction extends RepositoryFunction { */ @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(NewLocalRepositoryRule.NAME.toUpperCase()); + return SkyFunctionName.create(NewLocalRepositoryRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/ZipFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/ZipFunction.java index 47f080d94e..8e32cad040 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/ZipFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/ZipFunction.java @@ -39,7 +39,7 @@ import javax.annotation.Nullable; */ public class ZipFunction implements SkyFunction { - public static final SkyFunctionName NAME = SkyFunctionName.computed("ZIP_FUNCTION"); + public static final SkyFunctionName NAME = SkyFunctionName.create("ZIP_FUNCTION"); /** * This unzips the zip file to a sibling directory of {@link DecompressorDescriptor#archivePath}. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java index e6cdd5810b..af5d341bad 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java @@ -109,7 +109,7 @@ public class AndroidNdkRepositoryFunction extends RepositoryFunction { @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(AndroidNdkRepositoryRule.NAME.toUpperCase()); + return SkyFunctionName.create(AndroidNdkRepositoryRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java index 445d754262..160df73953 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java @@ -78,7 +78,7 @@ public class AndroidSdkRepositoryFunction extends RepositoryFunction { */ @Override public SkyFunctionName getSkyFunctionName() { - return SkyFunctionName.computed(AndroidSdkRepositoryRule.NAME.toUpperCase()); + return SkyFunctionName.create(AndroidSdkRepositoryRule.NAME.toUpperCase()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java index 633e95a591..047db51478 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java @@ -21,58 +21,58 @@ import com.google.devtools.build.skyframe.SkyKey; * Value types in Skyframe. */ public final class SkyFunctions { - public static final SkyFunctionName PRECOMPUTED = new SkyFunctionName("PRECOMPUTED", false); - public static final SkyFunctionName FILE_STATE = new SkyFunctionName("FILE_STATE", false); + public static final SkyFunctionName PRECOMPUTED = SkyFunctionName.create("PRECOMPUTED"); + public static final SkyFunctionName FILE_STATE = SkyFunctionName.create("FILE_STATE"); public static final SkyFunctionName DIRECTORY_LISTING_STATE = - new SkyFunctionName("DIRECTORY_LISTING_STATE", false); + SkyFunctionName.create("DIRECTORY_LISTING_STATE"); public static final SkyFunctionName FILE_SYMLINK_CYCLE_UNIQUENESS = - SkyFunctionName.computed("FILE_SYMLINK_CYCLE_UNIQUENESS_NODE"); - public static final SkyFunctionName FILE = SkyFunctionName.computed("FILE"); + SkyFunctionName.create("FILE_SYMLINK_CYCLE_UNIQUENESS_NODE"); + public static final SkyFunctionName FILE = SkyFunctionName.create("FILE"); public static final SkyFunctionName DIRECTORY_LISTING = - SkyFunctionName.computed("DIRECTORY_LISTING"); - public static final SkyFunctionName PACKAGE_LOOKUP = SkyFunctionName.computed("PACKAGE_LOOKUP"); + SkyFunctionName.create("DIRECTORY_LISTING"); + public static final SkyFunctionName PACKAGE_LOOKUP = SkyFunctionName.create("PACKAGE_LOOKUP"); public static final SkyFunctionName CONTAINING_PACKAGE_LOOKUP = - SkyFunctionName.computed("CONTAINING_PACKAGE_LOOKUP"); - public static final SkyFunctionName AST_FILE_LOOKUP = SkyFunctionName.computed("AST_FILE_LOOKUP"); + SkyFunctionName.create("CONTAINING_PACKAGE_LOOKUP"); + public static final SkyFunctionName AST_FILE_LOOKUP = SkyFunctionName.create("AST_FILE_LOOKUP"); public static final SkyFunctionName SKYLARK_IMPORTS_LOOKUP = - SkyFunctionName.computed("SKYLARK_IMPORTS_LOOKUP"); - public static final SkyFunctionName GLOB = SkyFunctionName.computed("GLOB"); - public static final SkyFunctionName PACKAGE = SkyFunctionName.computed("PACKAGE"); - public static final SkyFunctionName TARGET_MARKER = SkyFunctionName.computed("TARGET_MARKER"); - public static final SkyFunctionName TARGET_PATTERN = SkyFunctionName.computed("TARGET_PATTERN"); + SkyFunctionName.create("SKYLARK_IMPORTS_LOOKUP"); + public static final SkyFunctionName GLOB = SkyFunctionName.create("GLOB"); + public static final SkyFunctionName PACKAGE = SkyFunctionName.create("PACKAGE"); + public static final SkyFunctionName TARGET_MARKER = SkyFunctionName.create("TARGET_MARKER"); + public static final SkyFunctionName TARGET_PATTERN = SkyFunctionName.create("TARGET_PATTERN"); public static final SkyFunctionName PREPARE_DEPS_OF_PATTERNS = - SkyFunctionName.computed("PREPARE_DEPS_OF_PATTERNS"); - public static final SkyFunctionName RECURSIVE_PKG = SkyFunctionName.computed("RECURSIVE_PKG"); + SkyFunctionName.create("PREPARE_DEPS_OF_PATTERNS"); + public static final SkyFunctionName RECURSIVE_PKG = SkyFunctionName.create("RECURSIVE_PKG"); public static final SkyFunctionName TRANSITIVE_TARGET = - SkyFunctionName.computed("TRANSITIVE_TARGET"); + SkyFunctionName.create("TRANSITIVE_TARGET"); public static final SkyFunctionName CONFIGURED_TARGET = - SkyFunctionName.computed("CONFIGURED_TARGET"); - public static final SkyFunctionName ASPECT = SkyFunctionName.computed("ASPECT"); + SkyFunctionName.create("CONFIGURED_TARGET"); + public static final SkyFunctionName ASPECT = SkyFunctionName.create("ASPECT"); public static final SkyFunctionName POST_CONFIGURED_TARGET = - SkyFunctionName.computed("POST_CONFIGURED_TARGET"); + SkyFunctionName.create("POST_CONFIGURED_TARGET"); public static final SkyFunctionName TARGET_COMPLETION = - SkyFunctionName.computed("TARGET_COMPLETION"); + SkyFunctionName.create("TARGET_COMPLETION"); public static final SkyFunctionName TEST_COMPLETION = - SkyFunctionName.computed("TEST_COMPLETION"); + SkyFunctionName.create("TEST_COMPLETION"); public static final SkyFunctionName BUILD_CONFIGURATION = - SkyFunctionName.computed("BUILD_CONFIGURATION"); + SkyFunctionName.create("BUILD_CONFIGURATION"); public static final SkyFunctionName CONFIGURATION_FRAGMENT = - SkyFunctionName.computed("CONFIGURATION_FRAGMENT"); + SkyFunctionName.create("CONFIGURATION_FRAGMENT"); public static final SkyFunctionName CONFIGURATION_COLLECTION = - SkyFunctionName.computed("CONFIGURATION_COLLECTION"); - public static final SkyFunctionName ARTIFACT = SkyFunctionName.computed("ARTIFACT"); + SkyFunctionName.create("CONFIGURATION_COLLECTION"); + public static final SkyFunctionName ARTIFACT = SkyFunctionName.create("ARTIFACT"); public static final SkyFunctionName ACTION_EXECUTION = - SkyFunctionName.computed("ACTION_EXECUTION"); - public static final SkyFunctionName ACTION_LOOKUP = SkyFunctionName.computed("ACTION_LOOKUP"); + SkyFunctionName.create("ACTION_EXECUTION"); + public static final SkyFunctionName ACTION_LOOKUP = SkyFunctionName.create("ACTION_LOOKUP"); public static final SkyFunctionName RECURSIVE_FILESYSTEM_TRAVERSAL = - SkyFunctionName.computed("RECURSIVE_DIRECTORY_TRAVERSAL"); - public static final SkyFunctionName FILESET_ENTRY = SkyFunctionName.computed("FILESET_ENTRY"); + SkyFunctionName.create("RECURSIVE_DIRECTORY_TRAVERSAL"); + public static final SkyFunctionName FILESET_ENTRY = SkyFunctionName.create("FILESET_ENTRY"); public static final SkyFunctionName BUILD_INFO_COLLECTION = - SkyFunctionName.computed("BUILD_INFO_COLLECTION"); - public static final SkyFunctionName BUILD_INFO = SkyFunctionName.computed("BUILD_INFO"); - public static final SkyFunctionName WORKSPACE_FILE = SkyFunctionName.computed("WORKSPACE_FILE"); - public static final SkyFunctionName COVERAGE_REPORT = SkyFunctionName.computed("COVERAGE_REPORT"); - public static final SkyFunctionName REPOSITORY = SkyFunctionName.computed("REPOSITORY"); + SkyFunctionName.create("BUILD_INFO_COLLECTION"); + public static final SkyFunctionName BUILD_INFO = SkyFunctionName.create("BUILD_INFO"); + public static final SkyFunctionName WORKSPACE_FILE = SkyFunctionName.create("WORKSPACE_FILE"); + public static final SkyFunctionName COVERAGE_REPORT = SkyFunctionName.create("COVERAGE_REPORT"); + public static final SkyFunctionName REPOSITORY = SkyFunctionName.create("REPOSITORY"); public static Predicate<SkyKey> isSkyFunction(final SkyFunctionName functionName) { return new Predicate<SkyKey>() { diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java b/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java index c0c445def3..9193dd412f 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java +++ b/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java @@ -18,8 +18,7 @@ package com.google.devtools.build.skyframe; * failure. */ public final class ErrorTransienceValue implements SkyValue { - public static final SkyFunctionName FUNCTION_NAME = - new SkyFunctionName("ERROR_TRANSIENCE", false); + public static final SkyFunctionName FUNCTION_NAME = SkyFunctionName.create("ERROR_TRANSIENCE"); ErrorTransienceValue() {} diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java index 4e0a433eec..0b0e00be9f 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java +++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java @@ -1356,7 +1356,7 @@ public final class ParallelEvaluator implements Evaluator { * ArrayDeque does not permit null elements. */ private static final SkyKey CHILDREN_FINISHED = - new SkyKey(new SkyFunctionName("MARKER", false), "MARKER"); + new SkyKey(SkyFunctionName.create("MARKER"), "MARKER"); /** The max number of cycles we will report to the user for a given root, to avoid OOMing. */ private static final int MAX_CYCLES = 20; diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionName.java b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionName.java index 389d4d85e6..c2c4e7924e 100644 --- a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionName.java +++ b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionName.java @@ -18,20 +18,18 @@ import com.google.common.base.Predicate; import java.io.Serializable; import java.util.Set; -/** - * An identifier for a {@code SkyFunction}. - */ +/** An identifier for a {@code SkyFunction}. */ public final class SkyFunctionName implements Serializable { - public static SkyFunctionName computed(String name) { - return new SkyFunctionName(name, true); + + /** Create a SkyFunctionName identified by {@code name}. */ + public static SkyFunctionName create(String name) { + return new SkyFunctionName(name); } private final String name; - private final boolean isComputed; - public SkyFunctionName(String name, boolean isComputed) { + private SkyFunctionName(String name) { this.name = name; - this.isComputed = isComputed; } @Override @@ -57,14 +55,6 @@ public final class SkyFunctionName implements Serializable { } /** - * Returns whether the values of this type are computed. The computation of a computed value must - * be deterministic and may only access requested dependencies. - */ - public boolean isComputed() { - return isComputed; - } - - /** * A predicate that returns true for {@link SkyKey}s that have the given {@link SkyFunctionName}. */ public static Predicate<SkyKey> functionIs(final SkyFunctionName functionName) { diff --git a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java index 35bda02f15..6671dfbc66 100644 --- a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; @RunWith(JUnit4.class) public class CyclesReporterTest { - private static final SkyKey DUMMY_KEY = new SkyKey(SkyFunctionName.computed("func"), "key"); + private static final SkyKey DUMMY_KEY = new SkyKey(SkyFunctionName.create("func"), "key"); @Test public void nullEventHandler() { diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java b/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java index 66a1355f8e..1c9c8812f1 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java @@ -47,7 +47,7 @@ import java.util.concurrent.Executors; public abstract class GraphConcurrencyTest { private static final SkyFunctionName SKY_FUNCTION_NAME = - new SkyFunctionName("GraphConcurrencyTestKey", /*isComputed=*/false); + SkyFunctionName.create("GraphConcurrencyTestKey"); private ProcessableGraph graph; private ThrowableRecordingRunnableWrapper wrapper; protected abstract ProcessableGraph getGraph(); diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java index 6095bb8b80..b62acfef76 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java @@ -42,8 +42,7 @@ import javax.annotation.Nullable; */ public class GraphTester { - // TODO(bazel-team): Split this for computing and non-computing values? - public static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + public static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private final Map<SkyKey, TestFunction> values = new HashMap<>(); private final Set<SkyKey> modifiedValues = new LinkedHashSet<>(); 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 c6caa610d3..6d8d1d3b0f 100644 --- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -47,7 +47,7 @@ import javax.annotation.Nullable; @RunWith(JUnit4.class) public class InMemoryNodeEntryTest { - private static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + private static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private static final NestedSet<TaggedEvents> NO_EVENTS = NestedSetBuilder.<TaggedEvents>emptySet(Order.STABLE_ORDER); diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java index 35a11882de..e3c1069403 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -1483,8 +1483,8 @@ public class ParallelEvaluatorTest { @Test public void testFunctionCrashTrace() throws Exception { - final SkyFunctionName childType = new SkyFunctionName("child", false); - final SkyFunctionName parentType = new SkyFunctionName("parent", false); + final SkyFunctionName childType = SkyFunctionName.create("child"); + final SkyFunctionName parentType = SkyFunctionName.create("parent"); class ChildFunction implements SkyFunction { @Override diff --git a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java index c537d58fec..efcbbec28c 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java @@ -32,7 +32,7 @@ import java.util.List; @RunWith(Parameterized.class) public class ReverseDepsUtilTest { - private static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + private static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private final int numElements; @Parameters diff --git a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java index 0eeed132c2..d5b8335d84 100644 --- a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java @@ -36,7 +36,7 @@ public class SkyKeyTest { assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(0); // When a SkyKey is constructed with that HashCodeSpy as its argument, - SkyKey originalKey = new SkyKey(new SkyFunctionName("TEMP", true), hashCodeSpy); + SkyKey originalKey = new SkyKey(SkyFunctionName.create("TEMP"), hashCodeSpy); // Then the HashCodeSpy reports that its hashcode method was called once. assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(1); |