Skip to content

fix: Resolve query fetch result in memory to avoid N+1 query problems #266

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
merged 2 commits into from
May 17, 2020
Merged

fix: Resolve query fetch result in memory to avoid N+1 query problems #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97faaeb
fix: Resolve query fetch result in memory to avoid N+1 query problems
igdianov May 17, 2020
917522a
fix: optimize to one dala loader query
igdianov May 17, 2020
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: 2 additions & 2 deletions .../main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ protected <T> Stream<T> getResultStream(TypedQuery<T> query,
}

// Let's execute query and get wrap result into stream
return query.getResultStream()
.peek(entityManager::detach);
return query.getResultList()
.stream();
}

protected Object querySingleResult(final DataFetchingEnvironment environment) {
Expand Down
7 changes: 5 additions & 2 deletions ...n/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaToOneDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

package com.introproventures.graphql.jpa.query.schema.impl;

import static javax.persistence.metamodel.Attribute.PersistentAttributeType.EMBEDDED;

import java.util.Optional;

import javax.persistence.metamodel.Attribute.PersistentAttributeType;
import javax.persistence.metamodel.SingularAttribute;

import org.dataloader.DataLoader;
Expand All @@ -27,6 +28,7 @@
import org.dataloader.MappedBatchLoaderWithContext;

import graphql.GraphQLContext;
import graphql.language.Argument;
import graphql.language.Field;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
Expand Down Expand Up @@ -55,11 +57,12 @@ public Object get(DataFetchingEnvironment environment) {
GraphQLType parentType = environment.getParentType();

Object source = environment.getSource();
Optional<Argument> whereArgument = queryFactory.getArgument(field, "where");
Boolean isOptional = queryFactory.getOptionalArgumentValue(environment,
field,
attribute);
// Resolve collection query if where argument is present
if (isOptional && !PersistentAttributeType.EMBEDDED.equals(attribute.getPersistentAttributeType())) {
if ((whereArgument.isPresent() && isOptional) && !EMBEDDED.equals(attribute.getPersistentAttributeType())) {
Object parentIdValue = queryFactory.getParentIdAttributeValue(source);
String dataLoaderKey = parentType.getName() + "." + Optional.ofNullable(field.getAlias())
.orElseGet(attribute::getName);
Expand Down