PR feedback

andimarek · andimarek · commit a7cc7947042e · 2025-05-26T10:36:49.000+10:00
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
@@ -48,7 +48,7 @@ public class PerLevelDataLoaderDispatchStrategy implements DataLoaderDispatchStr
 
     static final long DEFAULT_BATCH_WINDOW_NANO_SECONDS_DEFAULT = 500_000L;
 
-    private final Map<DeferredCallContext, CallStack> callStackMap = new ConcurrentHashMap<>();
+    private final Map<DeferredCallContext, CallStack> deferredCallStackMap = new ConcurrentHashMap<>();
 
 
     private static class CallStack {
@@ -75,7 +75,7 @@ private static class CallStack {
          * { a {x} b {y} }
          * If a is a list of 3 objects and b is a list of 2 objects we expect 3 + 2 = 5 execute object calls on the level 1 to be happening
          * <p/>
-         * An execute objects again means we can predict the number of fetches in the next level:
+         * An executed object call again means we can predict the number of fetches in the next level:
          * Execute Object a with { a {f1 f2 f3} } means we expect 3 fetches on level 2.
          * <p/>
          * This means we know a level is ready to be dispatched if:
@@ -257,7 +257,7 @@ private CallStack getCallStack(@Nullable DeferredCallContext deferredCallContext
         if (deferredCallContext == null) {
             return this.initialCallStack;
         } else {
-            return callStackMap.computeIfAbsent(deferredCallContext, k -> {
+            return deferredCallStackMap.computeIfAbsent(deferredCallContext, k -> {
                 CallStack callStack = new CallStack();
                 int startLevel = deferredCallContext.getStartLevel();
                 int fields = deferredCallContext.getFields();
diff --git a/src/test/groovy/graphql/execution/instrumentation/dataloader/BatchCompareDataFetchers.java b/src/test/groovy/graphql/execution/instrumentation/dataloader/BatchCompareDataFetchers.java
@@ -83,7 +83,6 @@ private static List<List<Department>> getDepartmentsForShops(List<Shop> shops) {
 
 
     private BatchLoader<String, List<Department>> departmentsForShopsBatchLoader = ids -> maybeAsyncWithSleep(() -> {
-        System.out.println("departments for shops batch loader called with ids: " + ids);
         departmentsForShopsBatchLoaderCounter.incrementAndGet();
         List<Shop> shopList = new ArrayList<>();
         for (String id : ids) {
@@ -129,7 +128,6 @@ private static List<List<Product>> getProductsForDepartments(List<Department> de
     }
 
     private BatchLoader<String, List<Product>> productsForDepartmentsBatchLoader = ids -> maybeAsyncWithSleep(() -> {
-        System.out.println("products for deparments batch loader called with ids: " + ids);
         productsForDepartmentsBatchLoaderCounter.incrementAndGet();
         List<Department> d = ids.stream().map(departments::get).collect(Collectors.toList());
         return completedFuture(getProductsForDepartments(d));
