wip

andimarek · andimarek · commit 0ab88dae7e62 · 2025-07-18T16:25:38.000+10:00
diff --git a/src/main/java/graphql/ProfilerResult.java b/src/main/java/graphql/ProfilerResult.java
@@ -360,6 +360,7 @@ public List<Map<String, Object>> getDispatchEventsAsMap() {
         List<Map<String, Object>> result = new ArrayList<>();
         for (DispatchEvent event : dispatchEvents) {
             Map<String, Object> eventMap = new LinkedHashMap<>();
+            eventMap.put("type", event.getType().name());
             eventMap.put("dataLoader", event.getDataLoaderName());
             eventMap.put("level", event.getLevel() != null ? event.getLevel() : "delayed");
             eventMap.put("count", event.getCount());
diff --git a/src/main/java/graphql/schema/DataLoaderWithContext.java b/src/main/java/graphql/schema/DataLoaderWithContext.java
@@ -45,7 +45,7 @@ public CompletableFuture<V> load(@NonNull K key, @Nullable Object keyContext) {
     public CompletableFuture<List<V>> dispatch() {
         CompletableFuture<List<V>> dispatchResult = delegate.dispatch();
         dispatchResult.whenComplete((result, error) -> {
-            if (result != null) {
+            if (result != null && result.size() > 0) {
                 DataFetchingEnvironmentImpl.DFEInternalState dfeInternalState = (DataFetchingEnvironmentImpl.DFEInternalState) dfe.toInternal();
                 dfeInternalState.getProfiler().manualDispatch(dataLoaderName, dfe.getExecutionStepInfo().getPath().getLevel(), result.size());
             }
diff --git a/src/test/groovy/graphql/ProfilerTest.groovy b/src/test/groovy/graphql/ProfilerTest.groovy
@@ -109,6 +109,72 @@ class ProfilerTest extends Specification {
 
     }
 
+    def "cached dataloader values"() {
+        given:
+        def sdl = '''
+
+        type Query {
+          dog: Dog
+        }
+        type Dog {
+          name: String
+        }
+        '''
+        AtomicInteger batchLoadCalls = new AtomicInteger()
+        BatchLoader<String, String> batchLoader = { keys ->
+            return supplyAsync {
+                batchLoadCalls.incrementAndGet()
+                Thread.sleep(250)
+                println "BatchLoader called with keys: $keys"
+                return ["Luna"]
+            }
+        }
+
+        DataLoader<String, String> nameDataLoader = DataLoaderFactory.newDataLoader(batchLoader);
+
+        DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
+        dataLoaderRegistry.register("name", nameDataLoader);
+
+        def dogDF = { env ->
+            def loader = env.getDataLoader("name")
+            def result = loader.load("Key1").thenCompose {
+                return loader.load("Key1") // This should hit the cache
+            }
+        } as DataFetcher
+
+        def nameDF = { env ->
+            def loader = env.getDataLoader("name")
+            def result = loader.load("Key1").thenCompose {
+                return loader.load("Key1") // This should hit the cache
+            }
+        } as DataFetcher
+
+
+        def fetchers = [Query: [dog: dogDF], Dog: [name: nameDF]]
+        def schema = TestUtil.schema(sdl, fetchers)
+        def graphQL = GraphQL.newGraphQL(schema).build()
+
+        def query = "{ dog {name } } "
+        def ei = newExecutionInput(query).dataLoaderRegistry(dataLoaderRegistry).profileExecution(true).build()
+        setEnableDataLoaderChaining(ei.graphQLContext, true)
+
+        when:
+        def efCF = graphQL.executeAsync(ei)
+        Awaitility.await().until { efCF.isDone() }
+        def er = efCF.get()
+        def profilerResult = ei.getGraphQLContext().get(ProfilerResult.PROFILER_CONTEXT_KEY) as ProfilerResult
+        then:
+        er.data == [dog: [name: "Luna"]]
+        batchLoadCalls.get() == 1
+        then:
+        profilerResult.getDataLoaderLoadInvocations().get("name") == 4
+        profilerResult.getDispatchEvents()[0].type == ProfilerResult.DispatchEventType.STRATEGY_DISPATCH
+        profilerResult.getDispatchEvents()[0].dataLoaderName == "name"
+        profilerResult.getDispatchEvents()[0].count == 1
+        profilerResult.getDispatchEvents()[0].level == 1
+
+    }
+
 
     def "collects instrumentation list"() {
         given:

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public CompletableFuture<V> load(@NonNull K key, @Nullable Object keyContext) {`
`45`	`45`	`public CompletableFuture<List<V>> dispatch() {`
`46`	`46`	`CompletableFuture<List<V>> dispatchResult = delegate.dispatch();`
`47`	`47`	`dispatchResult.whenComplete((result, error) -> {`
`48`		`- if (result != null) {`
	`48`	`+ if (result != null && result.size() > 0) {`
`49`	`49`	`DataFetchingEnvironmentImpl.DFEInternalState dfeInternalState = (DataFetchingEnvironmentImpl.DFEInternalState) dfe.toInternal();`
`50`	`50`	`dfeInternalState.getProfiler().manualDispatch(dataLoaderName, dfe.getExecutionStepInfo().getPath().getLevel(), result.size());`
`51`	`51`	`}`