Rename VariableContext to the more general purpose QueryExpressionContext and thread it through to graph traversal functions. Some other light refactorings as well.
PiperOrigin-RevId: 200292556
diff --git a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
index 1fe3bbf..c95a653 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
@@ -28,10 +28,10 @@
import com.google.devtools.build.lib.query2.engine.QueryEnvironment.ThreadSafeMutableSet;
import com.google.devtools.build.lib.query2.engine.QueryException;
import com.google.devtools.build.lib.query2.engine.QueryExpression;
+import com.google.devtools.build.lib.query2.engine.QueryExpressionContext;
import com.google.devtools.build.lib.query2.engine.QueryUtil;
import com.google.devtools.build.lib.query2.engine.QueryUtil.AggregateAllCallback;
import com.google.devtools.build.lib.query2.engine.Uniquifier;
-import com.google.devtools.build.lib.query2.engine.VariableContext;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyKey;
import java.util.Collection;
@@ -61,7 +61,7 @@
static QueryTaskFuture<Void> getAllRdepsUnboundedParallel(
SkyQueryEnvironment env,
QueryExpression expression,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
Callback<Target> callback,
MultisetSemaphore<PackageIdentifier> packageSemaphore) {
return env.eval(
@@ -79,7 +79,7 @@
SkyQueryEnvironment env,
QueryExpression expression,
int depth,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
Callback<Target> callback,
MultisetSemaphore<PackageIdentifier> packageSemaphore) {
return env.eval(
@@ -98,7 +98,7 @@
SkyQueryEnvironment env,
QueryExpression expression,
Predicate<SkyKey> universe,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
Callback<Target> callback,
MultisetSemaphore<PackageIdentifier> packageSemaphore) {
return env.eval(
@@ -111,7 +111,7 @@
static QueryTaskFuture<Predicate<SkyKey>> getDTCSkyKeyPredicateFuture(
SkyQueryEnvironment env,
QueryExpression expression,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
int processResultsBatchSize,
int concurrencyLevel) {
QueryTaskFuture<ThreadSafeMutableSet<Target>> universeValueFuture =
@@ -144,7 +144,7 @@
QueryExpression expression,
int depth,
Predicate<SkyKey> universe,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
Callback<Target> callback,
MultisetSemaphore<PackageIdentifier> packageSemaphore) {
return env.eval(
@@ -173,7 +173,7 @@
static QueryTaskFuture<Void> getDepsUnboundedParallel(
SkyQueryEnvironment env,
QueryExpression expression,
- VariableContext<Target> context,
+ QueryExpressionContext<Target> context,
Callback<Target> callback,
MultisetSemaphore<PackageIdentifier> packageSemaphore,
boolean depsNeedFiltering,
@@ -183,7 +183,7 @@
context,
ParallelVisitor.createParallelVisitorCallback(
new DepsUnboundedVisitor.Factory(
- env, callback, packageSemaphore, depsNeedFiltering, errorReporter)));
+ env, callback, packageSemaphore, depsNeedFiltering, errorReporter, context)));
}
static class DepAndRdep {