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

HHH-7210 - Natural-id cache put stats not being correctly updated on insert for "asynch" cache providers

This commit is contained in:
Steve Ebersole 2012-03-30 12:02:25 -05:00
parent ce4e2eda87
commit 9c207b1128
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java
View File

@ -85,7 +85,9 @@ public class NaturalIdXrefDelegate {
// If second-level caching is enabled cache the resolution there as well // If second-level caching is enabled cache the resolution there as well
// NOTE : the checks using 'justAddedToLocalCache' below protect only the stat journaling, not actually // NOTE : the checks using 'justAddedToLocalCache' below protect only the stat journaling, not actually
// putting into the shared cache. we still put into the shared cache because that might have locking // putting into the shared cache. we still put into the shared cache because that might have locking
// semantics that we need to honor. // semantics that we need to honor. we protect the stat journaling in this manner because there
// are cases where we have this method called multiple times and we want to avoid the multiple 'put'
// stats incrementing.
if ( persister.hasNaturalIdCache() ) { if ( persister.hasNaturalIdCache() ) {
final NaturalIdRegionAccessStrategy naturalIdCacheAccessStrategy = persister.getNaturalIdCacheAccessStrategy(); final NaturalIdRegionAccessStrategy naturalIdCacheAccessStrategy = persister.getNaturalIdCacheAccessStrategy();
final NaturalIdCacheKey naturalIdCacheKey = new NaturalIdCacheKey( naturalIdValues, persister, session() ); final NaturalIdCacheKey naturalIdCacheKey = new NaturalIdCacheKey( naturalIdValues, persister, session() );
@ -109,7 +111,11 @@ public class NaturalIdXrefDelegate {
break; break;
} }
case INSERT: { case INSERT: {
naturalIdCacheAccessStrategy.insert( naturalIdCacheKey, pk ); final boolean put = naturalIdCacheAccessStrategy.insert( naturalIdCacheKey, pk );
if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor()
.naturalIdCachePut( naturalIdCacheAccessStrategy.getRegion().getName() );
}
( (EventSource) session() ).getActionQueue().registerProcess( ( (EventSource) session() ).getActionQueue().registerProcess(
new AfterTransactionCompletionProcess() { new AfterTransactionCompletionProcess() {
@ -118,8 +124,8 @@ public class NaturalIdXrefDelegate {
final boolean put = naturalIdCacheAccessStrategy.afterInsert( naturalIdCacheKey, pk ); final boolean put = naturalIdCacheAccessStrategy.afterInsert( naturalIdCacheKey, pk );
if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) { if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor().naturalIdCachePut( factory.getStatisticsImplementor()
naturalIdCacheAccessStrategy.getRegion().getName() ); .naturalIdCachePut( naturalIdCacheAccessStrategy.getRegion().getName() );
} }
} }
} }
@ -133,7 +139,11 @@ public class NaturalIdXrefDelegate {
naturalIdCacheAccessStrategy.remove( previousCacheKey ); naturalIdCacheAccessStrategy.remove( previousCacheKey );
final SoftLock lock = naturalIdCacheAccessStrategy.lockItem( naturalIdCacheKey, null ); final SoftLock lock = naturalIdCacheAccessStrategy.lockItem( naturalIdCacheKey, null );
naturalIdCacheAccessStrategy.update( naturalIdCacheKey, pk ); final boolean put = naturalIdCacheAccessStrategy.update( naturalIdCacheKey, pk );
if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor()
.naturalIdCachePut( naturalIdCacheAccessStrategy.getRegion().getName() );
}
( (EventSource) session() ).getActionQueue().registerProcess( ( (EventSource) session() ).getActionQueue().registerProcess(
new AfterTransactionCompletionProcess() { new AfterTransactionCompletionProcess() {
@ -143,9 +153,11 @@ public class NaturalIdXrefDelegate {
final boolean put = naturalIdCacheAccessStrategy.afterUpdate( naturalIdCacheKey, pk, lock ); final boolean put = naturalIdCacheAccessStrategy.afterUpdate( naturalIdCacheKey, pk, lock );
if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) { if ( put && justAddedToLocalCache && factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor().naturalIdCachePut( factory.getStatisticsImplementor()
naturalIdCacheAccessStrategy.getRegion().getName() ); .naturalIdCachePut( naturalIdCacheAccessStrategy.getRegion().getName() );
} }
naturalIdCacheAccessStrategy.unlockItem( naturalIdCacheKey, lock );
} }
} }
); );

4
hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java vendored
View File

@ -56,12 +56,12 @@ class BaseNaturalIdRegionAccessStrategy extends BaseRegionAccessStrategy impleme
@Override @Override
public boolean afterInsert(Object key, Object value ) throws CacheException { public boolean afterInsert(Object key, Object value ) throws CacheException {
return true; return false;
} }
@Override @Override
public boolean update(Object key, Object value ) throws CacheException { public boolean update(Object key, Object value ) throws CacheException {
return false; return putFromLoad( key, value, 0 , null );
} }
@Override @Override