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

HHH-13587 Make StatefulPersistenceContext#arrayHolders lazily initialized as well

This commit is contained in:
Sanne Grinovero 2019-08-17 21:59:07 +01:00 committed by Sanne Grinovero
parent dbbc24c2e1
commit 05b888e0c0
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
View File

@ -162,7 +162,6 @@ public class StatefulPersistenceContext implements PersistenceContext {
entityEntryContext = new EntityEntryContext( this ); entityEntryContext = new EntityEntryContext( this );
collectionsByKey = new HashMap<>( INIT_COLL_SIZE ); collectionsByKey = new HashMap<>( INIT_COLL_SIZE );
arrayHolders = new IdentityHashMap<>( INIT_COLL_SIZE );
} }
private ConcurrentMap<EntityKey, Object> getOrInitializeProxiesByKey() { private ConcurrentMap<EntityKey, Object> getOrInitializeProxiesByKey() {
@ -243,7 +242,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
IdentityMap.onEachKey( collectionEntries, k -> k.unsetSession( session ) ); IdentityMap.onEachKey( collectionEntries, k -> k.unsetSession( session ) );
} }
arrayHolders.clear(); arrayHolders = null;
entitiesByKey.clear(); entitiesByKey.clear();
entitiesByUniqueKey.clear(); entitiesByUniqueKey.clear();
entityEntryContext.clear(); entityEntryContext.clear();
@ -981,18 +980,21 @@ public class StatefulPersistenceContext implements PersistenceContext {
@Override @Override
public PersistentCollection getCollectionHolder(Object array) { public PersistentCollection getCollectionHolder(Object array) {
return arrayHolders.get( array ); return arrayHolders == null ? null : arrayHolders.get( array );
} }
@Override @Override
public void addCollectionHolder(PersistentCollection holder) { public void addCollectionHolder(PersistentCollection holder) {
//TODO:refactor + make this method private //TODO:refactor + make this method private
if ( arrayHolders == null ) {
arrayHolders = new IdentityHashMap<>( INIT_COLL_SIZE );
}
arrayHolders.put( holder.getValue(), holder ); arrayHolders.put( holder.getValue(), holder );
} }
@Override @Override
public PersistentCollection removeCollectionHolder(Object array) { public PersistentCollection removeCollectionHolder(Object array) {
return arrayHolders.remove( array ); return arrayHolders != null ? arrayHolders.remove( array ) : null;
} }
@Override @Override
@ -1583,13 +1585,18 @@ public class StatefulPersistenceContext implements PersistenceContext {
} }
} }
oos.writeInt( arrayHolders.size() ); if ( arrayHolders == null ) {
if ( LOG.isTraceEnabled() ) { oos.writeInt( 0 );
LOG.trace( "Starting serialization of [" + arrayHolders.size() + "] arrayHolders entries" );
} }
for ( Map.Entry<Object,PersistentCollection> entry : arrayHolders.entrySet() ) { else {
oos.writeObject( entry.getKey() ); oos.writeInt( arrayHolders.size() );
oos.writeObject( entry.getValue() ); if ( LOG.isTraceEnabled() ) {
LOG.trace( "Starting serialization of [" + arrayHolders.size() + "] arrayHolders entries" );
}
for ( Map.Entry<Object,PersistentCollection> entry : arrayHolders.entrySet() ) {
oos.writeObject( entry.getKey() );
oos.writeObject( entry.getValue() );
}
} }
if ( nullifiableEntityKeys == null ) { if ( nullifiableEntityKeys == null ) {
@ -1707,9 +1714,11 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( LOG.isTraceEnabled() ) { if ( LOG.isTraceEnabled() ) {
LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" ); LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" );
} }
rtn.arrayHolders = new IdentityHashMap<>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count ); if ( count != 0 ) {
for ( int i = 0; i < count; i++ ) { rtn.arrayHolders = new IdentityHashMap<>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
rtn.arrayHolders.put( ois.readObject(), (PersistentCollection) ois.readObject() ); for ( int i = 0; i < count; i++ ) {
rtn.arrayHolders.put( ois.readObject(), (PersistentCollection) ois.readObject() );
}
} }
count = ois.readInt(); count = ois.readInt();