Rename StarlarkImportLookupFunction and friends
This renames "StarlarkImportLookup*" to "BzlLoad*", and also changes a number of uses of "import" to "load". This helps keep names to a more manageable length and is in line with modern Starlark terminology.
This is refactoring work toward adding a new kind of .bzl loading context, for Bazel-internal .bzl files.
Work toward #11437.
RELNOTES: None
PiperOrigin-RevId: 313240742
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
index 65d28f9..44921cb 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
@@ -152,7 +152,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.PACKAGE,
new PackageFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
index 5903414..aea10f1 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -42,6 +42,7 @@
import com.google.devtools.build.lib.skyframe.ASTFileLookupFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesFunction;
+import com.google.devtools.build.lib.skyframe.BzlLoadFunction;
import com.google.devtools.build.lib.skyframe.ContainingPackageLookupFunction;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
@@ -56,7 +57,6 @@
import com.google.devtools.build.lib.skyframe.PrecomputedFunction;
import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SkyFunctions;
-import com.google.devtools.build.lib.skyframe.StarlarkImportLookupFunction;
import com.google.devtools.build.lib.skyframe.WorkspaceASTFunction;
import com.google.devtools.build.lib.skyframe.WorkspaceFileFunction;
import com.google.devtools.build.lib.skylarkbuildapi.repository.RepositoryBootstrap;
@@ -185,7 +185,7 @@
ruleClassProvider,
pkgFactory,
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null))
+ /*bzlLoadFunctionForInlining=*/ null))
.put(SkyFunctions.REPOSITORY, new RepositoryLoaderFunction())
.put(
SkyFunctions.LOCAL_REPOSITORY_LOOKUP,
@@ -200,8 +200,8 @@
SkyFunctions.AST_FILE_LOOKUP,
new ASTFileLookupFunction(ruleClassProvider, fileSystem.getDigestFunction()))
.put(
- SkyFunctions.STARLARK_IMPORTS_LOOKUP,
- StarlarkImportLookupFunction.create(
+ SkyFunctions.BZL_LOAD,
+ BzlLoadFunction.create(
ruleClassProvider,
pkgFactory,
fileSystem.getDigestFunction(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
index 95472e0..1452078 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
@@ -128,7 +128,7 @@
.builder(directories)
.build(TestRuleClassProvider.getRuleClassProvider(), fs),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null))
+ /*bzlLoadFunctionForInlining=*/ null))
.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index 34b6e36..40aaf3a 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -171,8 +171,8 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:broken_diff_awareness_exception",
"//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:builder",
- "//src/main/java/com/google/devtools/build/lib/skyframe:cached_starlark_import_lookup_value_and_deps",
- "//src/main/java/com/google/devtools/build/lib/skyframe:cached_starlark_import_lookup_value_and_deps_builder_factory",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:cached_bzl_load_value_and_deps",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:cached_bzl_load_value_and_deps_builder_factory",
"//src/main/java/com/google/devtools/build/lib/skyframe:collect_packages_under_directory_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_and_data",
"//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
@@ -215,7 +215,7 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_aware_action",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
- "//src/main/java/com/google/devtools/build/lib/skyframe:starlark_import_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:bzl_load_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_phase_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:tests_for_target_pattern_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:top_down_action_cache",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
similarity index 80%
rename from src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java
rename to src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
index e7a4639..4413886 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
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.BzlLoadFunction.BzlLoadFailedException;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.FileStatus;
@@ -50,9 +50,9 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/** Tests for StarlarkImportLookupFunction. */
+/** Tests for BzlLoadFunction. */
@RunWith(JUnit4.class)
-public class StarlarkImportLookupFunctionTest extends BuildViewTestCase {
+public class BzlLoadFunctionTest extends BuildViewTestCase {
@Override
protected FileSystem createFileSystem() {
return new CustomInMemoryFs();
@@ -80,7 +80,7 @@
}
@Test
- public void testStarlarkImportLabels() throws Exception {
+ public void testBzlLoadLabels() throws Exception {
scratch.file("pkg1/BUILD");
scratch.file("pkg1/ext.bzl");
checkSuccessfulLookup("//pkg1:ext.bzl");
@@ -95,14 +95,14 @@
}
@Test
- public void testStarlarkImportLabelsAlternativeRoot() throws Exception {
+ public void testBzlLoadLabelsAlternativeRoot() throws Exception {
scratch.file("/root_2/pkg4/BUILD");
scratch.file("/root_2/pkg4/ext.bzl");
checkSuccessfulLookup("//pkg4:ext.bzl");
}
@Test
- public void testStarlarkImportLabelsMultipleBuildFiles() throws Exception {
+ public void testBzlLoadLabelsMultipleBuildFiles() throws Exception {
scratch.file("dir1/BUILD");
scratch.file("dir1/dir2/BUILD");
scratch.file("dir1/dir2/ext.bzl");
@@ -166,39 +166,37 @@
checkSuccessfulLookup("//pkg:subdir/ext2.bzl");
}
- private EvaluationResult<StarlarkImportLookupValue> get(SkyKey starlarkImportLookupKey)
- throws Exception {
- EvaluationResult<StarlarkImportLookupValue> result =
+ private EvaluationResult<BzlLoadValue> get(SkyKey skyKey) throws Exception {
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
if (result.hasError()) {
- fail(result.getError(starlarkImportLookupKey).getException().getMessage());
+ fail(result.getError(skyKey).getException().getMessage());
}
return result;
}
private static SkyKey key(String label) {
- return StarlarkImportLookupValue.packageBzlKey(Label.parseAbsoluteUnchecked(label));
+ return BzlLoadValue.packageBzlKey(Label.parseAbsoluteUnchecked(label));
}
// Ensures that a Starlark file has been successfully processed by checking that the
// the label in its dependency set corresponds to the requested label.
private void checkSuccessfulLookup(String label) throws Exception {
- SkyKey starlarkImportLookupKey = key(label);
- EvaluationResult<StarlarkImportLookupValue> result = get(starlarkImportLookupKey);
- assertThat(label)
- .isEqualTo(result.get(starlarkImportLookupKey).getDependency().getLabel().toString());
+ SkyKey skyKey = key(label);
+ EvaluationResult<BzlLoadValue> result = get(skyKey);
+ assertThat(label).isEqualTo(result.get(skyKey).getDependency().getLabel().toString());
}
@Test
- public void testStarlarkImportLookupNoBuildFile() throws Exception {
+ public void testBzlLoadNoBuildFile() throws Exception {
scratch.file("pkg/ext.bzl", "");
- SkyKey starlarkImportLookupKey = key("//pkg:ext.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ SkyKey skyKey = key("//pkg:ext.bzl");
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
assertThat(result.hasError()).isTrue();
- ErrorInfo errorInfo = result.getError(starlarkImportLookupKey);
+ ErrorInfo errorInfo = result.getError(skyKey);
String errorMessage = errorInfo.getException().getMessage();
assertThat(errorMessage)
.contains(
@@ -206,32 +204,31 @@
}
@Test
- public void testStarlarkImportLookupNoBuildFileForLoad() throws Exception {
+ public void testBzlLoadNoBuildFileForLoad() throws Exception {
scratch.file("pkg2/BUILD");
scratch.file("pkg1/ext.bzl", "a = 1");
scratch.file("pkg2/ext.bzl", "load('//pkg1:ext.bzl', 'a')");
- SkyKey starlarkImportLookupKey = key("//pkg:ext.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ SkyKey skyKey = key("//pkg:ext.bzl");
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
assertThat(result.hasError()).isTrue();
- ErrorInfo errorInfo = result.getError(starlarkImportLookupKey);
+ ErrorInfo errorInfo = result.getError(skyKey);
String errorMessage = errorInfo.getException().getMessage();
assertThat(errorMessage).contains("Every .bzl file must have a corresponding package");
}
@Test
- public void testStarlarkImportFilenameWithControlChars() throws Exception {
+ public void testBzlLoadFilenameWithControlChars() throws Exception {
scratch.file("pkg/BUILD", "");
scratch.file("pkg/ext.bzl", "load('//pkg:oops\u0000.bzl', 'a')");
- SkyKey starlarkImportLookupKey = key("//pkg:ext.bzl");
+ SkyKey skyKey = key("//pkg:ext.bzl");
AssertionError e =
assertThrows(
AssertionError.class,
() ->
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false,
- reporter));
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter));
String errorMessage = e.getMessage();
assertThat(errorMessage)
.contains(
@@ -256,15 +253,15 @@
RootedPath.toRootedPath(
Root.fromPath(p.getParentDirectory()), PathFragment.create("WORKSPACE"));
- SkyKey starlarkImportLookupKey =
- StarlarkImportLookupValue.workspaceBzlKey(
+ SkyKey skyKey =
+ BzlLoadValue.workspaceBzlKey(
Label.parseAbsoluteUnchecked("@a_remote_repo//remote_pkg:ext.bzl"),
/* inWorkspace= */
/* workspaceChunk= */ 0,
rootedPath);
- EvaluationResult<StarlarkImportLookupValue> result =
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
assertThat(result.hasError()).isFalse();
}
@@ -333,17 +330,17 @@
// checkStrayLabel checks that execution of target fails because
// the label of its load statement strays into a subpackage.
private void checkStrayLabel(String target, String expectedMessage) throws InterruptedException {
- SkyKey starlarkImportLookupKey = key(target);
- EvaluationResult<StarlarkImportLookupValue> result =
+ SkyKey skyKey = key(target);
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
assertThat(result.hasError()).isTrue();
assertThatEvaluationResult(result)
- .hasErrorEntryForKeyThat(starlarkImportLookupKey)
+ .hasErrorEntryForKeyThat(skyKey)
.hasExceptionThat()
- .isInstanceOf(StarlarkImportFailedException.class);
+ .isInstanceOf(BzlLoadFailedException.class);
assertThatEvaluationResult(result)
- .hasErrorEntryForKeyThat(starlarkImportLookupKey)
+ .hasErrorEntryForKeyThat(skyKey)
.hasExceptionThat()
.hasMessageThat()
.contains(expectedMessage);
@@ -354,17 +351,17 @@
throws Exception {
scratch.file("BUILD", "load(\"@repository//dir:file.bzl\", \"foo\")");
- SkyKey starlarkImportLookupKey = key("@repository//dir:file.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ SkyKey skyKey = key("@repository//dir:file.bzl");
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
assertThat(result.hasError()).isTrue();
assertThatEvaluationResult(result)
- .hasErrorEntryForKeyThat(starlarkImportLookupKey)
+ .hasErrorEntryForKeyThat(skyKey)
.hasExceptionThat()
- .isInstanceOf(StarlarkImportFailedException.class);
+ .isInstanceOf(BzlLoadFailedException.class);
assertThatEvaluationResult(result)
- .hasErrorEntryForKeyThat(starlarkImportLookupKey)
+ .hasErrorEntryForKeyThat(skyKey)
.hasExceptionThat()
.hasMessageThat()
.contains(
@@ -399,16 +396,14 @@
Root root = Root.fromPath(p.getParentDirectory());
RootedPath rootedPath = RootedPath.toRootedPath(root, PathFragment.create("WORKSPACE"));
- SkyKey starlarkImportLookupKey =
- StarlarkImportLookupValue.workspaceBzlKey(
- Label.parseAbsoluteUnchecked("@a//:a.bzl"), 1, rootedPath);
+ SkyKey skyKey =
+ BzlLoadValue.workspaceBzlKey(Label.parseAbsoluteUnchecked("@a//:a.bzl"), 1, rootedPath);
- EvaluationResult<StarlarkImportLookupValue> result =
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
- getSkyframeExecutor(), starlarkImportLookupKey, /*keepGoing=*/ false, reporter);
+ getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
- assertThat(result.get(starlarkImportLookupKey).getModule().getGlobals())
- .containsEntry("a_symbol", 5);
+ assertThat(result.get(skyKey).getModule().getGlobals()).containsEntry("a_symbol", 5);
}
@Test
@@ -418,7 +413,7 @@
fs.badPathForRead = scratch.file("a/a1.bzl", "doesntmatter");
SkyKey key = key("//a:a1.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
getSkyframeExecutor(), key, /*keepGoing=*/ false, reporter);
assertThatEvaluationResult(result).hasErrorEntryForKeyThat(key).isTransient();
@@ -432,7 +427,7 @@
fs.badPathForRead = scratch.file("a/a2.bzl", "doesntmatter");
SkyKey key = key("//a:a1.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
getSkyframeExecutor(), key, /*keepGoing=*/ false, reporter);
assertThatEvaluationResult(result).hasErrorEntryForKeyThat(key).isNotTransient();
@@ -445,7 +440,7 @@
fs.badPathForStat = scratch.file("a/a1.bzl", "doesntmatter");
SkyKey key = key("//a:a1.bzl");
- EvaluationResult<StarlarkImportLookupValue> result =
+ EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
getSkyframeExecutor(), key, /*keepGoing=*/ false, reporter);
assertThatEvaluationResult(result).hasErrorEntryForKeyThat(key).isNotTransient();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupKeyCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadKeyCodecTest.java
similarity index 82%
rename from src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupKeyCodecTest.java
rename to src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadKeyCodecTest.java
index 7b016f6..5b5a101 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupKeyCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadKeyCodecTest.java
@@ -21,17 +21,16 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/** Tests for {@link StarlarkImportLookupKey_AutoCodec}. */
+/** Tests for BzlLoadValue key's autocodec. */
@RunWith(JUnit4.class)
-public final class StarlarkImportLookupKeyCodecTest {
+public final class BzlLoadKeyCodecTest {
@Test
public void testCodec() throws Exception {
SerializationTester serializationTester =
new SerializationTester(
- StarlarkImportLookupValue.packageBzlKey(
- Label.parseAbsolute("//foo/bar:baz", ImmutableMap.of())),
- StarlarkImportLookupValue.workspaceBzlKey(
+ BzlLoadValue.packageBzlKey(Label.parseAbsolute("//foo/bar:baz", ImmutableMap.of())),
+ BzlLoadValue.workspaceBzlKey(
Label.parseAbsolute("//foo/bar:baz", ImmutableMap.of()),
/*workspaceChunk=*/ 4,
/*workspacePath=*/ FsUtils.TEST_ROOTED_PATH));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/CachedStarlarkImportLookupValueAndDepsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/CachedBzlLoadValueAndDepsTest.java
similarity index 65%
rename from src/test/java/com/google/devtools/build/lib/skyframe/CachedStarlarkImportLookupValueAndDepsTest.java
rename to src/test/java/com/google/devtools/build/lib/skyframe/CachedBzlLoadValueAndDepsTest.java
index 8de0210..30bfc7c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/CachedStarlarkImportLookupValueAndDepsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/CachedBzlLoadValueAndDepsTest.java
@@ -28,12 +28,12 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/** Tests for {@link CachedStarlarkImportLookupValueAndDeps}. */
+/** Tests for {@link CachedBzlLoadValueAndDeps}. */
@RunWith(JUnit4.class)
-public class CachedStarlarkImportLookupValueAndDepsTest {
+public class CachedBzlLoadValueAndDepsTest {
@Test
public void testDepsAreNotVisitedMultipleTimesForDiamondDependencies() throws Exception {
- // Graph structure of StarlarkImportLookupValues:
+ // Graph structure of BzlLoadValues:
//
// p
// / \
@@ -41,52 +41,51 @@
// \ /
// gc
- StarlarkImportLookupValue dummyValue = mock(StarlarkImportLookupValue.class);
- CachedStarlarkImportLookupValueAndDepsBuilderFactory
- cachedStarlarkImportLookupValueAndDepsBuilderFactory =
- new CachedStarlarkImportLookupValueAndDepsBuilderFactory();
+ BzlLoadValue dummyValue = mock(BzlLoadValue.class);
+ CachedBzlLoadValueAndDepsBuilderFactory cachedBzlLoadValueAndDepsBuilderFactory =
+ new CachedBzlLoadValueAndDepsBuilderFactory();
- StarlarkImportLookupValue.Key gcKey = createStarlarkKey("//gc");
+ BzlLoadValue.Key gcKey = createStarlarkKey("//gc");
SkyKey gcKey1 = createKey("gc key1");
SkyKey gcKey2 = createKey("gc key2");
SkyKey gcKey3 = createKey("gc key3");
- CachedStarlarkImportLookupValueAndDeps gc =
- cachedStarlarkImportLookupValueAndDepsBuilderFactory
- .newCachedStarlarkImportLookupValueAndDepsBuilder()
+ CachedBzlLoadValueAndDeps gc =
+ cachedBzlLoadValueAndDepsBuilderFactory
+ .newCachedBzlLoadValueAndDepsBuilder()
.addDep(gcKey1)
.addDeps(ImmutableList.of(gcKey2, gcKey3))
.setKey(gcKey)
.setValue(dummyValue)
.build();
- StarlarkImportLookupValue.Key c1Key = createStarlarkKey("//c1");
+ BzlLoadValue.Key c1Key = createStarlarkKey("//c1");
SkyKey c1Key1 = createKey("c1 key1");
- CachedStarlarkImportLookupValueAndDeps c1 =
- cachedStarlarkImportLookupValueAndDepsBuilderFactory
- .newCachedStarlarkImportLookupValueAndDepsBuilder()
+ CachedBzlLoadValueAndDeps c1 =
+ cachedBzlLoadValueAndDepsBuilderFactory
+ .newCachedBzlLoadValueAndDepsBuilder()
.addDep(c1Key1)
.addTransitiveDeps(gc)
.setValue(dummyValue)
.setKey(c1Key)
.build();
- StarlarkImportLookupValue.Key c2Key = createStarlarkKey("//c2");
+ BzlLoadValue.Key c2Key = createStarlarkKey("//c2");
SkyKey c2Key1 = createKey("c2 key1");
SkyKey c2Key2 = createKey("c2 key2");
- CachedStarlarkImportLookupValueAndDeps c2 =
- cachedStarlarkImportLookupValueAndDepsBuilderFactory
- .newCachedStarlarkImportLookupValueAndDepsBuilder()
+ CachedBzlLoadValueAndDeps c2 =
+ cachedBzlLoadValueAndDepsBuilderFactory
+ .newCachedBzlLoadValueAndDepsBuilder()
.addDeps(ImmutableList.of(c2Key1, c2Key2))
.addTransitiveDeps(gc)
.setValue(dummyValue)
.setKey(c2Key)
.build();
- StarlarkImportLookupValue.Key pKey = createStarlarkKey("//p");
+ BzlLoadValue.Key pKey = createStarlarkKey("//p");
SkyKey pKey1 = createKey("p key1");
- CachedStarlarkImportLookupValueAndDeps p =
- cachedStarlarkImportLookupValueAndDepsBuilderFactory
- .newCachedStarlarkImportLookupValueAndDepsBuilder()
+ CachedBzlLoadValueAndDeps p =
+ cachedBzlLoadValueAndDepsBuilderFactory
+ .newCachedBzlLoadValueAndDepsBuilder()
.addDep(pKey1)
.addTransitiveDeps(c1)
.addTransitiveDeps(c2)
@@ -95,8 +94,7 @@
.build();
List<Iterable<SkyKey>> registeredDeps = new ArrayList<>();
- Map<StarlarkImportLookupValue.Key, CachedStarlarkImportLookupValueAndDeps>
- visitedDepsInToplevelLoad = new HashMap<>();
+ Map<BzlLoadValue.Key, CachedBzlLoadValueAndDeps> visitedDepsInToplevelLoad = new HashMap<>();
p.traverse(registeredDeps::add, visitedDepsInToplevelLoad);
assertThat(registeredDeps)
@@ -127,7 +125,7 @@
};
}
- private static StarlarkImportLookupValue.Key createStarlarkKey(String name) {
- return StarlarkImportLookupValue.packageBzlKey(Label.parseAbsoluteUnchecked(name));
+ private static BzlLoadValue.Key createStarlarkKey(String name) {
+ return BzlLoadValue.packageBzlKey(Label.parseAbsoluteUnchecked(name));
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index 0ab1f82..ab98e0e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -139,7 +139,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
index 6bb55df..1874dca 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -186,7 +186,7 @@
.builder(directories)
.build(ruleClassProvider, fs),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null))
+ /*bzlLoadFunctionForInlining=*/ null))
.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 2732dc1..dd58b95 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -170,7 +170,7 @@
.builder(directories)
.build(TestRuleClassProvider.getRuleClassProvider(), fs),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 3ced1a8..5140f3e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -198,7 +198,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fs),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index 1c1c999..87ba175 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -117,7 +117,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 08c0f64..0618e7f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -147,7 +147,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index 316efdb..6192d6c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -173,7 +173,7 @@
.getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null));
+ /*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkBuiltinsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkBuiltinsFunctionTest.java
index 62dcc23..6847bc5 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkBuiltinsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkBuiltinsFunctionTest.java
@@ -30,7 +30,7 @@
/**
* Tests for {@link StarlarkBuiltinsFunction}, and {@code @builtins} resolution behavior in {@link
- * {@link StarlarkImportLookupFunction}.
+ * {@link BzlLoadFunction}.
*/
@RunWith(JUnit4.class)
public class StarlarkBuiltinsFunctionTest extends BuildViewTestCase {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index e3cf371..427a132 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -261,7 +261,7 @@
.builder(directories)
.build(TestRuleClassProvider.getRuleClassProvider(), fileSystem),
directories,
- /*starlarkImportLookupFunctionForInlining=*/ null))
+ /*bzlLoadFunctionForInlining=*/ null))
.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index aeca3c9..f87afe0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
@@ -133,10 +133,7 @@
TestRuleClassProvider.getRuleClassProvider(true);
workspaceSkyFunc =
new WorkspaceFileFunction(
- ruleClassProvider,
- pkgFactory,
- directories,
- /*starlarkImportLookupFunctionForInlining=*/ null);
+ ruleClassProvider, pkgFactory, directories, /*bzlLoadFunctionForInlining=*/ null);
externalSkyFunc =
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER);
astSkyFunc = new WorkspaceASTFunction(ruleClassProvider);
@@ -246,7 +243,7 @@
}
@Test
- public void testImportToChunkMapSimple() throws Exception {
+ public void testLoadToChunkMapSimple() throws Exception {
scratch.file("a.bzl", "a = 'a'");
scratch.file("b.bzl", "b = 'b'");
scratch.file("BUILD", "");
@@ -260,17 +257,17 @@
SkyKey key1 = WorkspaceFileValue.key(workspace, 1);
EvaluationResult<WorkspaceFileValue> result1 = eval(key1);
WorkspaceFileValue value1 = result1.get(key1);
- assertThat(value1.getImportToChunkMap()).containsEntry("//:a.bzl", 1);
+ assertThat(value1.getLoadToChunkMap()).containsEntry("//:a.bzl", 1);
SkyKey key2 = WorkspaceFileValue.key(workspace, 2);
EvaluationResult<WorkspaceFileValue> result2 = eval(key2);
WorkspaceFileValue value2 = result2.get(key2);
- assertThat(value2.getImportToChunkMap()).containsEntry("//:a.bzl", 1);
- assertThat(value2.getImportToChunkMap()).containsEntry("//:b.bzl", 2);
+ assertThat(value2.getLoadToChunkMap()).containsEntry("//:a.bzl", 1);
+ assertThat(value2.getLoadToChunkMap()).containsEntry("//:b.bzl", 2);
}
@Test
- public void testImportToChunkMapDoesNotOverrideDuplicate() throws Exception {
+ public void testLoadToChunkMapDoesNotOverrideDuplicate() throws Exception {
scratch.file("a.bzl", "a = 'a'");
scratch.file("BUILD", "");
RootedPath workspace =
@@ -283,13 +280,13 @@
SkyKey key1 = WorkspaceFileValue.key(workspace, 1);
EvaluationResult<WorkspaceFileValue> result1 = eval(key1);
WorkspaceFileValue value1 = result1.get(key1);
- assertThat(value1.getImportToChunkMap()).containsEntry("//:a.bzl", 1);
+ assertThat(value1.getLoadToChunkMap()).containsEntry("//:a.bzl", 1);
SkyKey key2 = WorkspaceFileValue.key(workspace, 2);
EvaluationResult<WorkspaceFileValue> result2 = eval(key2);
WorkspaceFileValue value2 = result2.get(key2);
- assertThat(value2.getImportToChunkMap()).containsEntry("//:a.bzl", 1);
- assertThat(value2.getImportToChunkMap()).doesNotContainEntry("//:a.bzl", 2);
+ assertThat(value2.getLoadToChunkMap()).containsEntry("//:a.bzl", 1);
+ assertThat(value2.getLoadToChunkMap()).doesNotContainEntry("//:a.bzl", 2);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
index 1ed71e2..7a7d311 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
@@ -52,10 +52,10 @@
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.rules.objc.ObjcProvider;
+import com.google.devtools.build.lib.skyframe.BzlLoadFunction;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
import com.google.devtools.build.lib.skyframe.PackageFunction;
import com.google.devtools.build.lib.skyframe.SkyFunctions;
-import com.google.devtools.build.lib.skyframe.StarlarkImportLookupFunction;
import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.Sequence;
import com.google.devtools.build.lib.syntax.Starlark;
@@ -1505,7 +1505,7 @@
}
@Test
- public void testMultipleImportsOfSameRule() throws Exception {
+ public void testMultipleLoadsOfSameRule() throws Exception {
scratch.file("test/skylark/BUILD");
scratch.file(
"test/skylark/extension.bzl",
@@ -1545,7 +1545,7 @@
}
@Test
- public void testImportInStarlark() throws Exception {
+ public void testLoadInStarlark() throws Exception {
scratch.file("test/skylark/implementation.bzl", "def custom_rule_impl(ctx):", " return None");
scratch.file(
@@ -1594,7 +1594,7 @@
}
@Test
- public void testRecursiveImport() throws Exception {
+ public void testRecursiveLoad() throws Exception {
scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext1.bzl', 'symbol2')");
scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol1')");
@@ -1615,7 +1615,7 @@
}
@Test
- public void testRecursiveImport2() throws Exception {
+ public void testRecursiveLoad2() throws Exception {
scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext3.bzl', 'symbol3')");
scratch.file("test/skylark/ext3.bzl", "load('//test/skylark:ext4.bzl', 'symbol4')");
@@ -2952,19 +2952,17 @@
ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions =
((InMemoryMemoizingEvaluator) getSkyframeExecutor().getEvaluatorForTesting())
.getSkyFunctionsForTesting();
- StarlarkImportLookupFunction starlarkImportLookupFunction =
- StarlarkImportLookupFunction.createForInliningSelfForPackageAndWorkspaceNodes(
- this.getRuleClassProvider(),
- this.getPackageFactory(),
- /*starlarkImportLookupValueCacheSize=*/ 2);
- starlarkImportLookupFunction.resetSelfInliningCache();
+ BzlLoadFunction bzlLoadFunction =
+ BzlLoadFunction.createForInliningSelfForPackageAndWorkspaceNodes(
+ this.getRuleClassProvider(), this.getPackageFactory(), /*bzlLoadValueCacheSize=*/ 2);
+ bzlLoadFunction.resetSelfInliningCache();
((PackageFunction) skyFunctions.get(SkyFunctions.PACKAGE))
- .setStarlarkImportLookupFunctionForInliningForTesting(starlarkImportLookupFunction);
+ .setBzlLoadFunctionForInliningForTesting(bzlLoadFunction);
}
@Override
@Test
- public void testRecursiveImport() throws Exception {
+ public void testRecursiveLoad() throws Exception {
scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext1.bzl', 'symbol2')");
scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol1')");
@@ -2980,12 +2978,12 @@
BuildFileContainsErrorsException.class, () -> getTarget("//test/skylark:rule"));
assertThat(e)
.hasMessageThat()
- .contains("Starlark import cycle: [//test/skylark:ext1.bzl, //test/skylark:ext2.bzl]");
+ .contains("Starlark load cycle: [//test/skylark:ext1.bzl, //test/skylark:ext2.bzl]");
}
@Override
@Test
- public void testRecursiveImport2() throws Exception {
+ public void testRecursiveLoad2() throws Exception {
scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext3.bzl', 'symbol3')");
scratch.file("test/skylark/ext3.bzl", "load('//test/skylark:ext4.bzl', 'symbol4')");
@@ -3003,7 +3001,7 @@
assertThat(e)
.hasMessageThat()
.contains(
- "Starlark import cycle: [//test/skylark:ext2.bzl, "
+ "Starlark load cycle: [//test/skylark:ext2.bzl, "
+ "//test/skylark:ext3.bzl, //test/skylark:ext4.bzl]");
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
index ec72f3f..089115e 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
@@ -49,7 +49,7 @@
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.StructProvider;
import com.google.devtools.build.lib.packages.Type;
-import com.google.devtools.build.lib.skyframe.StarlarkImportLookupFunction;
+import com.google.devtools.build.lib.skyframe.BzlLoadFunction;
import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
import com.google.devtools.build.lib.syntax.ClassObject;
import com.google.devtools.build.lib.syntax.Dict;
@@ -776,7 +776,7 @@
if (!file.ok()) {
throw new SyntaxError.Exception(file.errors());
}
- StarlarkImportLookupFunction.execAndExport(
+ BzlLoadFunction.execAndExport(
file, FAKE_LABEL, ev.getEventHandler(), module, ev.getStarlarkThread());
}
