commit 326c698dbab89fde97a234586efef75c5f8b7111
author Janak Ramakrishnan <janakr@google.com> Tue Sep 27 14:58:26 2016 +0000
committer Yun Peng <pcloudy@google.com> Tue Sep 27 16:24:55 2016 +0000
tree 6dee789d6e88484d8a58c7d19d428f6f1e683a70
parent a5b226942bd8e7667e8da7067ec9bf55d1d62508

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

src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java

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);