Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-18 09:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-9269 Store persister to ReferenceCacheEntryImpl to avoid costly lookup at read time

Browse Source
This commit is contained in:
Emmanuel Bernard 2014-07-02 01:06:43 +02:00
parent 92bd9e6310
commit 728592007d
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java vendored
View File

@ -25,8 +25,6 @@
import java.io.Serializable; import java.io.Serializable;
import org.hibernate.Interceptor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
/** /**
@ -34,11 +32,18 @@
*/ */
public class ReferenceCacheEntryImpl implements CacheEntry { public class ReferenceCacheEntryImpl implements CacheEntry {
private final Object reference; private final Object reference;
private final String subclass; // passing the persister avoids a costly persister lookup by class name at cache retrieval time
private final EntityPersister subclassPersister;
public ReferenceCacheEntryImpl(Object reference, String subclass) { /**
* Constructs a ReferenceCacheEntryImpl
*
* @param reference The reference entity instance
* @param subclassPersister The specific subclass persister
*/
public ReferenceCacheEntryImpl(Object reference, EntityPersister subclassPersister) {
this.reference = reference; this.reference = reference;
this.subclass = subclass; this.subclassPersister = subclassPersister;
} }
@Override @Override
@ -48,7 +53,11 @@ public boolean isReferenceEntry() {
@Override @Override
public String getSubclass() { public String getSubclass() {
return subclass; return subclassPersister.getEntityName();
}
public EntityPersister getSubclassPersister() {
return subclassPersister;
} }
@Override @Override

7
hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
View File

@ -590,7 +590,7 @@ private Object convertCacheEntryToEntity(
final EventSource session = event.getSession(); final EventSource session = event.getSession();
final SessionFactoryImplementor factory = session.getFactory(); final SessionFactoryImplementor factory = session.getFactory();
final EntityPersister subclassPersister = factory.getEntityPersister( entry.getSubclass() ); final EntityPersister subclassPersister;
if ( LOG.isTraceEnabled() ) { if ( LOG.isTraceEnabled() ) {
LOG.tracef( LOG.tracef(
@ -613,14 +613,17 @@ private Object convertCacheEntryToEntity(
); );
} }
entity = ( (ReferenceCacheEntryImpl) entry ).getReference(); ReferenceCacheEntryImpl referenceCacheEntry = (ReferenceCacheEntryImpl) entry;
entity = referenceCacheEntry.getReference();
if ( entity == null ) { if ( entity == null ) {
throw new IllegalStateException( throw new IllegalStateException(
"Reference cache entry contained null : " + MessageHelper.infoString( persister, entityId, factory ) "Reference cache entry contained null : " + MessageHelper.infoString( persister, entityId, factory )
); );
} }
subclassPersister = referenceCacheEntry.getSubclassPersister();
} }
else { else {
subclassPersister = factory.getEntityPersister( entry.getSubclass() );
final Object optionalObject = event.getInstanceToLoad(); final Object optionalObject = event.getInstanceToLoad();
entity = optionalObject == null entity = optionalObject == null
? session.instantiate( subclassPersister, entityId ) ? session.instantiate( subclassPersister, entityId )

2
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -5042,7 +5042,7 @@ public CacheEntryStructure getCacheEntryStructure() {
@Override @Override
public CacheEntry buildCacheEntry(Object entity, Object[] state, Object version, SessionImplementor session) { public CacheEntry buildCacheEntry(Object entity, Object[] state, Object version, SessionImplementor session) {
return new ReferenceCacheEntryImpl( entity, persister.getEntityName() ); return new ReferenceCacheEntryImpl( entity, persister );
} }
} }