aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
diff options
context:
space:
mode:
authorGravatar Janak Ramakrishnan <janakr@google.com>2015-10-15 20:16:04 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2015-10-16 07:40:19 +0000
commit629a7c4d97efbb4b2001650f30f9168968ffa9e7 (patch)
tree1a5c84cf68cb1060f52f3e3a13729e51f59dba32 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
parentdda3f8c8e2d088ba5d8640dfa20651ce71d0e535 (diff)
Stop filtering when returning root causes -- the filter is always true, since root causes are associated with top-level targets and labels, and the filter is for all top-level targets and labels.
I noticed this when a huge --noanalyze build spent most of its time in filtering here. The passed-in "collection" was a list, which meant that we could have sped it up by using a set, but why not just get rid of it all. -- MOS_MIGRATED_REVID=105536485
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
index 1315fcf60d..48bfe1dd40 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
@@ -14,12 +14,10 @@
package com.google.devtools.build.lib.skyframe;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicates;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -251,8 +249,8 @@ final class SkyframeLabelVisitor implements TransitivePackageLoader {
}
@Override
- public Multimap<Label, Label> getRootCauses(final Collection<Label> targetsToLoad) {
+ public Multimap<Label, Label> getRootCauses() {
Preconditions.checkState(lastBuildKeepGoing);
- return Multimaps.filterKeys(rootCauses, Predicates.in(targetsToLoad));
+ return rootCauses;
}
}