diff options
author | Nathan Harmata <nharmata@google.com> | 2017-03-08 22:42:01 +0000 |
---|---|---|
committer | Vladimir Moskva <vladmos@google.com> | 2017-03-09 10:30:27 +0000 |
commit | 7a5a236dfd099eb78e019482e9fc428b5b1182fd (patch) | |
tree | bec8540f49cca6bc8b63b0ef893f4c6ef80f730d /src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java | |
parent | b35a0c086152ac6e5e0e695b21cacfd61de68b51 (diff) |
Description redacted.
--
PiperOrigin-RevId: 149585165
MOS_MIGRATED_REVID=149585165
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java index df6351a513..3b4b768793 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java @@ -37,7 +37,6 @@ import com.google.devtools.build.lib.skyframe.EnvironmentBackedRecursivePackageP import com.google.devtools.build.lib.util.BatchCallback; import com.google.devtools.build.lib.util.BatchCallback.NullCallback; import com.google.devtools.build.lib.util.Preconditions; -import com.google.devtools.build.lib.util.ThreadSafeBatchCallback; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; @@ -47,7 +46,6 @@ import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; @@ -131,7 +129,7 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { * transitive dependencies. Its methods may throw {@link MissingDepException} if the package * values this depends on haven't been calculated and added to its environment. */ - static class DepsOfPatternPreparer implements TargetPatternResolver<Void> { + static class DepsOfPatternPreparer extends TargetPatternResolver<Void> { private final EnvironmentBackedRecursivePackageProvider packageProvider; private final Environment env; @@ -230,7 +228,8 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { String directory, boolean rulesOnly, ImmutableSet<PathFragment> excludedSubdirectories, - BatchCallback<Void, E> callback, Class<E> exceptionClass) + BatchCallback<Void, E> callback, + Class<E> exceptionClass) throws TargetParsingException, E, InterruptedException { FilteringPolicy policy = rulesOnly ? FilteringPolicies.RULES_ONLY : FilteringPolicies.NO_FILTER; @@ -261,26 +260,5 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { } } } - - @Override - public <E extends Exception> void findTargetsBeneathDirectoryPar( - RepositoryName repository, - String originalPattern, - String directory, - boolean rulesOnly, - ImmutableSet<PathFragment> excludedSubdirectories, - ThreadSafeBatchCallback<Void, E> callback, - Class<E> exceptionClass, - ForkJoinPool forkJoinPool) - throws TargetParsingException, E, InterruptedException { - findTargetsBeneathDirectory( - repository, - originalPattern, - directory, - rulesOnly, - excludedSubdirectories, - callback, - exceptionClass); - } } } |