Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15391 StackOverflow when applying a load entity graphs to a query

This commit is contained in:
Andrea Boriero 2022-07-22 14:49:08 +02:00 committed by Andrea Boriero
parent d5b408e61d
commit c33ff9917a
2 changed files with 107 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
View File

@ -44,6 +44,7 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping;
import org.hibernate.metamodel.mapping.Restrictable;
import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
import org.hibernate.metamodel.mapping.internal.SimpleForeignKeyDescriptor;
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
import org.hibernate.metamodel.mapping.ordering.OrderByFragment;
import org.hibernate.query.sqm.ComparisonOperator;
import org.hibernate.spi.EntityIdentifierNavigablePath;
@ -734,13 +735,15 @@ public class LoaderSelectBuilder {
EntityGraphTraversalState.TraversalResult traversalResult = null;
final boolean isFetchablePluralAttributeMapping = fetchable instanceof PluralAttributeMapping;
final Integer maximumFetchDepth = creationContext.getMaximumFetchDepth();
if ( !( fetchable instanceof CollectionPart ) ) {
// 'entity graph' takes precedence over 'fetch profile'
if ( entityGraphTraversalState != null ) {
traversalResult = entityGraphTraversalState.traverse( fetchParent, fetchable, isKeyFetchable );
fetchTiming = traversalResult.getFetchTiming();
joined = traversalResult.isJoined();
explicitFetch = true;
explicitFetch = shouldExplicitFetch( maximumFetchDepth, fetchable, creationState );
}
else if ( loadQueryInfluencers.hasEnabledFetchProfiles() ) {
// There is no point in checking the fetch profile if it can't affect this fetchable
@ -756,7 +759,7 @@ public class LoaderSelectBuilder {
if ( profileFetch != null ) {
fetchTiming = FetchTiming.IMMEDIATE;
joined = joined || profileFetch.getStyle() == org.hibernate.engine.profile.Fetch.Style.JOIN;
explicitFetch = true;
explicitFetch = shouldExplicitFetch( maximumFetchDepth, fetchable, creationState );
}
}
}
@ -816,8 +819,6 @@ public class LoaderSelectBuilder {
}
}
final Integer maximumFetchDepth = creationContext.getMaximumFetchDepth();
if ( maximumFetchDepth != null ) {
if ( fetchDepth == maximumFetchDepth + 1 ) {
joined = false;
@ -886,6 +887,27 @@ public class LoaderSelectBuilder {
};
}
private boolean shouldExplicitFetch(Integer maxFetchDepth, Fetchable fetchable, LoaderSqlAstCreationState creationState) {
/*
Forcing the value of explicitFetch to true will disable the fetch circularity check and
for already visited association or collection this will cause a StackOverflow if maxFetchDepth is null, see HHH-15391.
*/
if ( maxFetchDepth == null ) {
if ( fetchable instanceof ToOneAttributeMapping ) {
return !creationState.isAssociationKeyVisited(
( (ToOneAttributeMapping) fetchable ).getForeignKeyDescriptor().getAssociationKey()
);
}
else if ( fetchable instanceof PluralAttributeMapping ) {
return !creationState.isAssociationKeyVisited(
( (PluralAttributeMapping) fetchable ).getKeyDescriptor().getAssociationKey()
);
}
}
return true;
}
private void applyOrdering(
QuerySpec ast,
NavigablePath navigablePath,

89
hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View File

@ -56,6 +56,7 @@ import org.hibernate.loader.MultipleBagFetchException;
import org.hibernate.metamodel.CollectionClassification;
import org.hibernate.metamodel.MappingMetamodel;
import org.hibernate.metamodel.mapping.Association;
import org.hibernate.metamodel.mapping.AssociationKey;
import org.hibernate.metamodel.mapping.AttributeMapping;
import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
import org.hibernate.metamodel.mapping.BasicValuedMapping;
@ -486,6 +487,8 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
private Expression adjustmentScale;
private boolean negativeAdjustment;
private final Set<AssociationKey> visitedAssociationKeys = new HashSet<>();
public BaseSqmToSqlAstConverter(
SqlAstCreationContext creationContext,
SqmStatement<?> statement,
@ -3494,7 +3497,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
final EntityValuedModelPart entityValuedModelPart = (EntityValuedModelPart) actualModelPart;
final EntityValuedModelPart inferredEntityMapping = (EntityValuedModelPart) getInferredValueMapping();
final ModelPart resultModelPart;
final ModelPart interpretationModelPart;
final EntityValuedModelPart interpretationModelPart;
final TableGroup tableGroupToUse;
if ( inferredEntityMapping == null ) {
// When the inferred mapping is null, we try to resolve to the FK by default,
@ -3613,7 +3616,6 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
expandToAllColumns = false;
}
final EntityValuedModelPart mapping = (EntityValuedModelPart) interpretationModelPart;
final EntityMappingType treatedMapping;
if ( path instanceof SqmTreatedPath ) {
treatedMapping = creationContext.getSessionFactory()
@ -3622,7 +3624,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
.findEntityDescriptor( ( (SqmTreatedPath<?,?>) path ).getTreatTarget().getHibernateEntityName() );
}
else {
treatedMapping = mapping.getEntityMappingType();
treatedMapping = interpretationModelPart.getEntityMappingType();
}
result = EntityValuedPathInterpretation.from(
@ -3630,7 +3632,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
tableGroupToUse == null ? tableGroup : tableGroupToUse,
expandToAllColumns ? null : resultModelPart,
true,
(EntityValuedModelPart) interpretationModelPart,
interpretationModelPart,
treatedMapping,
this
);
@ -6948,6 +6950,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
boolean explicitFetch = false;
final NavigablePath fetchablePath;
final Integer maxDepth = getCreationContext().getMaximumFetchDepth();
if ( fetchedJoin != null ) {
fetchablePath = fetchedJoin.getNavigablePath();
// there was an explicit fetch in the SQM
@ -6973,9 +6976,12 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
fetchable,
isKeyFetchable
);
fetchTiming = traversalResult.getFetchTiming();
joined = traversalResult.isJoined();
explicitFetch = true;
if ( shouldExplicitFetch( maxDepth, fetchable ) ) {
explicitFetch = true;
}
}
else if ( getLoadQueryInfluencers().hasEnabledFetchProfiles() ) {
// There is no point in checking the fetch profile if it can't affect this fetchable
@ -6993,7 +6999,9 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
if ( profileFetch != null ) {
fetchTiming = FetchTiming.IMMEDIATE;
joined = joined || profileFetch.getStyle() == org.hibernate.engine.profile.Fetch.Style.JOIN;
explicitFetch = true;
if ( shouldExplicitFetch( maxDepth, fetchable ) ) {
explicitFetch = true;
}
if ( currentBagRole != null && fetchable instanceof PluralAttributeMapping ) {
final CollectionClassification collectionClassification = ( (PluralAttributeMapping) fetchable ).getMappedType()
@ -7023,7 +7031,6 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
// }
// lastly, account for any app-defined max-fetch-depth
final Integer maxDepth = getCreationContext().getMaximumFetchDepth();
if ( maxDepth != null ) {
if ( fetchDepth >= maxDepth ) {
joined = false;
@ -7031,7 +7038,6 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
}
if ( joined && fetchable instanceof TableGroupJoinProducer ) {
TableGroupJoinProducer tableGroupJoinProducer = (TableGroupJoinProducer) fetchable;
fromClauseIndex.resolveTableGroup(
fetchablePath,
np -> {
@ -7126,6 +7132,27 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
return fetches;
}
private boolean shouldExplicitFetch(Integer maxDepth, Fetchable fetchable) {
/*
Forcing the value of explicitFetch to true will disable the fetch circularity check and
for already visited association or collection this will cause a StackOverflow if maxFetchDepth is null, see HHH-15391.
*/
if ( maxDepth == null ) {
if ( fetchable instanceof ToOneAttributeMapping ) {
return !this.isAssociationKeyVisited(
( (ToOneAttributeMapping) fetchable ).getForeignKeyDescriptor().getAssociationKey()
);
}
else if ( fetchable instanceof PluralAttributeMapping ) {
return !this.isAssociationKeyVisited(
( (PluralAttributeMapping) fetchable ).getKeyDescriptor().getAssociationKey()
);
}
}
return true;
}
private Fetch buildFetch(
NavigablePath fetchablePath,
FetchParent fetchParent,
@ -7442,4 +7469,50 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
cteStatements.put( cteStatement.getCteTable().getTableExpression(), cteStatement );
}
}
@Override
public boolean registerVisitedAssociationKey(AssociationKey associationKey) {
return visitedAssociationKeys.add( associationKey );
}
@Override
public void removeVisitedAssociationKey(AssociationKey associationKey) {
visitedAssociationKeys.remove( associationKey );
}
@Override
public boolean isAssociationKeyVisited(AssociationKey associationKey) {
return visitedAssociationKeys.contains( associationKey );
}
@Override
public boolean isRegisteringVisitedAssociationKeys() {
/*
We need to avoid loops in case of eager self-referencing associations
E.g.
@NamedEntityGraphs({
@NamedEntityGraph(
name = "User.overview",
attributeNodes = { @NamedAttributeNode("name") })
})
class Sample {
@ManyToOne
Sample parent;
String name;
}
TypedQuery<Sample> query = entityManager.createQuery(
"select s from Sample s",
Sample.class
);
query.setHint( SpecHints.HINT_SPEC_LOAD_GRAPH, entityGraph );
*/
return creationContext.getMaximumFetchDepth() == null
&& ( entityGraphTraversalState != null || getLoadQueryInfluencers().hasEnabledFetchProfiles() );
}
}