Fix a minor bug where RRBuildFilesVisitor wasn't using an
inter-visitation-batch Uniquifier for the results.
Because SkyQueryEnvironment#BatchStreamedCallback (the [2nd-]most outer
Callback) internally uses a Uniquifier, this is merely a minor performance bug,
not a correctness bug.
RELNOTES: None
PiperOrigin-RevId: 234704160
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 df706da..a9a0aca 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
@@ -31,7 +31,6 @@
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.skyframe.SkyFunctions;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyKey;
@@ -54,7 +53,7 @@
public class ParallelSkyQueryUtils {
/** The maximum number of keys to visit at once. */
- @VisibleForTesting static final int VISIT_BATCH_SIZE = 10000;
+ @VisibleForTesting public static final int VISIT_BATCH_SIZE = 10000;
private ParallelSkyQueryUtils() {
}
@@ -167,11 +166,11 @@
Collection<PathFragment> fileIdentifiers,
QueryExpressionContext<Target> context,
Callback<Target> callback) throws QueryException, InterruptedException {
- Uniquifier<SkyKey> keyUniquifier = env.createSkyKeyUniquifier();
RBuildFilesVisitor visitor =
new RBuildFilesVisitor(
env,
- keyUniquifier,
+ /*visitUniquifier=*/ env.createSkyKeyUniquifier(),
+ /*resultUniquifier=*/ env.createSkyKeyUniquifier(),
context,
callback,
/*rdepFilter=*/ rdep ->
