Refactor SkyframeExecutor#preparePackageLoading to pass all PackageCacheOptions as a bundle.
This will allow me to thread a new flag through more easily in the future.
--
MOS_MIGRATED_REVID=134406676
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 a91c400..8aea62c 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
@@ -175,11 +175,12 @@
getPrecomputedValues(),
ImmutableList.<SkyValueDirtinessChecker>of(),
analysisMock.getProductName());
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 3;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- Options.getDefaults(PackageCacheOptions.class).defaultVisibility,
- true,
- 3,
+ packageCacheOptions,
ruleClassProvider.getDefaultsPackageContent(
analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()),
UUID.randomUUID(),
@@ -279,11 +280,11 @@
PathPackageLocator pathPackageLocator = PathPackageLocator.create(
outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pathPackageLocator,
- packageCacheOptions.defaultVisibility,
- true,
- 7,
+ packageCacheOptions,
ruleClassProvider.getDefaultsPackageContent(
analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()),
UUID.randomUUID(),
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 1f76af4..44157b4 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
@@ -225,11 +225,12 @@
getPrecomputedValues(),
ImmutableList.<SkyValueDirtinessChecker>of(),
analysisMock.getProductName());
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
- ConstantRuleVisibility.PUBLIC,
- true,
- 7,
+ packageCacheOptions,
"",
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -315,11 +316,11 @@
private void setUpSkyframe() {
PathPackageLocator pkgLocator = PathPackageLocator.create(
outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions.defaultVisibility,
- true,
- 7,
+ packageCacheOptions,
ruleClassProvider.getDefaultsPackageContent(optionsParser),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
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 45a135b..cdab315 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
@@ -115,11 +115,12 @@
ImmutableList.<SkyValueDirtinessChecker>of(),
analysisMock.getProductName());
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- Options.getDefaults(PackageCacheOptions.class).defaultVisibility,
- true,
- 7,
+ packageCacheOptions,
ruleClassProvider.getDefaultsPackageContent(
analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()),
UUID.randomUUID(),
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 efa36bf..812436d 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
@@ -48,6 +48,7 @@
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyFunction;
import com.google.devtools.build.skyframe.SkyFunctionName;
+import com.google.devtools.common.options.Options;
import com.google.devtools.common.options.OptionsParser;
import java.io.IOException;
import java.util.Arrays;
@@ -126,21 +127,27 @@
}
protected void setUpSkyframe(RuleVisibility defaultVisibility, String defaultsPackageContents) {
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = defaultVisibility;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = GLOBBING_THREADS;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
- defaultVisibility, true, GLOBBING_THREADS, defaultsPackageContents,
- UUID.randomUUID(), ImmutableMap.<String, String>of(),
+ packageCacheOptions,
+ defaultsPackageContents,
+ UUID.randomUUID(),
+ ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
}
private void setUpSkyframe(PackageCacheOptions packageCacheOptions) {
PathPackageLocator pkgLocator = PathPackageLocator.create(
outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = GLOBBING_THREADS;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions.defaultVisibility,
- true,
- GLOBBING_THREADS,
+ packageCacheOptions,
loadingMock.getDefaultsPackageContent(),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
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 b667018..ab66841 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
@@ -55,6 +55,7 @@
import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
import com.google.devtools.build.skyframe.SkyFunction;
import com.google.devtools.build.skyframe.SkyFunctionName;
+import com.google.devtools.common.options.Options;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -482,10 +483,16 @@
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
loadingMock.getProductName());
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(workspace)),
- ConstantRuleVisibility.PUBLIC, true, 7, "",
- UUID.randomUUID(), ImmutableMap.<String, String>of(),
+ packageCacheOptions,
+ "",
+ UUID.randomUUID(),
+ ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
}
@@ -562,10 +569,16 @@
clock.advanceMillis(1);
modifiedFileSet = getModifiedFileSet();
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(workspace)),
- ConstantRuleVisibility.PUBLIC, true, 7, "",
- UUID.randomUUID(), ImmutableMap.<String, String>of(),
+ packageCacheOptions,
+ "",
+ UUID.randomUUID(),
+ ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
skyframeExecutor.invalidateFilesUnderPathForTesting(
new Reporter(), modifiedFileSet, workspace);
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 1c3ca97..0688416 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
@@ -614,11 +614,13 @@
analysisMock.getProductName());
PathPackageLocator pkgLocator = PathPackageLocator.create(
null, options.packagePath, storedErrors, workspace, workspace);
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- ConstantRuleVisibility.PRIVATE,
- true,
- 7,
+ packageCacheOptions,
analysisMock.getDefaultsPackageContent(),
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/PackageCacheTest.java
index 5ab8687..a68ad4e 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -104,11 +104,11 @@
private void setUpSkyframe(PackageCacheOptions packageCacheOptions) {
PathPackageLocator pkgLocator = PathPackageLocator.create(
null, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
skyframeExecutor.preparePackageLoading(
pkgLocator,
- packageCacheOptions.defaultVisibility,
- true,
- 7,
+ packageCacheOptions,
analysisMock.getDefaultsPackageContent(),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
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 fcda5f4..b5d8c16 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
@@ -32,6 +32,7 @@
import com.google.devtools.build.lib.packages.NoSuchTargetException;
import com.google.devtools.build.lib.packages.Preprocessor;
import com.google.devtools.build.lib.packages.util.SubincludePreprocessor;
+import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.testutil.ManualClock;
@@ -51,6 +52,7 @@
import com.google.devtools.build.skyframe.RecordingDifferencer;
import com.google.devtools.build.skyframe.SkyKey;
import com.google.devtools.build.skyframe.SkyValue;
+import com.google.devtools.common.options.Options;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
@@ -71,12 +73,14 @@
private CustomInMemoryFs fs = new CustomInMemoryFs(new ManualClock());
private void preparePackageLoading(Path... roots) {
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.copyOf(roots)),
- ConstantRuleVisibility.PUBLIC,
- true,
- 7,
+ packageCacheOptions,
"",
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -441,12 +445,14 @@
Label.parseAbsoluteUnchecked("//foo:b.txt"))
.inOrder();
getSkyframeExecutor().resetEvaluator();
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.<Path>of(rootDirectory)),
- ConstantRuleVisibility.PUBLIC,
- true,
- 7,
+ packageCacheOptions,
"",
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
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 34570a0..f5c99ee 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
@@ -26,6 +26,7 @@
import com.google.devtools.build.lib.events.EventKind;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.util.SubincludePreprocessor;
+import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -34,6 +35,7 @@
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.common.options.Options;
import java.io.IOException;
import java.util.Collection;
import java.util.UUID;
@@ -401,12 +403,14 @@
preprocessorFactorySupplier.inject(
new SubincludePreprocessor(
scratch.getFileSystem(), getSkyframeExecutor().getPackageManager()));
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
- ConstantRuleVisibility.PRIVATE,
- true,
- 7,
+ packageCacheOptions,
loadingMock.getDefaultsPackageContent(),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
@@ -446,12 +450,14 @@
preprocessorFactorySupplier.inject(
new SubincludePreprocessor(
scratch.getFileSystem(), getSkyframeExecutor().getPackageManager()));
+ PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class);
+ packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
+ packageCacheOptions.showLoadingProgress = true;
+ packageCacheOptions.globbingThreads = 7;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
- ConstantRuleVisibility.PRIVATE,
- true,
- 7,
+ packageCacheOptions,
loadingMock.getDefaultsPackageContent(),
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 d5dff75..a1dffc0 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
@@ -23,12 +23,14 @@
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.skyframe.EvaluationResult;
import com.google.devtools.build.skyframe.SkyKey;
+import com.google.devtools.common.options.Options;
import java.util.Collection;
import java.util.UUID;
import org.junit.Before;
@@ -155,12 +157,14 @@
* 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;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
- ConstantRuleVisibility.PUBLIC,
- true,
- 7,
+ packageCacheOptions,
"",
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
index f869e65..43750f4 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
+import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.util.BlazeClock;
@@ -31,6 +32,7 @@
import com.google.devtools.build.skyframe.ErrorInfo;
import com.google.devtools.build.skyframe.EvaluationResult;
import com.google.devtools.build.skyframe.SkyKey;
+import com.google.devtools.common.options.Options;
import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
@@ -46,12 +48,14 @@
@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;
getSkyframeExecutor()
.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory, alternativeRoot)),
- ConstantRuleVisibility.PUBLIC,
- true,
- 7,
+ packageCacheOptions,
"",
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
