graphql-java
diff --git a/src/jmh/java/performance/DataLoaderPerformance.java b/src/jmh/java/performance/DataLoaderPerformance.java
@@ -4,7 +4,6 @@
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
-import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys;
 import graphql.schema.DataFetcher;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.RuntimeWiring;
@@ -15,28 +14,16 @@
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderRegistry;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-@State(Scope.Benchmark)
-@Warmup(iterations = 2, time = 5)
-@Measurement(iterations = 3)
-@Fork(2)
 public class DataLoaderPerformance {
 
     static Owner o1 = new Owner("O-1", "Andi", List.of("P-1", "P-2", "P-3"));
@@ -573,9 +560,6 @@ public void setup() {
 
     }
 
-    @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.MILLISECONDS)
     public void executeRequestWithDataLoaders(MyState myState, Blackhole blackhole) {
         DataLoader ownerDL = DataLoaderFactory.newDataLoader(ownerBatchLoader);
         DataLoader petDL = DataLoaderFactory.newDataLoader(petBatchLoader);
@@ -587,14 +571,30 @@ public void executeRequestWithDataLoaders(MyState myState, Blackhole blackhole)
                 .dataLoaderRegistry(registry)
 //                .profileExecution(true)
                 .build();
-        executionInput.getGraphQLContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, true);
+//        executionInput.getGraphQLContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, true);
         ExecutionResult execute = myState.graphQL.execute(executionInput);
 //        ProfilerResult profilerResult = executionInput.getGraphQLContext().get(ProfilerResult.PROFILER_CONTEXT_KEY);
-//        System.out.println(profilerResult.shortSummaryMap());
+//        System.out.println("execute: " + execute);
         Assert.assertTrue(execute.isDataPresent());
         Assert.assertTrue(execute.getErrors().isEmpty());
         blackhole.consume(execute);
     }
 
+    public static void main(String[] args) {
+        DataLoaderPerformance dataLoaderPerformance = new DataLoaderPerformance();
+        MyState myState = new MyState();
+        myState.setup();
+        Blackhole blackhole = new Blackhole("Today's password is swordfish. I understand instantiating Blackholes directly is dangerous.");
+        for (int i = 0; i < 1; i++) {
+            dataLoaderPerformance.executeRequestWithDataLoaders(myState, blackhole);
+        }
+//        System.out.println(PerLevelDataLoaderDispatchStrategy.fieldFetchedCount);
+//        System.out.println(PerLevelDataLoaderDispatchStrategy.onCompletionFinishedCount);
+//        System.out.println(PerLevelDataLoaderDispatchStrategy.isReadyCounter);
+//        System.out.println(Duration.ofNanos(PerLevelDataLoaderDispatchStrategy.isReadyCounterNS.get()).toMillis());
+
+
+    }
+
 
 }
diff --git a/src/main/java/graphql/execution/DataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/DataLoaderDispatchStrategy.java
@@ -57,8 +57,11 @@ default void fieldFetched(ExecutionContext executionContext,
     }
 
 
+    default void newSubscriptionExecution(AlternativeCallContext alternativeCallContext) {
 
-    default void newSubscriptionExecution(FieldValueInfo fieldValueInfo, AlternativeCallContext alternativeCallContext) {
+    }
+
+    default void subscriptionEventCompletionDone(AlternativeCallContext alternativeCallContext) {
 
     }
 }
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -207,11 +207,11 @@ protected Object executeObject(ExecutionContext executionContext, ExecutionStrat
         List<String> fieldNames = parameters.getFields().getKeys();
 
         DeferredExecutionSupport deferredExecutionSupport = createDeferredExecutionSupport(executionContext, parameters);
+        List<String> fieldsExecutedOnInitialResult = deferredExecutionSupport.getNonDeferredFieldNames(fieldNames);
+        dataLoaderDispatcherStrategy.executeObject(executionContext, parameters, fieldsExecutedOnInitialResult.size());
         Async.CombinedBuilder<FieldValueInfo> resolvedFieldFutures = getAsyncFieldValueInfo(executionContext, parameters, deferredExecutionSupport);
 
         CompletableFuture<Map<String, Object>> overallResult = new CompletableFuture<>();
-        List<String> fieldsExecutedOnInitialResult = deferredExecutionSupport.getNonDeferredFieldNames(fieldNames);
-        dataLoaderDispatcherStrategy.executeObject(executionContext, parameters, fieldsExecutedOnInitialResult.size());
         BiConsumer<List<Object>, Throwable> handleResultsConsumer = buildFieldValueMap(fieldsExecutedOnInitialResult, overallResult, executionContext);
 
         resolveObjectCtx.onDispatched();

diff --git a/src/main/java/graphql/execution/SubscriptionExecutionStrategy.java b/src/main/java/graphql/execution/SubscriptionExecutionStrategy.java
@@ -168,9 +168,11 @@ private CompletableFuture<ExecutionResult> executeSubscriptionEvent(ExecutionCon
                 i13nFieldParameters, executionContext.getInstrumentationState()
         ));
 
+
+        executionContext.getDataLoaderDispatcherStrategy().newSubscriptionExecution(newParameters.getDeferredCallContext());
         Object fetchedValue = unboxPossibleDataFetcherResult(newExecutionContext, newParameters, eventPayload);
         FieldValueInfo fieldValueInfo = completeField(newExecutionContext, newParameters, fetchedValue);
-        executionContext.getDataLoaderDispatcherStrategy().newSubscriptionExecution(fieldValueInfo, newParameters.getDeferredCallContext());
+        executionContext.getDataLoaderDispatcherStrategy().subscriptionEventCompletionDone(newParameters.getDeferredCallContext());
         CompletableFuture<ExecutionResult> overallResult = fieldValueInfo
                 .getFieldValueFuture()
                 .thenApply(val -> new ExecutionResultImpl(val, newParameters.getDeferredCallContext().getErrors()))

diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/LevelMap.java b/src/main/java/graphql/execution/instrumentation/dataloader/LevelMap.java
@@ -57,7 +57,7 @@ public String toString() {
         StringBuilder result = new StringBuilder();
         result.append("IntMap[");
         for (int i = 0; i < countsByLevel.length; i++) {
-            result.append("level=").append(i).append(",count=").append(countsByLevel[i]).append(" ");
+            result.append("[level=").append(i).append(",count=").append(countsByLevel[i]).append("] ");
         }
         result.append("]");
         return result.toString();