Batch package retrieval for rbuildfiles so that even if a single file has a large number of rbuildfile dependencies, we retrieve them in batches of at most BATCH_CALLBACK_SIZE.

--
MOS_MIGRATED_REVID=122540401

1 files changed, 4 insertions, 2 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 c127f42570..9ab241f111 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
@@ -920,8 +920,10 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> {
         }
       }
       if (resultKeys.size() >= BATCH_CALLBACK_SIZE) {
-        callback.process(
-            getBuildFilesForPackageValues(graph.getSuccessfulValues(resultKeys).values()));
+        for (Iterable<SkyKey> batch : Iterables.partition(resultKeys, BATCH_CALLBACK_SIZE)) {
+          callback.process(
+              getBuildFilesForPackageValues(graph.getSuccessfulValues(batch).values()));
+        }
         resultKeys.clear();
       }
     }