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

HHH-14108 PADDED and DYNAMIC Batch loading strategies not compatible with the Enhanced Proxy feature

This commit is contained in:
Andrea Boriero 2020-07-15 17:42:41 +01:00 committed by Sanne Grinovero
parent 538689bcd4
commit 673d3600b8
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hibernate-core/src/main/java/org/hibernate/loader/Loader.java
View File

@ -75,7 +75,6 @@ import org.hibernate.internal.FetchingScrollableResultsImpl;
import org.hibernate.internal.ScrollableResultsImpl;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.loader.entity.CascadeEntityLoader;
import org.hibernate.loader.spi.AfterLoadAction;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister;
@ -116,14 +115,12 @@ public abstract class Loader {
private final SessionFactoryImplementor factory;
private volatile ColumnNameCache columnNameCache;
private final boolean referenceCachingEnabled;
private final boolean enhancementAsProxyEnabled;
private boolean isJdbc4 = true;
public Loader(SessionFactoryImplementor factory) {
this.factory = factory;
this.referenceCachingEnabled = factory.getSessionFactoryOptions().isDirectReferenceCacheEntriesEnabled();
this.enhancementAsProxyEnabled = factory.getSessionFactoryOptions().isEnhancementAsProxyEnabled();
}
@ -1666,38 +1663,34 @@ public abstract class Loader {
);
}
if ( persister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading() && enhancementAsProxyEnabled ) {
if ( "merge".equals( session.getLoadQueryInfluencers().getInternalFetchProfile() ) ) {
assert this instanceof CascadeEntityLoader;
// we are processing a merge and have found an existing "managed copy" in the
// session - we need to check if this copy is an enhanced-proxy and, if so,
// perform the hydration just as if it were "not yet loaded"
final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) object;
final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor();
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
hydrateEntityState(
rs,
i,
persister,
getEntityAliases()[i].getRowIdAlias(),
key,
hydratedObjects,
session,
getInstanceClass(
rs,
i,
persister,
key.getIdentifier(),
session
),
object,
requestedLockMode
);
if ( enhancementAsProxyEnabled && persister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading() ) {
// we have found an existing "managed copy" in the session
// we need to check if this copy is an enhanced-proxy and, if so,
// perform the hydration just as if it were "not yet loaded"
final PersistentAttributeInterceptor interceptor = ( (PersistentAttributeInterceptable) object ).$$_hibernate_getInterceptor();
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
hydrateEntityState(
rs,
i,
persister,
getEntityAliases()[i].getRowIdAlias(),
key,
hydratedObjects,
session,
getInstanceClass(
rs,
i,
persister,
key.getIdentifier(),
session
),
object,
requestedLockMode
);
// EARLY EXIT!!!
// - to skip the version check
return;
}
// EARLY EXIT!!!
// - to skip the version check
return;
}
}