diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java b/src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java index 0e618fbb16..8b1fc37d62 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/DepsFunction.java @@ -18,10 +18,10 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Argument; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.ArgumentType; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.QueryFunction; +import com.google.devtools.build.lib.query2.engine.QueryEnvironment.QueryTaskFuture; import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.concurrent.ForkJoinPool; /** * A "deps" query expression, which computes the dependencies of the argument. An optional @@ -53,15 +53,15 @@ final class DepsFunction implements QueryFunction { * Breadth-first search from the arguments. */ @Override - public <T> void eval( + public <T> QueryTaskFuture<Void> eval( final QueryEnvironment<T> env, VariableContext<T> context, final QueryExpression expression, List<Argument> args, - final Callback<T> callback) throws QueryException, InterruptedException { + final Callback<T> callback) { final int depthBound = args.size() > 1 ? args.get(1).getInteger() : Integer.MAX_VALUE; final MinDepthUniquifier<T> minDepthUniquifier = env.createMinDepthUniquifier(); - env.eval(args.get(0).getExpression(), context, new Callback<T>() { + return env.eval(args.get(0).getExpression(), context, new Callback<T>() { @Override public void process(Iterable<T> partialResult) throws QueryException, InterruptedException { Collection<T> current = Sets.newHashSet(partialResult); @@ -84,15 +84,4 @@ final class DepsFunction implements QueryFunction { } }); } - - @Override - public <T> void parEval( - QueryEnvironment<T> env, - VariableContext<T> context, - QueryExpression expression, - List<Argument> args, - ThreadSafeCallback<T> callback, - ForkJoinPool forkJoinPool) throws QueryException, InterruptedException { - eval(env, context, expression, args, callback); - } } |