Fix bug in the large batch query options.

Create new query options every time a query requests it from the
DatastoreHelper. This is needed to prevent one query's fetch options
from interfering with the fetch options of another.

Test: live on staging
Bug: 63339916
Change-Id: If45b6f2c345ae73e08c833065670501a1fb52191

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/android/vts/util/FilterUtil.java b/src/main/java/com/android/vts/util/FilterUtil.java
index 69a91ee..d81d969 100644
--- a/src/main/java/com/android/vts/util/FilterUtil.java
+++ b/src/main/java/com/android/vts/util/FilterUtil.java
@@ -374,7 +374,7 @@ public class FilterUtil {
         Query testQuery =
                 new Query(kind).setAncestor(ancestorKey).setFilter(testFilter).setKeysOnly();
         for (Entity testRunKey :
-                datastore.prepare(testQuery).asIterable(DatastoreHelper.LARGE_BATCH_OPTIONS)) {
+                datastore.prepare(testQuery).asIterable(DatastoreHelper.getLargeBatchOptions())) {
             matchingTestKeys.add(testRunKey.getKey());
         }
 
@@ -391,7 +391,7 @@ public class FilterUtil {
             for (Entity device :
                     datastore
                             .prepare(deviceQuery)
-                            .asIterable(DatastoreHelper.LARGE_BATCH_OPTIONS)) {
+                            .asIterable(DatastoreHelper.getLargeBatchOptions())) {
                 if (matchingTestKeys.contains(device.getKey().getParent())) {
                     allMatchingKeys.add(device.getKey().getParent());
                 }