Skip to content

minimize work done when chained dataloaders are disabled #4003

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 1 commit into from
Jun 5, 2025
Merged

minimize work done when chained dataloaders are disabled #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import graphql.execution.MergedField;
import graphql.execution.directives.QueryDirectives;
import graphql.execution.incremental.DeferredCallContext;
import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys;
import graphql.language.Document;
import graphql.language.Field;
import graphql.language.FragmentDefinition;
Expand Down Expand Up @@ -217,6 +218,9 @@ public ExecutionStepInfo getExecutionStepInfo() {

@Override
public <K, V> @Nullable DataLoader<K, V> getDataLoader(String dataLoaderName) {
if (!graphQLContext.getBoolean(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)) {
return dataLoaderRegistry.getDataLoader(dataLoaderName);
}
return new DataLoaderWithContext<>(this, dataLoaderName, dataLoaderRegistry.getDataLoader(dataLoaderName));
}

Expand Down
17 changes: 13 additions & 4 deletions src/test/groovy/graphql/schema/DataFetchingEnvironmentImplTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import graphql.GraphQLContext
import graphql.execution.CoercedVariables
import graphql.execution.ExecutionId
import graphql.execution.ExecutionStepInfo
import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys
import graphql.language.Argument
import graphql.language.Field
import graphql.language.FragmentDefinition
Expand Down Expand Up @@ -37,7 +38,7 @@ class DataFetchingEnvironmentImplTest extends Specification {

def executionContext = newExecutionContextBuilder()
.root("root")
.graphQLContext(GraphQLContext.of(["key":"context"]))
.graphQLContext(GraphQLContext.of(["key": "context"]))
.executionId(executionId)
.operationDefinition(operationDefinition)
.document(document)
Expand Down Expand Up @@ -65,6 +66,7 @@ class DataFetchingEnvironmentImplTest extends Specification {
when:
def dfe = newDataFetchingEnvironment(executionContext)
.build()
dfe.getGraphQlContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, chainedDataLoaderEnabled)
then:
dfe.getRoot() == "root"
dfe.getGraphQlContext().get("key") == "context"
Expand All @@ -74,13 +76,16 @@ class DataFetchingEnvironmentImplTest extends Specification {
dfe.getOperationDefinition() == operationDefinition
dfe.getExecutionId() == executionId
dfe.getDataLoaderRegistry() == executionContext.getDataLoaderRegistry()
dfe.getDataLoader("dataLoader").delegate == executionContext.getDataLoaderRegistry().getDataLoader("dataLoader")
dfe.getDataLoader("dataLoader") == executionContext.getDataLoaderRegistry().getDataLoader("dataLoader") ||
dfe.getDataLoader("dataLoader").delegate == executionContext.getDataLoaderRegistry().getDataLoader("dataLoader")
where:
chainedDataLoaderEnabled << [true, false]
}

def "create environment from existing one will copy everything to new instance"() {
def dfe = newDataFetchingEnvironment()
.context("Test Context") // Retain deprecated builder for coverage
.graphQLContext(GraphQLContext.of(["key": "context"]))
.graphQLContext(GraphQLContext.of(["key": "context", (DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): chainedDataLoaderEnabled]))
.source("Test Source")
.root("Test Root")
.fieldDefinition(Mock(GraphQLFieldDefinition))
Expand Down Expand Up @@ -119,9 +124,13 @@ class DataFetchingEnvironmentImplTest extends Specification {
dfe.getDocument() == dfeCopy.getDocument()
dfe.getOperationDefinition() == dfeCopy.getOperationDefinition()
dfe.getVariables() == dfeCopy.getVariables()
dfe.getDataLoader("dataLoader").delegate == dfeCopy.getDataLoader("dataLoader").delegate
dfe.getDataLoader("dataLoader") == executionContext.getDataLoaderRegistry().getDataLoader("dataLoader") ||
dfe.getDataLoader("dataLoader").delegate == dfeCopy.getDataLoader("dataLoader").delegate
dfe.getLocale() == dfeCopy.getLocale()
dfe.getLocalContext() == dfeCopy.getLocalContext()
where:
chainedDataLoaderEnabled << [true, false]

}

def "get or default support"() {
Expand Down