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

Bytecode enhamcement fix unnecessary query for an optional OneToOne

This commit is contained in:
Andrea Boriero 2021-10-20 09:21:29 +02:00 committed by Steve Ebersole
parent 47605bf93b
commit 9d8fbfb727
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
View File

@ -1608,10 +1608,16 @@ public class MappingModelCreationHelper {
final FetchTiming fetchTiming; final FetchTiming fetchTiming;
final boolean lazy = value.isLazy(); final boolean lazy = value.isLazy();
if ( lazy if ( lazy && entityPersister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading() ) {
&& value.isUnwrapProxy() if ( value.isUnwrapProxy() ) {
&& entityPersister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading() ) { fetchTiming = FetchOptionsHelper.determineFetchTiming( fetchStyle, type, sessionFactory );
fetchTiming = FetchTiming.DELAYED; }
else if ( value instanceof ManyToOne && value.isNullable() && ( (ManyToOne) value ).isIgnoreNotFound() ) {
fetchTiming = FetchTiming.IMMEDIATE;
}
else {
fetchTiming = FetchOptionsHelper.determineFetchTiming( fetchStyle, type, sessionFactory );
}
} }
else if ( fetchStyle == FetchStyle.JOIN else if ( fetchStyle == FetchStyle.JOIN
|| !lazy || !lazy

2
hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchImpl.java
View File

@ -53,7 +53,7 @@ public class EntityDelayedFetchImpl extends AbstractNonJoinedEntityFetch {
getEntityValuedModelPart(), getEntityValuedModelPart(),
() -> new EntityDelayedFetchInitializer( () -> new EntityDelayedFetchInitializer(
navigablePath, navigablePath,
(ToOneAttributeMapping) getEntityValuedModelPart(), getEntityValuedModelPart(),
keyResult.createResultAssembler( creationState ) keyResult.createResultAssembler( creationState )
) )
); );

1
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java
View File

@ -83,6 +83,7 @@ public class FetchGraphTest extends BaseNonConfigCoreFunctionalTestCase {
assert !Hibernate.isPropertyInitialized( entityD, "e" ); assert !Hibernate.isPropertyInitialized( entityD, "e" );
entityD.getE(); entityD.getE();
assertThat( stats.getPrepareStatementCount(), is( 2L ) ); assertThat( stats.getPrepareStatementCount(), is( 2L ) );
assert Hibernate.isPropertyInitialized( entityD, "a" ); assert Hibernate.isPropertyInitialized( entityD, "a" );
assert !Hibernate.isInitialized( entityD.getA() ); assert !Hibernate.isInitialized( entityD.getA() );