Rename PackageCacheOptions to PackageCache.
PackageCache refers to a historical implementation of Bazel, predating
Skyframe. Rename the options and fix names referring to the PackageCache.
RELNOTES: None.
PiperOrigin-RevId: 306265392
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 70e950b..ee0022a 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
@@ -44,7 +44,7 @@
import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule;
import com.google.devtools.build.lib.rules.repository.ManagedDirectoriesKnowledgeImpl;
@@ -223,7 +223,7 @@
@Override
public void beforeCommand(CommandEnvironment env) {
clientEnvironmentSupplier.set(env.getRepoEnv());
- PackageCacheOptions pkgOptions = env.getOptions().getOptions(PackageCacheOptions.class);
+ PackageOptions pkgOptions = env.getOptions().getOptions(PackageOptions.class);
isFetch.set(pkgOptions != null && pkgOptions.fetch);
resolvedFile = Optional.<RootedPath>absent();
resolvedFileReplacingWorkspace = Optional.<RootedPath>absent();
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java
index 5d18bc2..5f693b7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.analysis.NoBuildRequestFinishedEvent;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.query2.common.AbstractBlazeQueryEnvironment;
import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Setting;
import com.google.devtools.build.lib.query2.engine.QueryEvalResult;
@@ -43,7 +43,7 @@
/** Fetches external repositories. Which is so fetch. */
@Command(
name = FetchCommand.NAME,
- options = {PackageCacheOptions.class, KeepGoingOption.class, LoadingPhaseThreadsOption.class},
+ options = {PackageOptions.class, KeepGoingOption.class, LoadingPhaseThreadsOption.class},
help = "resource:fetch.txt",
shortDescription = "Fetches external repositories that are prerequisites to the targets.",
allowResidue = true,
@@ -65,7 +65,7 @@
}
try {
- env.setupPackageCache(options);
+ env.syncPackageLoading(options);
} catch (InterruptedException e) {
env.getReporter().handle(Event.error("fetch interrupted"));
return BlazeCommandResult.exitCode(ExitCode.INTERRUPTED);
@@ -74,7 +74,7 @@
return BlazeCommandResult.exitCode(e.getExitCode());
}
- PackageCacheOptions pkgOptions = options.getOptions(PackageCacheOptions.class);
+ PackageOptions pkgOptions = options.getOptions(PackageOptions.class);
if (!pkgOptions.fetch) {
env.getReporter().handle(Event.error(null, "You cannot run fetch with --fetch=false"));
return BlazeCommandResult.exitCode(ExitCode.COMMAND_LINE_ERROR);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
index 183a624..7b7dc23 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
@@ -28,7 +28,7 @@
import com.google.devtools.build.lib.events.ExtendedEventHandler.ResolvedEvent;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.rules.repository.RepositoryDirectoryValue;
import com.google.devtools.build.lib.rules.repository.ResolvedHashesFunction;
@@ -59,7 +59,7 @@
@Command(
name = SyncCommand.NAME,
options = {
- PackageCacheOptions.class,
+ PackageOptions.class,
KeepGoingOption.class,
LoadingPhaseThreadsOption.class,
SyncOptions.class
@@ -94,7 +94,7 @@
true,
true,
env.getCommandId().toString()));
- env.setupPackageCache(options);
+ env.syncPackageLoading(options);
SkyframeExecutor skyframeExecutor = env.getSkyframeExecutor();
SyncOptions syncOptions = options.getOptions(SyncOptions.class);
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
index 576d840..f2be94e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
@@ -28,7 +28,7 @@
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.runtime.KeepGoingOption;
import com.google.devtools.build.lib.runtime.LoadingPhaseThreadsOption;
import com.google.devtools.build.lib.runtime.UiOptions;
@@ -75,7 +75,7 @@
private static final ImmutableList<Class<? extends OptionsBase>> MANDATORY_OPTIONS =
ImmutableList.of(
BuildRequestOptions.class,
- PackageCacheOptions.class,
+ PackageOptions.class,
StarlarkSemanticsOptions.class,
LoadingOptions.class,
AnalysisOptions.class,
@@ -201,11 +201,9 @@
return getOptions(BuildRequestOptions.class);
}
- /**
- * Returns the set of options related to the loading phase.
- */
- public PackageCacheOptions getPackageCacheOptions() {
- return getOptions(PackageCacheOptions.class);
+ /** Returns the set of options related to the loading phase. */
+ public PackageOptions getPackageOptions() {
+ return getOptions(PackageOptions.class);
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index a44ec24..af600c3 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -731,7 +731,7 @@
.setVerboseExplanations(options.verboseExplanations)
.build()),
env.getTopDownActionCache(),
- request.getPackageCacheOptions().checkOutputFiles
+ request.getPackageOptions().checkOutputFiles
? modifiedOutputFiles
: ModifiedFileSet.NOTHING_MODIFIED,
env.getFileCache(),
diff --git a/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java b/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
index 1d83a50..cb2d512 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
@@ -92,7 +92,8 @@
* @param globExecutor thread pool for glob evaluation.
* @param maxDirectoriesToEagerlyVisit the number of directories to eagerly traverse on the first
* glob for a given package, in order to warm the filesystem. -1 means do no eager traversal.
- * See {@code PackageCacheOptions#maxDirectoriesToEagerlyVisitInGlobbing}.
+ * See {@link
+ * com.google.devtools.build.lib.pkgcache.PackageOptions#maxDirectoriesToEagerlyVisitInGlobbing}.
*/
public GlobCache(
final Path packageDirectory,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 2181705..2c8cb30 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -206,10 +206,10 @@
/**
* Sets the number of directories to eagerly traverse on the first glob for a given package, in
- * order to warm the filesystem. -1 means do no eager traversal. See {@code
- * PackageCacheOptions#maxDirectoriesToEagerlyVisitInGlobbing}. -2 means do the eager traversal
- * using the regular globbing infrastructure, i.e. sharing the globbing threads and caching the
- * actual glob results.
+ * order to warm the filesystem. -1 means do no eager traversal. See {@link
+ * com.google.devtools.build.lib.pkgcache.PackageOptions#maxDirectoriesToEagerlyVisitInGlobbing}.
+ * -2 means do the eager traversal using the regular globbing infrastructure, i.e. sharing the
+ * globbing threads and caching the actual glob results.
*/
public void setMaxDirectoriesToEagerlyVisitInGlobbing(
int maxDirectoriesToEagerlyVisitInGlobbing) {
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java
similarity index 98%
rename from src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
rename to src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java
index 2f86dc0..a233964 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java
@@ -34,10 +34,8 @@
import com.google.devtools.common.options.OptionsParsingException;
import java.util.List;
-/**
- * Options for configuring the PackageCache.
- */
-public class PackageCacheOptions extends OptionsBase {
+/** Options for configuring Packages -- loading and default behaviors. */
+public class PackageOptions extends OptionsBase {
/**
* Converter for the {@code --default_visibility} option.
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index fa214bb..d76e9fa 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -506,7 +506,7 @@
&& !commandAnnotation.name().equals("clean")
&& !commandAnnotation.name().equals("info")) {
try {
- env.setupPackageCache(options);
+ env.syncPackageLoading(options);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
reporter.handle(Event.error("command interrupted while setting up package cache"));
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 373cac6..a3a9519 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -27,8 +27,8 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.exec.SingleBuildFileCache;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.ProfilerTask;
@@ -98,7 +98,7 @@
private TopDownActionCache topDownActionCache;
private Path workingDirectory;
private String workspaceName;
- private boolean haveSetupPackageCache = false;
+ private boolean hasSyncedPackageLoading = false;
// This AtomicReference is set to:
// - null, if neither BlazeModuleEnvironment#exit nor #precompleteCommand have been called
@@ -166,7 +166,7 @@
timestampGranularityMonitor.setCommandStartTime();
// TODO(ulfjack): We don't call beforeCommand() in tests, but rely on workingDirectory being set
- // in setupPackageCache(). This leads to NPE if we don't set it here.
+ // in syncPackageLoading(). This leads to NPE if we don't set it here.
Path workspacePath = directories.getWorkspace();
this.setWorkingDirectory(workspacePath);
this.workspaceName = null;
@@ -178,9 +178,7 @@
workspace
.getSkyframeExecutor()
.createPackageLocator(
- reporter,
- options.getOptions(PackageCacheOptions.class).packagePath,
- workingDirectory);
+ reporter, options.getOptions(PackageOptions.class).packagePath, workingDirectory);
} else {
this.packageLocator = null;
}
@@ -241,7 +239,7 @@
return false;
}
for (int i = 0; i < command.options().length; ++i) {
- if (command.options()[i] == PackageCacheOptions.class) {
+ if (command.options()[i] == PackageOptions.class) {
return true;
}
}
@@ -592,25 +590,23 @@
}
/**
- * Initializes the package cache using the given options, and syncs the package cache. Also
- * injects the Starlark semantics using the options for the {@link
- * com.google.devtools.build.lib.analysis.config.BuildConfiguration}.
+ * Initializes and syncs the graph with the given options, readying it for the next evaluation.
*/
- public void setupPackageCache(OptionsProvider options)
+ public void syncPackageLoading(OptionsProvider options)
throws InterruptedException, AbruptExitException {
- // We want to ensure that we're never calling #setupPackageCache twice in the same build because
- // it does the very expensive work of diffing the cache between incremental builds.
+ // We want to ensure that we're never calling #syncPackageLoading twice in the same build
+ // because it does the very expensive work of diffing the cache between incremental builds.
// {@link SequencedSkyframeExecutor#handleDiffs} is the particular method we don't want to be
// calling twice. We could feasibly factor it out of this call.
- if (this.haveSetupPackageCache) {
+ if (hasSyncedPackageLoading) {
throw new IllegalStateException(
"We should never call this method more than once over the course of a single command");
}
- this.haveSetupPackageCache = true;
+ hasSyncedPackageLoading = true;
getSkyframeExecutor()
.sync(
reporter,
- options.getOptions(PackageCacheOptions.class),
+ options.getOptions(PackageOptions.class),
packageLocator,
options.getOptions(StarlarkSemanticsOptions.class),
getCommandId(),
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java
index eef3eee..3b13d69 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.SilentCloseable;
import com.google.devtools.build.lib.runtime.BlazeCommand;
@@ -48,7 +48,7 @@
BuildRequestOptions.class,
ExecutionOptions.class,
LocalExecutionOptions.class,
- PackageCacheOptions.class,
+ PackageOptions.class,
AnalysisOptions.class,
LoadingOptions.class,
KeepGoingOption.class,
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
index c18777e..24b1431 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
@@ -16,7 +16,7 @@
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.runtime.BlazeCommand;
import com.google.devtools.build.lib.runtime.BlazeCommandResult;
import com.google.devtools.build.lib.runtime.BlazeCommandUtils;
@@ -44,7 +44,7 @@
/** The 'blaze canonicalize-flags' command. */
@Command(
name = "canonicalize-flags",
- options = {CanonicalizeCommand.Options.class, PackageCacheOptions.class},
+ options = {CanonicalizeCommand.Options.class, PackageOptions.class},
// inherits from query to get proper package loading options.
inherits = {QueryCommand.class},
allowResidue = true,
@@ -149,9 +149,9 @@
.add(FlagClashCanaryOptions.class)
.build();
- // set up the package cache for starlark options parsing
+ // set up the command environment for starlark options parsing
try {
- env.setupPackageCache(options);
+ env.syncPackageLoading(options);
} catch (InterruptedException e) {
env.getReporter().handle(Event.error("canonicalization interrupted"));
return BlazeCommandResult.exitCode(ExitCode.INTERRUPTED);
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
index 8941fd8..9dc5cc8 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
@@ -124,7 +124,7 @@
// In order to be able to answer configuration-specific queries, we need to set up
// the package path. Since info inherits all the build options, all the necessary
// information is available here.
- env.setupPackageCache(optionsParsingResult);
+ env.syncPackageLoading(optionsParsingResult);
// TODO(bazel-team): What if there are multiple configurations? [multi-config]
return env.getSkyframeExecutor()
.getConfiguration(
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
index 9a5edc7..9697e88 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
@@ -32,7 +32,7 @@
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.TriState;
import com.google.devtools.build.lib.packages.Type;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.query2.proto.proto2api.Build.AllowedRuleClassInfo;
import com.google.devtools.build.lib.query2.proto.proto2api.Build.AttributeDefinition;
import com.google.devtools.build.lib.query2.proto.proto2api.Build.AttributeValue;
@@ -360,9 +360,8 @@
public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
throws AbruptExitException {
checkNotNull(commandOptions);
- PackageCacheOptions packageCacheOptions =
- commandOptions.getOptions(PackageCacheOptions.class);
- return print(Joiner.on(":").join(packageCacheOptions.packagePath));
+ PackageOptions packageOptions = commandOptions.getOptions(PackageOptions.class);
+ return print(Joiner.on(":").join(packageOptions.packagePath));
}
}
@@ -794,8 +793,8 @@
public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
throws AbruptExitException {
checkNotNull(commandOptions);
- return print(Joiner.on(":").join(
- commandOptions.getOptions(PackageCacheOptions.class).packagePath));
+ return print(
+ Joiner.on(":").join(commandOptions.getOptions(PackageOptions.class).packagePath));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
index 56a580f..b3de6d6 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
@@ -15,7 +15,7 @@
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.ExtendedEventHandler;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.runtime.CommonCommandOptions;
import com.google.devtools.build.lib.runtime.ProjectFile;
@@ -67,7 +67,7 @@
// external
// repositories, which we don't for project files.
null,
- optionsParser.getOptions(PackageCacheOptions.class).packagePath,
+ optionsParser.getOptions(PackageOptions.class).packagePath,
eventHandler,
workspaceDir,
workingDir,
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
index 19f3151..cc73f1d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
@@ -15,7 +15,7 @@
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.SilentCloseable;
import com.google.devtools.build.lib.query2.common.AbstractBlazeQueryEnvironment;
@@ -47,7 +47,7 @@
@Command(
name = "query",
options = {
- PackageCacheOptions.class,
+ PackageOptions.class,
QueryOptions.class,
KeepGoingOption.class,
LoadingPhaseThreadsOption.class
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryEnvironmentBasedCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryEnvironmentBasedCommand.java
index f4f1f2c..b780add 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryEnvironmentBasedCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryEnvironmentBasedCommand.java
@@ -95,7 +95,7 @@
QueryOptions queryOptions = options.getOptions(QueryOptions.class);
try {
- env.setupPackageCache(options);
+ env.syncPackageLoading(options);
} catch (InterruptedException e) {
env.getReporter().handle(Event.error("query interrupted"));
return BlazeCommandResult.exitCode(ExitCode.INTERRUPTED);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index ac86a9c..f85a3f2 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -54,7 +54,7 @@
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.packages.WorkspaceFileValue.WorkspaceFileKey;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.ProfilerTask;
@@ -226,7 +226,7 @@
@Override
public void sync(
ExtendedEventHandler eventHandler,
- PackageCacheOptions packageCacheOptions,
+ PackageOptions packageOptions,
PathPackageLocator packageLocator,
StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
@@ -246,7 +246,7 @@
}
super.sync(
eventHandler,
- packageCacheOptions,
+ packageOptions,
packageLocator,
starlarkSemanticsOptions,
commandId,
@@ -254,7 +254,7 @@
tsgm,
options);
long startTime = System.nanoTime();
- handleDiffs(eventHandler, packageCacheOptions.checkOutputFiles, options);
+ handleDiffs(eventHandler, packageOptions.checkOutputFiles, options);
long stopTime = System.nanoTime();
Profiler.instance().logSimpleTask(startTime, stopTime, ProfilerTask.INFO, "handleDiffs");
long duration = stopTime - startTime;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index c1bc99a..c88c413 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -117,8 +117,8 @@
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.pkgcache.TargetParsingPhaseTimeEvent;
import com.google.devtools.build.lib.pkgcache.TargetPatternPreloader;
@@ -1359,7 +1359,7 @@
@VisibleForTesting // productionVisibility = Visibility.PRIVATE
public void preparePackageLoading(
PathPackageLocator pkgLocator,
- PackageCacheOptions packageCacheOptions,
+ PackageOptions packageOptions,
StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
@@ -1372,18 +1372,18 @@
setCommandId(commandId);
this.clientEnv.set(clientEnv);
- setShowLoadingProgress(packageCacheOptions.showLoadingProgress);
- setDefaultVisibility(packageCacheOptions.defaultVisibility);
+ setShowLoadingProgress(packageOptions.showLoadingProgress);
+ setDefaultVisibility(packageOptions.defaultVisibility);
StarlarkSemantics starlarkSemantics = getEffectiveStarlarkSemantics(starlarkSemanticsOptions);
setSkylarkSemantics(starlarkSemantics);
setSiblingDirectoryLayout(starlarkSemantics.experimentalSiblingRepositoryLayout());
setPackageLocator(pkgLocator);
- syscalls.set(getPerBuildSyscallCache(packageCacheOptions.globbingThreads));
- this.pkgFactory.setGlobbingThreads(packageCacheOptions.globbingThreads);
+ syscalls.set(getPerBuildSyscallCache(packageOptions.globbingThreads));
+ this.pkgFactory.setGlobbingThreads(packageOptions.globbingThreads);
this.pkgFactory.setMaxDirectoriesToEagerlyVisitInGlobbing(
- packageCacheOptions.maxDirectoriesToEagerlyVisitInGlobbing);
+ packageOptions.maxDirectoriesToEagerlyVisitInGlobbing);
emittedEventState.clear();
// If the PackageFunction was interrupted, there may be stale entries here.
@@ -2642,7 +2642,7 @@
*/
public void sync(
ExtendedEventHandler eventHandler,
- PackageCacheOptions packageCacheOptions,
+ PackageOptions packageOptions,
PathPackageLocator pathPackageLocator,
StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
@@ -2680,7 +2680,7 @@
}
setRemoteExecutionEnabled(remoteOptions != null && remoteOptions.isRemoteExecutionEnabled());
syncPackageLoading(
- packageCacheOptions,
+ packageOptions,
pathPackageLocator,
starlarkSemanticsOptions,
commandId,
@@ -2708,7 +2708,7 @@
}
protected void syncPackageLoading(
- PackageCacheOptions packageCacheOptions,
+ PackageOptions packageOptions,
PathPackageLocator pathPackageLocator,
StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
@@ -2718,15 +2718,10 @@
throws AbruptExitException {
try (SilentCloseable c = Profiler.instance().profile("preparePackageLoading")) {
preparePackageLoading(
- pathPackageLocator,
- packageCacheOptions,
- starlarkSemanticsOptions,
- commandId,
- clientEnv,
- tsgm);
+ pathPackageLocator, packageOptions, starlarkSemanticsOptions, commandId, clientEnv, tsgm);
}
try (SilentCloseable c = Profiler.instance().profile("setDeletedPackages")) {
- setDeletedPackages(packageCacheOptions.getDeletedPackages());
+ setDeletedPackages(packageOptions.getDeletedPackages());
}
incrementalBuildMonitor = new SkyframeIncrementalBuildMonitor();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index f8d0801..d038a77 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -58,8 +58,8 @@
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.runtime.KeepGoingOption;
@@ -216,12 +216,12 @@
private void reinitializeSkyframeExecutor() {
SkyframeExecutorTestHelper.process(skyframeExecutor);
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 3;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 3;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -268,7 +268,7 @@
Iterables.concat(
Arrays.asList(
ExecutionOptions.class,
- PackageCacheOptions.class,
+ PackageOptions.class,
StarlarkSemanticsOptions.class,
BuildRequestOptions.class,
AnalysisOptions.class,
@@ -352,24 +352,24 @@
boolean discardAnalysisCache = viewOptions.discardAnalysisCache;
viewOptions.skyframePrepareAnalysis = flags.contains(Flag.SKYFRAME_PREPARE_ANALYSIS);
- PackageCacheOptions packageCacheOptions = optionsParser.getOptions(PackageCacheOptions.class);
+ PackageOptions packageOptions = optionsParser.getOptions(PackageOptions.class);
PathPackageLocator pathPackageLocator =
PathPackageLocator.create(
outputBase,
- packageCacheOptions.packagePath,
+ packageOptions.packagePath,
reporter,
rootDirectory,
rootDirectory,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
StarlarkSemanticsOptions starlarkSemanticsOptions =
optionsParser.getOptions(StarlarkSemanticsOptions.class);
skyframeExecutor.preparePackageLoading(
pathPackageLocator,
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 42e4313..469c411 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -131,8 +131,8 @@
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.ManagedDirectoriesKnowledge;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -206,7 +206,7 @@
private ConfigsMode configsMode = ConfigsMode.NOTRIM;
protected OptionsParser optionsParser;
- private PackageCacheOptions packageCacheOptions;
+ private PackageOptions packageOptions;
private StarlarkSemanticsOptions starlarkSemanticsOptions;
protected PackageFactory pkgFactory;
@@ -253,7 +253,7 @@
" pass");
initializeMockClient();
- packageCacheOptions = parsePackageCacheOptions();
+ packageOptions = parsePackageOptions();
starlarkSemanticsOptions = parseSkylarkSemanticsOptions();
workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory();
mutableActionGraph = new MapBasedActionGraph(actionKeyContext);
@@ -301,15 +301,15 @@
.build();
SkyframeExecutorTestHelper.process(skyframeExecutor);
skyframeExecutor.injectExtraPrecomputedValues(extraPrecomputedValues);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(root),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -421,22 +421,22 @@
PathPackageLocator pkgLocator =
PathPackageLocator.create(
outputBase,
- packageCacheOptions.packagePath,
+ packageOptions.packagePath,
reporter,
rootDirectory,
rootDirectory,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
tsgm);
skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
- skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages()));
+ skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageOptions.getDeletedPackages()));
skyframeExecutor.injectExtraPrecomputedValues(
ImmutableList.of(
PrecomputedValue.injected(
@@ -450,8 +450,8 @@
Optional.<RootedPath>absent())));
}
- protected void setPackageCacheOptions(String... options) throws Exception {
- packageCacheOptions = parsePackageCacheOptions(options);
+ protected void setPackageOptions(String... options) throws Exception {
+ packageOptions = parsePackageOptions(options);
setUpSkyframe();
}
@@ -460,12 +460,11 @@
setUpSkyframe();
}
- private static PackageCacheOptions parsePackageCacheOptions(String... options) throws Exception {
- OptionsParser parser =
- OptionsParser.builder().optionsClasses(PackageCacheOptions.class).build();
+ private static PackageOptions parsePackageOptions(String... options) throws Exception {
+ OptionsParser parser = OptionsParser.builder().optionsClasses(PackageOptions.class).build();
parser.parse("--default_visibility=public");
parser.parse(options);
- return parser.getOptions(PackageCacheOptions.class);
+ return parser.getOptions(PackageOptions.class);
}
private static StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 34059185..63c250d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -36,7 +36,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
@@ -164,12 +164,12 @@
PrecomputedValue.injected(
PrecomputedValue.BUILD_INFO_FACTORIES,
ruleClassProvider.getBuildInfoFactoriesAsMap())));
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/QueryIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/QueryIntegrationTest.java
index fb4e779..a9e3e2e 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/QueryIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/QueryIntegrationTest.java
@@ -278,7 +278,7 @@
// Ignored, as we know the test deviates from normal calling order.
}
- env.setupPackageCache(optionsParser);
+ env.syncPackageLoading(optionsParser);
OutputFormatter formatter =
OutputFormatters.getFormatter(
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
index 3d320df..6f89063 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
@@ -37,7 +37,7 @@
import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.SilentCloseable;
import com.google.devtools.build.lib.runtime.BlazeCommand;
@@ -149,7 +149,7 @@
AnalysisOptions.class,
KeepGoingOption.class,
LoadingPhaseThreadsOption.class,
- PackageCacheOptions.class,
+ PackageOptions.class,
StarlarkSemanticsOptions.class,
UiOptions.class,
SandboxOptions.class));
@@ -356,8 +356,8 @@
}
try {
- try (SilentCloseable c = Profiler.instance().profile("setupPackageCache")) {
- env.setupPackageCache(lastRequest);
+ try (SilentCloseable c = Profiler.instance().profile("syncPackageLoading")) {
+ env.syncPackageLoading(lastRequest);
}
buildTool.buildTargets(lastRequest, lastResult, null);
success = true;
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index 5754e83..0341ab1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -35,8 +35,8 @@
import com.google.devtools.build.lib.packages.RuleVisibility;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
@@ -66,7 +66,7 @@
private static final int GLOBBING_THREADS = 7;
protected LoadingMock loadingMock;
- private PackageCacheOptions packageCacheOptions;
+ private PackageOptions packageOptions;
private StarlarkSemanticsOptions starlarkSemanticsOptions;
protected ConfiguredRuleClassProvider ruleClassProvider;
protected PackageFactory packageFactory;
@@ -77,7 +77,7 @@
@Before
public final void initializeSkyframeExecutor() throws Exception {
loadingMock = LoadingMock.get();
- packageCacheOptions = parsePackageCacheOptions();
+ packageOptions = parsePackageOptions();
starlarkSemanticsOptions = parseSkylarkSemanticsOptions();
List<RuleDefinition> extraRules = getExtraRules();
if (!extraRules.isEmpty()) {
@@ -134,10 +134,10 @@
}
protected void setUpSkyframe(RuleVisibility defaultVisibility) {
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = defaultVisibility;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = GLOBBING_THREADS;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = defaultVisibility;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = GLOBBING_THREADS;
skyframeExecutor.injectExtraPrecomputedValues(
ImmutableList.of(
PrecomputedValue.injected(
@@ -148,7 +148,7 @@
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -160,31 +160,29 @@
PathPackageLocator pkgLocator =
PathPackageLocator.create(
outputBase,
- packageCacheOptions.packagePath,
+ packageOptions.packagePath,
reporter,
rootDirectory,
rootDirectory,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = GLOBBING_THREADS;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = GLOBBING_THREADS;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
- skyframeExecutor.setDeletedPackages(
- ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages()));
+ skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageOptions.getDeletedPackages()));
}
- private static PackageCacheOptions parsePackageCacheOptions(String... options) throws Exception {
- OptionsParser parser =
- OptionsParser.builder().optionsClasses(PackageCacheOptions.class).build();
+ private static PackageOptions parsePackageOptions(String... options) throws Exception {
+ OptionsParser parser = OptionsParser.builder().optionsClasses(PackageOptions.class).build();
parser.parse("--default_visibility=public");
parser.parse(options);
- return parser.getOptions(PackageCacheOptions.class);
+ return parser.getOptions(PackageOptions.class);
}
private static StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
@@ -195,8 +193,8 @@
return parser.getOptions(StarlarkSemanticsOptions.class);
}
- protected void setPackageCacheOptions(String... options) throws Exception {
- packageCacheOptions = parsePackageCacheOptions(options);
+ protected void setPackageOptions(String... options) throws Exception {
+ packageOptions = parsePackageOptions(options);
setUpSkyframe();
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
index f6318a1..d0a035d 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -104,35 +104,33 @@
SkyframeExecutorTestHelper.process(skyframeExecutor);
OptionsParser parser =
OptionsParser.builder()
- .optionsClasses(PackageCacheOptions.class, StarlarkSemanticsOptions.class)
+ .optionsClasses(PackageOptions.class, StarlarkSemanticsOptions.class)
.build();
setUpSkyframe(
- parser.getOptions(PackageCacheOptions.class),
- parser.getOptions(StarlarkSemanticsOptions.class));
+ parser.getOptions(PackageOptions.class), parser.getOptions(StarlarkSemanticsOptions.class));
}
private void setUpSkyframe(
- PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
+ PackageOptions packageOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
PathPackageLocator pkgLocator =
PathPackageLocator.create(
null,
- packageCacheOptions.packagePath,
+ packageOptions.packagePath,
reporter,
rootDirectory,
rootDirectory,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(clock));
skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
- skyframeExecutor.setDeletedPackages(
- ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages()));
+ skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageOptions.getDeletedPackages()));
}
@Override
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index e8a22f9..b8256da 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -80,7 +80,7 @@
*/
@RunWith(JUnit4.class)
public class IncrementalLoadingTest {
- protected PackageCacheTester tester;
+ protected PackageLoadingTester tester;
private Path throwOnReaddir = null;
private Path throwOnStat = null;
@@ -110,8 +110,8 @@
tester = createTester(fs, clock);
}
- protected PackageCacheTester createTester(FileSystem fs, ManualClock clock) throws Exception {
- return new PackageCacheTester(fs, clock);
+ protected PackageLoadingTester createTester(FileSystem fs, ManualClock clock) throws Exception {
+ return new PackageLoadingTester(fs, clock);
}
@Test
@@ -386,8 +386,7 @@
assertThrows(NoSuchThingException.class, () -> tester.getTarget("//a:BUILD"));
}
-
- static class PackageCacheTester {
+ static class PackageLoadingTester {
private class ManualDiffAwareness implements DiffAwareness {
private View lastView;
private View currentView;
@@ -410,7 +409,7 @@
@Override
public String name() {
- return "PackageCacheTester.DiffAwareness";
+ return "PackageLoadingTester.DiffAwareness";
}
@Override
@@ -436,7 +435,7 @@
private ModifiedFileSet modifiedFileSet;
private final ActionKeyContext actionKeyContext = new ActionKeyContext();
- public PackageCacheTester(FileSystem fs, ManualClock clock) throws IOException {
+ public PackageLoadingTester(FileSystem fs, ManualClock clock) throws IOException {
this.clock = clock;
workspace = fs.getPath("/workspace");
workspace.createDirectory();
@@ -466,10 +465,10 @@
.setDiffAwarenessFactories(ImmutableList.of(new ManualDiffAwarenessFactory()))
.build();
SkyframeExecutorTestHelper.process(skyframeExecutor);
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.injectExtraPrecomputedValues(
ImmutableList.of(
PrecomputedValue.injected(
@@ -480,7 +479,7 @@
outputBase,
ImmutableList.of(Root.fromPath(workspace)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -561,16 +560,16 @@
clock.advanceMillis(1);
modifiedFileSet = getModifiedFileSet();
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(Root.fromPath(workspace)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 9c1c9d3..9ad28f9 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -1227,7 +1227,7 @@
ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
PackageFactory pkgFactory =
analysisMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider, fs);
- PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
+ PackageOptions options = Options.getDefaults(PackageOptions.class);
storedErrors = new StoredEventHandler();
BuildOptions defaultBuildOptions;
try {
@@ -1253,10 +1253,10 @@
workspace,
workspace,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.injectExtraPrecomputedValues(
ImmutableList.of(
PrecomputedValue.injected(
@@ -1264,7 +1264,7 @@
Optional.<RootedPath>absent())));
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
similarity index 95%
rename from src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
rename to src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
index c70010f..cac6bc7 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
@@ -63,7 +63,7 @@
/** Tests for package loading. */
@RunWith(JUnit4.class)
-public class PackageCacheTest extends FoundationTestCase {
+public class PackageLoadingTest extends FoundationTestCase {
private AnalysisMock analysisMock;
private ConfiguredRuleClassProvider ruleClassProvider;
@@ -109,21 +109,21 @@
.setExtraSkyFunctions(analysisMock.getSkyFunctions(directories))
.build();
SkyframeExecutorTestHelper.process(skyframeExecutor);
- setUpSkyframe(parsePackageCacheOptions(), parseSkylarkSemanticsOptions());
+ setUpSkyframe(parsePackageOptions(), parseSkylarkSemanticsOptions());
}
private void setUpSkyframe(
- PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
+ PackageOptions packageOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
PathPackageLocator pkgLocator =
PathPackageLocator.create(
null,
- packageCacheOptions.packagePath,
+ packageOptions.packagePath,
reporter,
rootDirectory,
rootDirectory,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY);
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
skyframeExecutor.injectExtraPrecomputedValues(
ImmutableList.of(
PrecomputedValue.injected(
@@ -131,20 +131,19 @@
Optional.<RootedPath>absent())));
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
- skyframeExecutor.setDeletedPackages(
- ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages()));
+ skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageOptions.getDeletedPackages()));
}
private OptionsParser parse(String... options) throws Exception {
OptionsParser parser =
OptionsParser.builder()
- .optionsClasses(PackageCacheOptions.class, StarlarkSemanticsOptions.class)
+ .optionsClasses(PackageOptions.class, StarlarkSemanticsOptions.class)
.build();
parser.parse("--default_visibility=public");
parser.parse(options);
@@ -152,8 +151,8 @@
return parser;
}
- private PackageCacheOptions parsePackageCacheOptions(String... options) throws Exception {
- return parse(options).getOptions(PackageCacheOptions.class);
+ private PackageOptions parsePackageOptions(String... options) throws Exception {
+ return parse(options).getOptions(PackageOptions.class);
}
private StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
@@ -162,7 +161,7 @@
}
protected void setOptions(String... options) throws Exception {
- setUpSkyframe(parsePackageCacheOptions(options), parseSkylarkSemanticsOptions(options));
+ setUpSkyframe(parsePackageOptions(options), parseSkylarkSemanticsOptions(options));
}
private PackageManager getPackageManager() {
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
index 0a546af..152ba2f 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
@@ -34,8 +34,8 @@
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.pkgcache.TargetPatternPreloader;
import com.google.devtools.build.lib.query2.QueryEnvironmentFactory;
@@ -271,18 +271,18 @@
protected void initTargetPatternEvaluator(ConfiguredRuleClassProvider ruleClassProvider) {
this.toolsRepository = ruleClassProvider.getToolsRepository();
skyframeExecutor = createSkyframeExecutor(ruleClassProvider);
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
- packageCacheOptions.packagePath = ImmutableList.of(rootDirectory.getPathString());
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
+ packageOptions.packagePath = ImmutableList.of(rootDirectory.getPathString());
PathPackageLocator packageLocator =
skyframeExecutor.createPackageLocator(
- getReporter(), packageCacheOptions.packagePath, rootDirectory);
+ getReporter(), packageOptions.packagePath, rootDirectory);
try {
skyframeExecutor.sync(
getReporter(),
- packageCacheOptions,
+ packageOptions,
packageLocator,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
index 39f05d2..20b84e0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.BuildFileName;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.testutil.MoreAsserts;
@@ -269,8 +269,8 @@
PathPackageLocator pathPackageLocator =
PathPackageLocator.createWithoutExistenceCheck(
directories.getOutputBase(), ImmutableList.of(root), getBuildFileNamesByPriority());
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.packagePath = ImmutableList.of(getWorkspacePathString());
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.packagePath = ImmutableList.of(getWorkspacePathString());
scratch.file("tools/BUILD");
scratch.file("tools/empty_prelude.bzl");
ruleClassProvider =
@@ -303,7 +303,7 @@
RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY)));
skyframeExecutor.sync(
reporter,
- packageCacheOptions,
+ packageOptions,
pathPackageLocator,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 57217b1..6760733 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -42,7 +42,7 @@
import com.google.devtools.build.lib.packages.PackageValidator;
import com.google.devtools.build.lib.packages.PackageValidator.InvalidPackageException;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
@@ -106,17 +106,17 @@
private void preparePackageLoadingWithCustomStarklarkSemanticsOptions(
StarlarkSemanticsOptions starlarkSemanticsOptions, Path... roots) {
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(
outputBase,
Arrays.stream(roots).map(Root::fromPath).collect(ImmutableList.toImmutableList()),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -432,17 +432,17 @@
Root.fromPath(rootDirectory));
assertSrcs(validPackageWithoutErrors(skyKey), "foo", "//foo:a.config", "//foo:b.txt");
getSkyframeExecutor().resetEvaluator();
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
index 141870d..0bc548a 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
@@ -127,7 +127,7 @@
public void testMappingFileIsRead_fromAlternatePackagePath() throws Exception {
scratch.setWorkingDir("/other/package/path");
scratch.file("WORKSPACE");
- setPackageCacheOptions("--package_path=/other/package/path");
+ setPackageOptions("--package_path=/other/package/path");
scratch.file(
"my_mapping_file",
"platforms:", // Force line break
@@ -155,7 +155,7 @@
"platforms:", // Force line break
" //platforms:one", // Force line break
" --cpu=one");
- setPackageCacheOptions("--package_path=/other/package/path");
+ setPackageOptions("--package_path=/other/package/path");
PlatformMappingValue platformMappingValue =
executeFunction(PlatformMappingValue.Key.create(PathFragment.create("my_mapping_file")));
@@ -177,7 +177,7 @@
"platforms:", // Force line break
" //platforms:one", // Force line break
" --cpu=one");
- setPackageCacheOptions("--package_path=%workspace%:/other/package/path");
+ setPackageOptions("--package_path=%workspace%:/other/package/path");
PlatformMappingValue platformMappingValue =
executeFunction(PlatformMappingValue.Key.create(PathFragment.create("my_mapping_file")));
@@ -205,7 +205,7 @@
"platforms:", // Force line break
" //platforms:one", // Force line break
" --cpu=two");
- setPackageCacheOptions("--package_path=%workspace%:/other/package/path");
+ setPackageOptions("--package_path=%workspace%:/other/package/path");
PlatformMappingValue platformMappingValue =
executeFunction(PlatformMappingValue.Key.create(PathFragment.create("my_mapping_file")));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
index e002834..4804249 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
@@ -105,7 +105,7 @@
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- Options.getDefaults(PackageCacheOptions.class),
+ Options.getDefaults(PackageOptions.class),
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
index 63836ec..07505ee 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
@@ -98,7 +98,7 @@
scratch.file(root2 + "/WORKSPACE");
scratch.file(root1 + "/a/BUILD");
scratch.file(root2 + "/a/b/BUILD");
- setPackageCacheOptions("--package_path=" + "root1" + ":" + "root2");
+ setPackageOptions("--package_path=" + "root1" + ":" + "root2");
RecursivePkgValue valueForRoot1 = buildRecursivePkgValue(root1, PathFragment.create("a"));
String root1Pkg = valueForRoot1.getPackages().getSingleton();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
index 58755f1..1aaae8f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.events.EventKind;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.FileStatus;
@@ -416,17 +416,17 @@
@Test
public void testWithNoSubincludes() throws Exception {
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
index 72f8339..0e556fe 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -158,17 +158,17 @@
* Asserts that the targets and it's Skylark dependencies were loaded properly.
*/
private String getHash(String pkg, String name) throws Exception {
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java
index bd5bb9d..a1ff57e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.StarlarkImportLookupFunction.StarlarkImportFailedException;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
@@ -51,17 +51,17 @@
@Before
public final void preparePackageLoading() throws Exception {
Path alternativeRoot = scratch.dir("/root_2");
- PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
- packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
- packageCacheOptions.showLoadingProgress = true;
- packageCacheOptions.globbingThreads = 7;
+ PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+ packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageOptions.showLoadingProgress = true;
+ packageOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(
outputBase,
ImmutableList.of(Root.fromPath(rootDirectory), Root.fromPath(alternativeRoot)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
- packageCacheOptions,
+ packageOptions,
Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java
index 6afccdc..c7956ac 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.events.StoredEventHandler;
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
-import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
+import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.runtime.ClientOptions;
import com.google.devtools.build.lib.runtime.CommonCommandOptions;
import com.google.devtools.build.lib.runtime.KeepGoingOption;
@@ -38,7 +38,7 @@
private static final List<Class<? extends OptionsBase>> requiredOptionsClasses =
ImmutableList.of(
- PackageCacheOptions.class,
+ PackageOptions.class,
StarlarkSemanticsOptions.class,
KeepGoingOption.class,
LoadingOptions.class,
