diff options
| author |  janakr <janakr@google.com> | 2017-05-03 21:38:28 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-04 13:13:32 +0200 |
| commit | bfdad902c89b101fd39a9795ea493ca5e0531052 (patch) | |
| tree | 5512dabeb8dce04ff66d647dfab5b76752c9e775 /src/main/java/com/google/devtools/build/lib/rules/repository | |
| parent | c5672f8edb1cb9fb7806024706d776901d7d434e (diff) | |
Make SkyKey an interface, and start the migration of not creating SkyKey wrapper objects: for OwnedArtifacts, which are the most numerous during builds, and for Labels for TransitiveTraversalValues, which are the most numerous during queries.
PiperOrigin-RevId: 154989520
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/repository')
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java index 1cafeb7e08..f95329ef5c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionException; import com.google.devtools.build.skyframe.SkyFunctionException.Transience; @@ -53,7 +54,7 @@ import javax.annotation.Nullable; */ public final class RepositoryDelegatorFunction implements SkyFunction { public static final Precomputed<Map<RepositoryName, PathFragment>> REPOSITORY_OVERRIDES = - new Precomputed<>(SkyKey.create(SkyFunctions.PRECOMPUTED, "repository_overrides")); + new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "repository_overrides")); // The marker file version is inject in the rule key digest so the rule key is always different // when we decide to update the format. diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDirectoryValue.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDirectoryValue.java index 4d073d5b1c..6e21ad5b70 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDirectoryValue.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDirectoryValue.java @@ -20,6 +20,7 @@ import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.skyframe.DirectoryListingValue; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import java.util.Arrays; @@ -124,7 +125,7 @@ public abstract class RepositoryDirectoryValue implements SkyValue { /** Creates a key from the given repository name. */ public static SkyKey key(RepositoryName repository) { - return SkyKey.create(SkyFunctions.REPOSITORY_DIRECTORY, repository); + return LegacySkyKey.create(SkyFunctions.REPOSITORY_DIRECTORY, repository); } public static Builder builder() { |