diff options
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java | 5 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/engine/AbstractQueryEnvironment.java | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java index e720bee64f..c04746760e 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java @@ -13,6 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.query2; +import static com.google.common.util.concurrent.MoreExecutors.directExecutor; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Ascii; import com.google.common.base.Function; @@ -729,7 +731,8 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> Futures.catchingAsync( evalFuture, TargetParsingException.class, - reportBuildFileErrorAsyncFunction)); + reportBuildFileErrorAsyncFunction, + directExecutor())); } @ThreadSafe diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/AbstractQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/engine/AbstractQueryEnvironment.java index 6bc7217b16..80ded4ffea 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/AbstractQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/AbstractQueryEnvironment.java @@ -13,6 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.query2.engine; +import static com.google.common.util.concurrent.MoreExecutors.directExecutor; + import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -178,7 +180,7 @@ public abstract class AbstractQueryEnvironment<T> implements QueryEnvironment<T> public <R> QueryTaskFuture<R> whenAllSucceedCall( Iterable<? extends QueryTaskFuture<?>> futures, QueryTaskCallable<R> callable) { return QueryTaskFutureImpl.ofDelegate( - Futures.whenAllSucceed(cast(futures)).call(callable)); + Futures.whenAllSucceed(cast(futures)).call(callable, directExecutor())); } @Override @@ -193,7 +195,8 @@ public abstract class AbstractQueryEnvironment<T> implements QueryEnvironment<T> public ListenableFuture<T2> apply(T1 input) throws Exception { return (QueryTaskFutureImpl<T2>) function.apply(input); } - })); + }, + directExecutor())); } protected static Iterable<QueryTaskFutureImpl<?>> cast( |