Remove Package#getEvents
It's not actually used anywhere in bazel.
PiperOrigin-RevId: 322166635
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 1bc7e29..69c5848 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -206,8 +206,6 @@
private ImmutableSet<String> features;
- private ImmutableList<Event> events;
-
private ImmutableList<String> registeredExecutionPlatforms;
private ImmutableList<String> registeredToolchains;
@@ -437,7 +435,6 @@
this.defaultLicense = builder.defaultLicense;
this.defaultDistributionSet = builder.defaultDistributionSet;
this.features = ImmutableSortedSet.copyOf(builder.features);
- this.events = ImmutableList.copyOf(builder.events);
this.registeredExecutionPlatforms = ImmutableList.copyOf(builder.registeredExecutionPlatforms);
this.registeredToolchains = ImmutableList.copyOf(builder.registeredToolchains);
this.repositoryMapping = Preconditions.checkNotNull(builder.repositoryMapping);
@@ -532,10 +529,6 @@
return containsErrors;
}
- public List<Event> getEvents() {
- return events;
- }
-
/** Returns an (immutable, ordered) view of all the targets belonging to this package. */
public ImmutableSortedKeyMap<String, Target> getTargets() {
return targets;
@@ -1034,10 +1027,22 @@
return filename;
}
+ /**
+ * Returns {@link Postable}s accumulated while building the package.
+ *
+ * <p>Should retrieved and reported as close to after {@link #build()} or {@link #finishBuild()}
+ * as possible - any earlier and the data may be incomplete.
+ */
public List<Postable> getPosts() {
return posts;
}
+ /**
+ * Returns {@link Event}s accumulated while building the package.
+ *
+ * <p>Should retrieved and reported as close to after {@link #build()} or {@link #finishBuild()}
+ * as possible - any earlier and the data may be incomplete.
+ */
public List<Event> getEvents() {
return events;
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index 9e41038..ce80594 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -190,12 +190,10 @@
Package result;
try {
result = resultBuilder.build();
- } catch (NoSuchPackageException e) {
+ } finally {
// Make sure not to lose events if we fail to construct the package.
Event.replayEventsOn(eventHandler, resultBuilder.getEvents());
- throw e;
}
- Event.replayEventsOn(eventHandler, result.getEvents());
return Pair.of(result, globCache);
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
index f1a1358..0930a88 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
@@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
@@ -30,7 +31,6 @@
import com.google.devtools.build.lib.clock.BlazeClock;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
import com.google.devtools.build.lib.packages.NoSuchPackageException;
import com.google.devtools.build.lib.packages.NoSuchTargetException;
@@ -54,7 +54,6 @@
import com.google.devtools.common.options.OptionsParser;
import com.google.devtools.common.options.OptionsParsingException;
import java.io.IOException;
-import java.util.List;
import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
@@ -417,9 +416,11 @@
scratch.file("e/f/BUILD");
scratch.file("e/BUILD", "# Whatever", "filegroup(name='fg', srcs=['f/g'])");
reporter.removeHandler(failFastHandler);
- List<Event> events = getPackage("e").getEvents();
- assertThat(events).hasSize(1);
- assertThat(events.get(0).getLocation().line()).isEqualTo(2);
+
+ getPackage("e");
+
+ assertThat(eventCollector).hasSize(1);
+ assertThat(Iterables.getOnlyElement(eventCollector).getLocation().line()).isEqualTo(2);
}
/** Static tests (i.e. no changes to filesystem, nor calls to sync). */
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 98eec33..acffec6 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
@@ -50,7 +50,6 @@
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.syntax.Module;
import com.google.devtools.build.lib.testutil.ManualClock;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
import com.google.devtools.build.lib.util.DetailedExitCode;
import com.google.devtools.build.lib.util.ExitCode;
import com.google.devtools.build.lib.util.Pair;
@@ -949,11 +948,9 @@
invalidatePackages();
SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//pkg"));
- Package pkg = validPackage(skyKey);
+ validPackage(skyKey);
- String expectedEventString = "expected boolean for argument `allow_empty`, got `5`";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
- assertContainsEvent(expectedEventString);
+ assertContainsEvent("expected boolean for argument `allow_empty`, got `5`");
}
@Test
@@ -964,7 +961,7 @@
SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//pkg"));
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
}
@Test
@@ -980,7 +977,7 @@
SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//pkg"));
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
}
@Test
@@ -993,7 +990,7 @@
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
scratch.deleteFile("pkg/blah.foo");
getSkyframeExecutor()
@@ -1005,11 +1002,9 @@
reporter.removeHandler(failFastHandler);
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- String expectedEventString =
+ assertContainsEvent(
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
- + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
- assertContainsEvent(expectedEventString);
+ + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).");
}
@Test
@@ -1027,7 +1022,7 @@
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
scratch.deleteFile("pkg/blah.foo");
getSkyframeExecutor()
@@ -1039,11 +1034,9 @@
reporter.removeHandler(failFastHandler);
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- String expectedEventString =
+ assertContainsEvent(
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
- + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
- assertContainsEvent(expectedEventString);
+ + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).");
}
@Test
@@ -1059,7 +1052,6 @@
String expectedEventString =
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
+ "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
scratch.overwriteFile("pkg/BUILD", "x = " + "glob(['*.foo'], allow_empty=False) #comment");
@@ -1071,7 +1063,6 @@
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
}
@@ -1093,7 +1084,6 @@
String expectedEventString =
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
+ "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
scratch.overwriteFile("pkg/BUILD", "x = " + "glob(['*.foo']) #comment");
@@ -1105,7 +1095,6 @@
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
}
@@ -1124,7 +1113,6 @@
String expectedEventString =
"all files in the glob have been excluded, but allow_empty is set to False (the "
+ "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
scratch.overwriteFile(
@@ -1138,7 +1126,6 @@
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
}
@@ -1162,7 +1149,6 @@
String expectedEventString =
"all files in the glob have been excluded, but allow_empty is set to False (the "
+ "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
scratch.overwriteFile("pkg/BUILD", "x = glob(include=['*.foo'], exclude=['blah.*']) # comment");
@@ -1174,7 +1160,6 @@
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
assertContainsEvent(expectedEventString);
}
@@ -1188,11 +1173,9 @@
reporter.removeHandler(failFastHandler);
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- String expectedEventString =
+ assertContainsEvent(
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
- + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
- assertContainsEvent(expectedEventString);
+ + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).");
scratch.file("pkg/blah.foo");
getSkyframeExecutor()
@@ -1202,9 +1185,10 @@
Root.fromPath(rootDirectory));
reporter.addHandler(failFastHandler);
+ eventCollector.clear();
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
}
@Test
@@ -1222,11 +1206,10 @@
reporter.removeHandler(failFastHandler);
Package pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isTrue();
- String expectedEventString =
+
+ assertContainsEvent(
"glob pattern '*.foo' didn't match anything, but allow_empty is set to False (the "
- + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).";
- MoreAsserts.assertContainsEvent(pkg.getEvents(), expectedEventString);
- assertContainsEvent(expectedEventString);
+ + "default value of allow_empty can be set with --incompatible_disallow_empty_glob).");
scratch.file("pkg/blah.foo");
getSkyframeExecutor()
@@ -1236,9 +1219,10 @@
Root.fromPath(rootDirectory));
reporter.addHandler(failFastHandler);
+ eventCollector.clear();
pkg = validPackage(skyKey);
assertThat(pkg.containsErrors()).isFalse();
- assertThat(pkg.getEvents()).isEmpty();
+ assertNoEvents();
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java
index fcfd045..7274e02 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java
@@ -85,7 +85,6 @@
PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("bad"));
Package badPkg = pkgLoader.loadPackage(pkgId);
assertThat(badPkg.containsErrors()).isTrue();
- assertContainsEvent(badPkg.getEvents(), "invalidBUILDsyntax");
assertContainsEvent(handler.getEvents(), "invalidBUILDsyntax");
}
@@ -98,7 +97,6 @@
assertThat(goodPkg.containsErrors()).isFalse();
assertThat(goodPkg.getTarget("good").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(goodPkg.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -119,8 +117,7 @@
.isEqualTo("sh_library");
assertThat(pkgs.get(pkgId2).get().getTarget("good2").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(pkgs.get(pkgId1).get().getEvents());
- assertNoEvents(pkgs.get(pkgId2).get().getEvents());
+
assertNoEvents(result.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -158,12 +155,13 @@
PackageLoader pkgLoader = newPackageLoader();
file("good1/BUILD", "sh_library(name = 'good1')");
PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("good1"));
+ PackageLoader.Result result = pkgLoader.loadPackages(ImmutableList.of(pkgId, pkgId));
ImmutableMap<PackageIdentifier, PackageLoader.PackageOrException> pkgs =
- pkgLoader.loadPackages(ImmutableList.of(pkgId, pkgId)).getLoadedPackages();
+ result.getLoadedPackages();
assertThat(pkgs.get(pkgId).get().containsErrors()).isFalse();
assertThat(pkgs.get(pkgId).get().getTarget("good1").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(pkgs.get(pkgId).get().getEvents());
+ assertNoEvents(result.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -177,7 +175,6 @@
assertThat(goodPkg.containsErrors()).isFalse();
assertThat(goodPkg.getTarget("good").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(goodPkg.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -192,7 +189,6 @@
Package fooPkg = pkgLoader.loadPackage(pkgId);
assertThat(fooPkg.containsErrors()).isFalse();
assertThat(fooPkg.getTarget("foo").getTargetKind()).isEqualTo("sh_library rule");
- assertNoEvents(fooPkg.getEvents());
assertNoEvents(handler.getEvents());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
index c5046b8..8a9be07 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
@@ -125,7 +125,6 @@
assertThat(goodPkg.containsErrors()).isFalse();
assertThat(goodPkg.getTarget("good").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(goodPkg.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -146,7 +145,6 @@
assertThat(goodPkg.containsErrors()).isFalse();
assertThat(goodPkg.getTarget("good").getAssociatedRule().getRuleClass())
.isEqualTo("sh_library");
- assertNoEvents(goodPkg.getEvents());
assertNoEvents(handler.getEvents());
}
@@ -161,7 +159,6 @@
Package aPkg = pkgLoader.loadPackage(pkgId);
assertThat(aPkg.containsErrors()).isFalse();
assertThrows(NoSuchTargetException.class, () -> aPkg.getTarget("sub/a.txt"));
- assertNoEvents(aPkg.getEvents());
assertNoEvents(handler.getEvents());
}
}
