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

HHH-14124 Work around side-effects of TwoPhaseLoad.initializeEntity

This commit is contained in:
Yoann Rodière 2020-07-29 13:13:06 +02:00 committed by Andrea Boriero
parent 20273b81ee
commit bc26c564a4
1 changed files with 82 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ import org.hibernate.event.spi.EventType;
import org.hibernate.event.spi.PostLoadEvent; import org.hibernate.event.spi.PostLoadEvent;
import org.hibernate.event.spi.PreLoadEvent; import org.hibernate.event.spi.PreLoadEvent;
import org.hibernate.event.spi.PreLoadEventListener; import org.hibernate.event.spi.PreLoadEventListener;
import org.hibernate.graph.spi.GraphImplementor;
import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.hql.internal.HolderInstantiator;
import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreLogging;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
@ -380,8 +381,8 @@ public abstract class Loader {
final boolean returnProxies) throws HibernateException { final boolean returnProxies) throws HibernateException {
final int entitySpan = getEntityPersisters().length; final int entitySpan = getEntityPersisters().length;
final List hydratedObjects = entitySpan == 0 ? final List<Object> hydratedObjects = entitySpan == 0 ?
null : new ArrayList( entitySpan ); null : new ArrayList<>( entitySpan );
final Object result; final Object result;
try { try {
@ -405,7 +406,7 @@ public abstract class Loader {
} }
initializeEntitiesAndCollections( initializeEntitiesAndCollections(
hydratedObjects, hydratedObjects == null ? null : Collections.singletonList( hydratedObjects ),
resultSet, resultSet,
session, session,
queryParameters.isReadOnly( session ) queryParameters.isReadOnly( session )
@ -422,14 +423,21 @@ public abstract class Loader {
final EntityKey keyToRead) throws HibernateException { final EntityKey keyToRead) throws HibernateException {
final int entitySpan = getEntityPersisters().length; final int entitySpan = getEntityPersisters().length;
final List hydratedObjects = entitySpan == 0 ? final List<List<Object>> hydratedObjectsPerRow = entitySpan == 0 ?
null : new ArrayList( entitySpan ); null : new ArrayList<>( entitySpan );
Object result = null; Object result = null;
final EntityKey[] loadedKeys = new EntityKey[entitySpan]; final EntityKey[] loadedKeys = new EntityKey[entitySpan];
try { try {
do { do {
List<Object> hydratedObjects;
if ( hydratedObjectsPerRow == null ) {
hydratedObjects = null;
}
else {
hydratedObjects = new ArrayList<>( entitySpan );
}
Object loaded = getRowFromResultSet( Object loaded = getRowFromResultSet(
resultSet, resultSet,
session, session,
@ -440,6 +448,9 @@ public abstract class Loader {
loadedKeys, loadedKeys,
returnProxies returnProxies
); );
if ( hydratedObjects != null && !hydratedObjects.isEmpty() ) {
hydratedObjectsPerRow.add( hydratedObjects );
}
if ( !keyToRead.equals( loadedKeys[0] ) ) { if ( !keyToRead.equals( loadedKeys[0] ) ) {
throw new AssertionFailure( throw new AssertionFailure(
String.format( String.format(
@ -465,7 +476,7 @@ public abstract class Loader {
} }
initializeEntitiesAndCollections( initializeEntitiesAndCollections(
hydratedObjects, hydratedObjectsPerRow,
resultSet, resultSet,
session, session,
queryParameters.isReadOnly( session ) queryParameters.isReadOnly( session )
@ -696,7 +707,7 @@ public abstract class Loader {
final QueryParameters queryParameters, final QueryParameters queryParameters,
final LockMode[] lockModesArray, final LockMode[] lockModesArray,
final EntityKey optionalObjectKey, final EntityKey optionalObjectKey,
final List hydratedObjects, final List<Object> hydratedObjects,
final EntityKey[] keys, final EntityKey[] keys,
boolean returnProxies) throws SQLException, HibernateException { boolean returnProxies) throws SQLException, HibernateException {
return getRowFromResultSet( return getRowFromResultSet(
@ -718,7 +729,7 @@ public abstract class Loader {
final QueryParameters queryParameters, final QueryParameters queryParameters,
final LockMode[] lockModesArray, final LockMode[] lockModesArray,
final EntityKey optionalObjectKey, final EntityKey optionalObjectKey,
final List hydratedObjects, final List<Object> hydratedObjects,
final EntityKey[] keys, final EntityKey[] keys,
boolean returnProxies, boolean returnProxies,
ResultTransformer forcedResultTransformer) throws SQLException, HibernateException { ResultTransformer forcedResultTransformer) throws SQLException, HibernateException {
@ -782,7 +793,7 @@ public abstract class Loader {
SharedSessionContractImplementor session, SharedSessionContractImplementor session,
EntityKey[] keys, EntityKey[] keys,
LockMode[] lockModes, LockMode[] lockModes,
List hydratedObjects) throws SQLException { List<Object> hydratedObjects) throws SQLException {
final int entitySpan = persisters.length; final int entitySpan = persisters.length;
final int numberOfPersistersToProcess; final int numberOfPersistersToProcess;
@ -985,7 +996,7 @@ public abstract class Loader {
final int entitySpan = getEntityPersisters().length; final int entitySpan = getEntityPersisters().length;
final boolean createSubselects = isSubselectLoadingEnabled(); final boolean createSubselects = isSubselectLoadingEnabled();
final List<EntityKey[]> subselectResultKeys = createSubselects ? new ArrayList<>() : null; final List<EntityKey[]> subselectResultKeys = createSubselects ? new ArrayList<>() : null;
final List<Object> hydratedObjects = entitySpan == 0 ? null : new ArrayList<>( entitySpan * 10 ); final List<List<Object>> hydratedObjectsPerRow = entitySpan == 0 ? null : new ArrayList<>();
final List results = getRowsFromResultSet( final List results = getRowsFromResultSet(
rs, rs,
@ -994,12 +1005,12 @@ public abstract class Loader {
returnProxies, returnProxies,
forcedResultTransformer, forcedResultTransformer,
maxRows, maxRows,
hydratedObjects, hydratedObjectsPerRow,
subselectResultKeys subselectResultKeys
); );
initializeEntitiesAndCollections( initializeEntitiesAndCollections(
hydratedObjects, hydratedObjectsPerRow,
rs, rs,
session, session,
queryParameters.isReadOnly( session ), queryParameters.isReadOnly( session ),
@ -1018,7 +1029,7 @@ public abstract class Loader {
boolean returnProxies, boolean returnProxies,
ResultTransformer forcedResultTransformer, ResultTransformer forcedResultTransformer,
int maxRows, int maxRows,
List<Object> hydratedObjects, List<List<Object>> hydratedObjectsPerRow,
List<EntityKey[]> subselectResultKeys) throws SQLException { List<EntityKey[]> subselectResultKeys) throws SQLException {
final int entitySpan = getEntityPersisters().length; final int entitySpan = getEntityPersisters().length;
final boolean createSubselects = isSubselectLoadingEnabled(); final boolean createSubselects = isSubselectLoadingEnabled();
@ -1036,6 +1047,13 @@ public abstract class Loader {
if ( debugEnabled ) { if ( debugEnabled ) {
LOG.debugf( "Result set row: %s", count ); LOG.debugf( "Result set row: %s", count );
} }
List<Object> hydratedObjects;
if ( hydratedObjectsPerRow == null ) {
hydratedObjects = null;
}
else {
hydratedObjects = new ArrayList<>( entitySpan );
}
Object result = getRowFromResultSet( Object result = getRowFromResultSet(
rs, rs,
session, session,
@ -1048,6 +1066,9 @@ public abstract class Loader {
forcedResultTransformer forcedResultTransformer
); );
results.add( result ); results.add( result );
if ( hydratedObjects != null && !hydratedObjects.isEmpty() ) {
hydratedObjectsPerRow.add( hydratedObjects );
}
if ( createSubselects ) { if ( createSubselects ) {
subselectResultKeys.add( keys ); subselectResultKeys.add( keys );
keys = new EntityKey[entitySpan]; //can't reuse in this case keys = new EntityKey[entitySpan]; //can't reuse in this case
@ -1138,12 +1159,12 @@ public abstract class Loader {
} }
private void initializeEntitiesAndCollections( private void initializeEntitiesAndCollections(
final List hydratedObjects, final List<List<Object>> hydratedObjectsPerRow,
final Object resultSetId, final Object resultSetId,
final SharedSessionContractImplementor session, final SharedSessionContractImplementor session,
final boolean readOnly) throws HibernateException { final boolean readOnly) throws HibernateException {
initializeEntitiesAndCollections( initializeEntitiesAndCollections(
hydratedObjects, hydratedObjectsPerRow,
resultSetId, resultSetId,
session, session,
readOnly, readOnly,
@ -1152,7 +1173,7 @@ public abstract class Loader {
} }
private void initializeEntitiesAndCollections( private void initializeEntitiesAndCollections(
final List hydratedObjects, final List<List<Object>> hydratedObjectsPerRow,
final Object resultSetId, final Object resultSetId,
final SharedSessionContractImplementor session, final SharedSessionContractImplementor session,
final boolean readOnly, final boolean readOnly,
@ -1184,11 +1205,15 @@ public abstract class Loader {
post = null; post = null;
} }
if ( hydratedObjects != null ) { if ( hydratedObjectsPerRow != null && !hydratedObjectsPerRow.isEmpty() ) {
int hydratedObjectsSize = hydratedObjects.size(); if ( LOG.isTraceEnabled() ) {
int hydratedObjectsSize = 0;
for ( List<Object> hydratedObjects : hydratedObjectsPerRow ) {
hydratedObjectsSize += hydratedObjects.size();
}
LOG.tracev( "Total objects hydrated: {0}", hydratedObjectsSize ); LOG.tracev( "Total objects hydrated: {0}", hydratedObjectsSize );
}
if ( hydratedObjectsSize != 0 ) {
final Iterable<PreLoadEventListener> listeners = session final Iterable<PreLoadEventListener> listeners = session
.getFactory() .getFactory()
.getServiceRegistry() .getServiceRegistry()
@ -1196,10 +1221,18 @@ public abstract class Loader {
.getEventListenerGroup( EventType.PRE_LOAD ) .getEventListenerGroup( EventType.PRE_LOAD )
.listeners(); .listeners();
for ( Object hydratedObject : hydratedObjects ) { GraphImplementor<?> fetchGraphLoadContextToRestore = session.getFetchGraphLoadContext();
for ( List<?> hydratedObjectsForRow : hydratedObjectsPerRow ) {
for ( Object hydratedObject : hydratedObjectsForRow ) {
TwoPhaseLoad.initializeEntity( hydratedObject, readOnly, session, pre, listeners ); TwoPhaseLoad.initializeEntity( hydratedObject, readOnly, session, pre, listeners );
} }
// HHH-14124: TwoPhaseLoad has nasty side-effects in order to handle sub-graphs.
// That's very fragile, but someone would need to spend much more time on this
// in order to implement it correctly, and apparently that's already been done in ORM 6.0.
// So for now, we'll just ensure side-effects (and whatever bugs they lead to)
// are limited to each row.
session.setFetchGraphLoadContext( fetchGraphLoadContextToRestore );
} }
} }
@ -1215,19 +1248,22 @@ public abstract class Loader {
} }
} }
if ( hydratedObjects != null ) { if ( hydratedObjectsPerRow != null ) {
for ( Object hydratedObject : hydratedObjects ) { for ( List<?> hydratedObjectsForRow : hydratedObjectsPerRow ) {
for ( Object hydratedObject : hydratedObjectsForRow ) {
TwoPhaseLoad.afterInitialize( hydratedObject, session ); TwoPhaseLoad.afterInitialize( hydratedObject, session );
} }
} }
}
// Until this entire method is refactored w/ polymorphism, postLoad was // Until this entire method is refactored w/ polymorphism, postLoad was
// split off from initializeEntity. It *must* occur after // split off from initializeEntity. It *must* occur after
// endCollectionLoad to ensure the collection is in the // endCollectionLoad to ensure the collection is in the
// persistence context. // persistence context.
final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
if ( hydratedObjects != null && hydratedObjects.size() > 0 ) { if ( hydratedObjectsPerRow != null && !hydratedObjectsPerRow.isEmpty() ) {
for ( Object hydratedObject : hydratedObjects ) { for ( List<?> hydratedObjectsForRow : hydratedObjectsPerRow ) {
for ( Object hydratedObject : hydratedObjectsForRow ) {
TwoPhaseLoad.postLoad( hydratedObject, session, post ); TwoPhaseLoad.postLoad( hydratedObject, session, post );
if ( afterLoadActions != null ) { if ( afterLoadActions != null ) {
for ( AfterLoadAction afterLoadAction : afterLoadActions ) { for ( AfterLoadAction afterLoadAction : afterLoadActions ) {
@ -1244,6 +1280,7 @@ public abstract class Loader {
} }
} }
} }
}
protected void endCollectionLoad( protected void endCollectionLoad(
final Object resultSetId, final Object resultSetId,
@ -1585,7 +1622,7 @@ public abstract class Loader {
final Object optionalObject, final Object optionalObject,
final EntityKey optionalObjectKey, final EntityKey optionalObjectKey,
final LockMode[] lockModes, final LockMode[] lockModes,
final List hydratedObjects, final List<Object> hydratedObjects,
final SharedSessionContractImplementor session) throws HibernateException, SQLException { final SharedSessionContractImplementor session) throws HibernateException, SQLException {
final int cols = persisters.length; final int cols = persisters.length;
final EntityAliases[] entityAliases = getEntityAliases(); final EntityAliases[] entityAliases = getEntityAliases();
@ -1652,7 +1689,7 @@ public abstract class Loader {
final EntityKey key, final EntityKey key,
final Object object, final Object object,
final LockMode requestedLockMode, final LockMode requestedLockMode,
List hydratedObjects, List<Object> hydratedObjects,
final SharedSessionContractImplementor session) final SharedSessionContractImplementor session)
throws HibernateException, SQLException { throws HibernateException, SQLException {
if ( !persister.isInstance( object ) ) { if ( !persister.isInstance( object ) ) {
@ -1720,7 +1757,7 @@ public abstract class Loader {
final LockMode lockMode, final LockMode lockMode,
final EntityKey optionalObjectKey, final EntityKey optionalObjectKey,
final Object optionalObject, final Object optionalObject,
final List hydratedObjects, final List<Object> hydratedObjects,
final SharedSessionContractImplementor session) final SharedSessionContractImplementor session)
throws HibernateException, SQLException { throws HibernateException, SQLException {
final String instanceClass = getInstanceClass( final String instanceClass = getInstanceClass(