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

Revert "HHH-8945 introduced "hibernate.session.initial_capacity" to reduce" 

This reverts commit 949adc92c2.
This commit is contained in:
Brett Meyer 2014-02-26 17:22:05 -05:00
parent 927c2031d1
commit 84f6fde1b3
2 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -711,14 +711,4 @@ public interface AvailableSettings {
String AUTO_SESSION_EVENTS_LISTENER = "hibernate.session.events.auto"; String AUTO_SESSION_EVENTS_LISTENER = "hibernate.session.events.auto";
/**
* A {@link org.hibernate.engine.internal.StatefulPersistenceContext} maintains multiple Maps for a Session. For
* performance reasons, it can be desirable to initialize the Maps with a non-default capacity, minimizing the
* occurrences of #resize calls. The capacity generally correlates with the quantity of entities expected to be
* managed by an average Session.
*
* Default: 8
*/
String SESSION_INITIAL_CAPACITY = "hibernate.session.initial_capacity";
} }

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

@ -51,9 +51,7 @@ import org.hibernate.action.spi.AfterTransactionCompletionProcess;
import org.hibernate.cache.spi.NaturalIdCacheKey; import org.hibernate.cache.spi.NaturalIdCacheKey;
import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy; import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
import org.hibernate.cache.spi.access.SoftLock; import org.hibernate.cache.spi.access.SoftLock;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.loading.internal.LoadContexts; import org.hibernate.engine.loading.internal.LoadContexts;
import org.hibernate.engine.spi.AssociationKey; import org.hibernate.engine.spi.AssociationKey;
import org.hibernate.engine.spi.BatchFetchQueue; import org.hibernate.engine.spi.BatchFetchQueue;
@ -78,6 +76,7 @@ import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer; import org.hibernate.proxy.LazyInitializer;
import org.hibernate.tuple.ElementWrapper; import org.hibernate.tuple.ElementWrapper;
import org.hibernate.type.CollectionType; import org.hibernate.type.CollectionType;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
/** /**
@ -97,9 +96,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
); );
private static final boolean TRACE_ENABLED = LOG.isTraceEnabled(); private static final boolean TRACE_ENABLED = LOG.isTraceEnabled();
private static final int INIT_COLL_SIZE = 8;
private static final int DEFAULT_INITIAL_CAPACITY = 8;
private final int initialCapacity;
private SessionImplementor session; private SessionImplementor session;
@ -165,22 +162,19 @@ public class StatefulPersistenceContext implements PersistenceContext {
public StatefulPersistenceContext(SessionImplementor session) { public StatefulPersistenceContext(SessionImplementor session) {
this.session = session; this.session = session;
initialCapacity = session.getFactory().getServiceRegistry().getService( ConfigurationService.class ) entitiesByKey = new HashMap<EntityKey, Object>( INIT_COLL_SIZE );
.getSetting( AvailableSettings.SESSION_INITIAL_CAPACITY, Integer.class, DEFAULT_INITIAL_CAPACITY ); entitiesByUniqueKey = new HashMap<EntityUniqueKey, Object>( INIT_COLL_SIZE );
entitiesByKey = new HashMap<EntityKey, Object>( initialCapacity );
entitiesByUniqueKey = new HashMap<EntityUniqueKey, Object>( initialCapacity );
//noinspection unchecked //noinspection unchecked
proxiesByKey = new ConcurrentReferenceHashMap<EntityKey, Object>( initialCapacity, .75f, 1, ConcurrentReferenceHashMap.ReferenceType.STRONG, ConcurrentReferenceHashMap.ReferenceType.WEAK, null ); proxiesByKey = new ConcurrentReferenceHashMap<EntityKey, Object>( INIT_COLL_SIZE, .75f, 1, ConcurrentReferenceHashMap.ReferenceType.STRONG, ConcurrentReferenceHashMap.ReferenceType.WEAK, null );
entitySnapshotsByKey = new HashMap<EntityKey, Object>( initialCapacity ); entitySnapshotsByKey = new HashMap<EntityKey, Object>( INIT_COLL_SIZE );
entityEntryContext = new EntityEntryContext(); entityEntryContext = new EntityEntryContext();
// entityEntries = IdentityMap.instantiateSequenced( initialCapacity ); // entityEntries = IdentityMap.instantiateSequenced( INIT_COLL_SIZE );
collectionEntries = IdentityMap.instantiateSequenced( initialCapacity ); collectionEntries = IdentityMap.instantiateSequenced( INIT_COLL_SIZE );
parentsByChild = new IdentityHashMap<Object,Object>( initialCapacity ); parentsByChild = new IdentityHashMap<Object,Object>( INIT_COLL_SIZE );
collectionsByKey = new HashMap<CollectionKey, PersistentCollection>( initialCapacity ); collectionsByKey = new HashMap<CollectionKey, PersistentCollection>( INIT_COLL_SIZE );
arrayHolders = new IdentityHashMap<Object, PersistentCollection>( initialCapacity ); arrayHolders = new IdentityHashMap<Object, PersistentCollection>( INIT_COLL_SIZE );
nullifiableEntityKeys = new HashSet<EntityKey>(); nullifiableEntityKeys = new HashSet<EntityKey>();
@ -188,8 +182,8 @@ public class StatefulPersistenceContext implements PersistenceContext {
} }
private void initTransientState() { private void initTransientState() {
nullAssociations = new HashSet<AssociationKey>( initialCapacity ); nullAssociations = new HashSet<AssociationKey>( INIT_COLL_SIZE );
nonlazyCollections = new ArrayList<PersistentCollection>( initialCapacity ); nonlazyCollections = new ArrayList<PersistentCollection>( INIT_COLL_SIZE );
} }
@Override @Override
@ -213,7 +207,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
@Override @Override
public void addUnownedCollection(CollectionKey key, PersistentCollection collection) { public void addUnownedCollection(CollectionKey key, PersistentCollection collection) {
if (unownedCollections==null) { if (unownedCollections==null) {
unownedCollections = new HashMap<CollectionKey,PersistentCollection>(initialCapacity); unownedCollections = new HashMap<CollectionKey,PersistentCollection>(INIT_COLL_SIZE);
} }
unownedCollections.put( key, collection ); unownedCollections.put( key, collection );
} }
@ -1446,9 +1440,6 @@ public class StatefulPersistenceContext implements PersistenceContext {
final StatefulPersistenceContext rtn = new StatefulPersistenceContext( session ); final StatefulPersistenceContext rtn = new StatefulPersistenceContext( session );
SessionFactoryImplementor sfi = session.getFactory(); SessionFactoryImplementor sfi = session.getFactory();
int initialCapacity = sfi.getServiceRegistry().getService( ConfigurationService.class )
.getSetting( AvailableSettings.SESSION_INITIAL_CAPACITY, Integer.class, DEFAULT_INITIAL_CAPACITY );
// during deserialization, we need to reconnect all proxies and // during deserialization, we need to reconnect all proxies and
// collections to this session, as well as the EntityEntry and // collections to this session, as well as the EntityEntry and
// CollectionEntry instances; these associations are transient // CollectionEntry instances; these associations are transient
@ -1463,7 +1454,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] entitiesByKey entries" ); LOG.trace( "Starting deserialization of [" + count + "] entitiesByKey entries" );
} }
rtn.entitiesByKey = new HashMap<EntityKey,Object>( count < initialCapacity ? initialCapacity : count ); rtn.entitiesByKey = new HashMap<EntityKey,Object>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
rtn.entitiesByKey.put( EntityKey.deserialize( ois, sfi ), ois.readObject() ); rtn.entitiesByKey.put( EntityKey.deserialize( ois, sfi ), ois.readObject() );
} }
@ -1472,7 +1463,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] entitiesByUniqueKey entries" ); LOG.trace( "Starting deserialization of [" + count + "] entitiesByUniqueKey entries" );
} }
rtn.entitiesByUniqueKey = new HashMap<EntityUniqueKey,Object>( count < initialCapacity ? initialCapacity : count ); rtn.entitiesByUniqueKey = new HashMap<EntityUniqueKey,Object>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
rtn.entitiesByUniqueKey.put( EntityUniqueKey.deserialize( ois, session ), ois.readObject() ); rtn.entitiesByUniqueKey.put( EntityUniqueKey.deserialize( ois, session ), ois.readObject() );
} }
@ -1483,7 +1474,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
} }
//noinspection unchecked //noinspection unchecked
rtn.proxiesByKey = new ConcurrentReferenceHashMap<EntityKey, Object>( rtn.proxiesByKey = new ConcurrentReferenceHashMap<EntityKey, Object>(
count < initialCapacity ? initialCapacity : count, count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count,
.75f, .75f,
1, 1,
ConcurrentReferenceHashMap.ReferenceType.STRONG, ConcurrentReferenceHashMap.ReferenceType.STRONG,
@ -1509,7 +1500,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] entitySnapshotsByKey entries" ); LOG.trace( "Starting deserialization of [" + count + "] entitySnapshotsByKey entries" );
} }
rtn.entitySnapshotsByKey = new HashMap<EntityKey,Object>( count < initialCapacity ? initialCapacity : count ); rtn.entitySnapshotsByKey = new HashMap<EntityKey,Object>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
rtn.entitySnapshotsByKey.put( EntityKey.deserialize( ois, sfi ), ois.readObject() ); rtn.entitySnapshotsByKey.put( EntityKey.deserialize( ois, sfi ), ois.readObject() );
} }
@ -1520,7 +1511,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] collectionsByKey entries" ); LOG.trace( "Starting deserialization of [" + count + "] collectionsByKey entries" );
} }
rtn.collectionsByKey = new HashMap<CollectionKey,PersistentCollection>( count < initialCapacity ? initialCapacity : count ); rtn.collectionsByKey = new HashMap<CollectionKey,PersistentCollection>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
rtn.collectionsByKey.put( CollectionKey.deserialize( ois, session ), (PersistentCollection) ois.readObject() ); rtn.collectionsByKey.put( CollectionKey.deserialize( ois, session ), (PersistentCollection) ois.readObject() );
} }
@ -1529,7 +1520,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] collectionEntries entries" ); LOG.trace( "Starting deserialization of [" + count + "] collectionEntries entries" );
} }
rtn.collectionEntries = IdentityMap.instantiateSequenced( count < initialCapacity ? initialCapacity : count ); rtn.collectionEntries = IdentityMap.instantiateSequenced( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
final PersistentCollection pc = (PersistentCollection) ois.readObject(); final PersistentCollection pc = (PersistentCollection) ois.readObject();
final CollectionEntry ce = CollectionEntry.deserialize( ois, session ); final CollectionEntry ce = CollectionEntry.deserialize( ois, session );
@ -1541,7 +1532,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
if ( tracing ) { if ( tracing ) {
LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" ); LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" );
} }
rtn.arrayHolders = new IdentityHashMap<Object, PersistentCollection>( count < initialCapacity ? initialCapacity : count ); rtn.arrayHolders = new IdentityHashMap<Object, PersistentCollection>( count < INIT_COLL_SIZE ? INIT_COLL_SIZE : count );
for ( int i = 0; i < count; i++ ) { for ( int i = 0; i < count; i++ ) {
rtn.arrayHolders.put( ois.readObject(), (PersistentCollection) ois.readObject() ); rtn.arrayHolders.put( ois.readObject(), (PersistentCollection) ois.readObject() );
} }