Skip to content

Per level tracking simplification and performance improvements #4128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andimarek merged 13 commits into from
Sep 24, 2025
Merged

Per level tracking simplification and performance improvements #4128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9566326
nearly works
andimarek Sep 23, 2025
07b1600
works except dataloader in defer
andimarek Sep 23, 2025
56a39df
working with simpler mode except batching, defer, subscription
andimarek Sep 24, 2025
0436e5d
subscription works
andimarek Sep 24, 2025
b25724b
fix defer support
andimarek Sep 24, 2025
117ebe1
cleanup
andimarek Sep 24, 2025
a5d29a6
cleanup
andimarek Sep 24, 2025
2686c32
no per level tracking anymore
andimarek Sep 24, 2025
a67e56b
cleanup
andimarek Sep 24, 2025
2da8fef
no synchronized/locking anymore
andimarek Sep 24, 2025
009fcb8
cleanup and comment
andimarek Sep 24, 2025
ab06e30
add Thread.onSpinWait to indicate active waiting
andimarek Sep 24, 2025
2eecad7
remove Thread.onSpinWait again as not clear this is needed or has may…
andimarek Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix defer support
  • Loading branch information
@andimarek
andimarek committed Sep 24, 2025
commit b25724b28582c893d612c8ee6f00b06a22abc037
41 changes: 23 additions & 18 deletions ...java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ private static class CallStack {

public ChainedDLStack chainedDLStack = new ChainedDLStack();

private final List<FieldValueInfo> deferredFragmentRootFieldsFetched = new ArrayList<>();
private int deferredFragmentRootFieldsCompleted;

public CallStack() {
}
Expand Down Expand Up @@ -370,14 +370,14 @@ public void deferredOnFieldValue(String resultKey, FieldValueInfo fieldValueInfo
CallStack callStack = getCallStack(parameters);
boolean ready;
synchronized (callStack) {
callStack.deferredFragmentRootFieldsFetched.add(fieldValueInfo);
callStack.deferredFragmentRootFieldsCompleted++;
Assert.assertNotNull(parameters.getDeferredCallContext());
ready = callStack.deferredFragmentRootFieldsFetched.size() == parameters.getDeferredCallContext().getFields();
ready = callStack.deferredFragmentRootFieldsCompleted == parameters.getDeferredCallContext().getFields();
}
// if (ready) {
// int curLevel = parameters.getPath().getLevel();
// onFieldValuesInfoDispatchIfNeeded(callStack.deferredFragmentRootFieldsFetched, curLevel, callStack);
// }
if (ready) {
onCompletionFinished(parameters.getDeferredCallContext().getStartLevel() - 1, callStack);
}

}

//
Expand All @@ -393,16 +393,21 @@ private CallStack getCallStack(@Nullable AlternativeCallContext alternativeCallC
return alternativeCallContextMap.computeIfAbsent(alternativeCallContext, k -> {
CallStack callStack = new CallStack();
// System.out.println("new callstack : " + callStack.hashCode());
// for subscriptions there is only root field which is already fetched
// callStack.expectedFetchCountPerLevel.set(1, 1);
// callStack.happenedFetchCountPerLevel.set(1, 1);
// // the level 0 is done
// callStack.happenedExecuteObjectCallsPerLevel.set(0, 1);
// callStack.happenedCompletionFinishedCountPerLevel.set(0, 1);
// // level is 1 already dispatched
// callStack.setDispatchedLevel(1);
// int startLevel = alternativeCallContext.getStartLevel();
// int fields = alternativeCallContext.getFields();
// on which level the fields are
int startLevel = k.getStartLevel();
// how many fields are deferred on this level
int fields = k.getFields();
if (startLevel > 1) {
// parent level is considered dispatched all fields completed
callStack.dispatchedLevels.add(startLevel - 1);
callStack.happenedExecuteObjectCallsPerLevel.set(startLevel - 2, 1);
callStack.happenedCompletionFinishedCountPerLevel.set(startLevel - 2, 1);
}
// the parent will have one completion therefore we set the expectation to 1
callStack.happenedExecuteObjectCallsPerLevel.set(startLevel - 1, 1);

// for the current level we set the fetch expectations
callStack.expectedFetchCountPerLevel.set(startLevel, fields);
return callStack;
});
}
Expand All @@ -419,7 +424,7 @@ private void resetCallStack(CallStack callStack) {

private boolean markLevelAsDispatchedIfReady(int level, CallStack callStack) {
boolean ready = isLevelReady(level, callStack);
// System.out.println("markLevelAsDispatchedIfReady level: " + level + " ready: " + ready);
// System.out.println("markLevelAsDispatchedIfReady level: " + level + " ready: " + ready + " callstack: " + callStack.hashCode());
if (ready) {
callStack.setDispatchedLevel(level);
return true;
Expand Down
2 changes: 0 additions & 2 deletions src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.dataloader.DataLoaderRegistry
import org.reactivestreams.Publisher
import spock.lang.Ignore
import spock.lang.Specification
import spock.lang.Unroll

Expand Down Expand Up @@ -1691,7 +1690,6 @@ class DeferExecutionSupportIntegrationTest extends Specification {

}

@Ignore("tmp not working")
def "dataloader used inside defer"() {
given:
def query = '''
Expand Down
7 changes: 0 additions & 7 deletions src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.awaitility.Awaitility
import org.dataloader.BatchLoader
import org.dataloader.DataLoaderFactory
import org.dataloader.DataLoaderRegistry
import spock.lang.Ignore
import spock.lang.RepeatUntilFailure
import spock.lang.Specification

Expand Down Expand Up @@ -61,7 +60,6 @@ class DeferWithDataLoaderTest extends Specification {
}
}

@Ignore
def "query with single deferred field"() {
given:
def query = getQuery(true, false)
Expand Down Expand Up @@ -106,7 +104,6 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 3
}

@Ignore
def "multiple fields on same defer block"() {
given:
def query = """
Expand Down Expand Up @@ -180,7 +177,6 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 0
}

@Ignore
def "query with nested deferred fields"() {
given:
def query = getQuery(true, true)
Expand Down Expand Up @@ -232,7 +228,6 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 9
}

@Ignore
def "query with top-level deferred field"() {
given:
def query = """
Expand Down Expand Up @@ -296,7 +291,6 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 0
}

@Ignore
def "query with multiple deferred fields"() {
given:
def query = getExpensiveQuery(true)
Expand Down Expand Up @@ -354,7 +348,6 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 1
}

@Ignore
@RepeatUntilFailure(maxAttempts = 50, ignoreRest = false)
def "dataloader in initial result and chained dataloader inside nested defer block"() {
given:
Expand Down