HHH-8732 Upgraded Ehcache to 2.7.5
This commit is contained in:
parent
8c8304a76a
commit
27a53af302
|
@ -16,3 +16,7 @@ def pomDescription() {
|
|||
def osgiDescription() {
|
||||
return pomDescription()
|
||||
}
|
||||
|
||||
test {
|
||||
forkEvery 1
|
||||
}
|
||||
|
|
|
@ -41,7 +41,6 @@ import org.hibernate.cache.ehcache.internal.regions.EhcacheQueryResultsRegion;
|
|||
import org.hibernate.cache.ehcache.internal.regions.EhcacheTimestampsRegion;
|
||||
import org.hibernate.cache.ehcache.internal.strategy.EhcacheAccessStrategyFactory;
|
||||
import org.hibernate.cache.ehcache.internal.strategy.EhcacheAccessStrategyFactoryImpl;
|
||||
import org.hibernate.cache.ehcache.internal.util.HibernateEhcacheUtils;
|
||||
import org.hibernate.cache.ehcache.management.impl.ProviderMBeanRegistrationHelper;
|
||||
import org.hibernate.cache.spi.CacheDataDescription;
|
||||
import org.hibernate.cache.spi.CollectionRegion;
|
||||
|
@ -181,7 +180,6 @@ abstract class AbstractEhcacheRegionFactory implements RegionFactory {
|
|||
cache = manager.getEhcache( name );
|
||||
LOG.debug( "started EHCache region: " + name );
|
||||
}
|
||||
HibernateEhcacheUtils.validateEhcache( cache );
|
||||
return cache;
|
||||
}
|
||||
catch (net.sf.ehcache.CacheException e) {
|
||||
|
|
|
@ -25,20 +25,15 @@ package org.hibernate.cache.ehcache.internal.util;
|
|||
|
||||
import java.net.URL;
|
||||
|
||||
import net.sf.ehcache.Ehcache;
|
||||
import net.sf.ehcache.config.CacheConfiguration;
|
||||
import net.sf.ehcache.config.Configuration;
|
||||
import net.sf.ehcache.config.ConfigurationFactory;
|
||||
import net.sf.ehcache.config.NonstopConfiguration;
|
||||
import net.sf.ehcache.config.TerracottaConfiguration;
|
||||
import net.sf.ehcache.config.TerracottaConfiguration.ValueMode;
|
||||
import net.sf.ehcache.config.TimeoutBehaviorConfiguration.TimeoutBehaviorType;
|
||||
|
||||
import org.hibernate.cache.CacheException;
|
||||
import org.hibernate.cache.ehcache.EhCacheMessageLogger;
|
||||
|
||||
import org.jboss.logging.Logger;
|
||||
|
||||
import org.hibernate.cache.ehcache.EhCacheMessageLogger;
|
||||
|
||||
|
||||
/**
|
||||
* Copy of Ehcache utils into Hibernate code base
|
||||
|
@ -76,13 +71,6 @@ public final class HibernateEhcacheUtils {
|
|||
|
||||
if ( config.getDefaultCacheConfiguration() != null
|
||||
&& config.getDefaultCacheConfiguration().isTerracottaClustered() ) {
|
||||
if ( ValueMode.IDENTITY
|
||||
.equals( config.getDefaultCacheConfiguration().getTerracottaConfiguration().getValueMode() ) ) {
|
||||
LOG.incompatibleCacheValueMode();
|
||||
config.getDefaultCacheConfiguration()
|
||||
.getTerracottaConfiguration()
|
||||
.setValueMode( ValueMode.SERIALIZATION.name() );
|
||||
}
|
||||
setupHibernateTimeoutBehavior(
|
||||
config.getDefaultCacheConfiguration()
|
||||
.getTerracottaConfiguration()
|
||||
|
@ -92,10 +80,6 @@ public final class HibernateEhcacheUtils {
|
|||
|
||||
for ( CacheConfiguration cacheConfig : config.getCacheConfigurations().values() ) {
|
||||
if ( cacheConfig.isTerracottaClustered() ) {
|
||||
if ( ValueMode.IDENTITY.equals( cacheConfig.getTerracottaConfiguration().getValueMode() ) ) {
|
||||
LOG.incompatibleCacheValueModePerCache( cacheConfig.getName() );
|
||||
cacheConfig.getTerracottaConfiguration().setValueMode( ValueMode.SERIALIZATION.name() );
|
||||
}
|
||||
setupHibernateTimeoutBehavior( cacheConfig.getTerracottaConfiguration().getNonstopConfiguration() );
|
||||
}
|
||||
}
|
||||
|
@ -105,32 +89,4 @@ public final class HibernateEhcacheUtils {
|
|||
private static void setupHibernateTimeoutBehavior(NonstopConfiguration nonstopConfig) {
|
||||
nonstopConfig.getTimeoutBehavior().setType( TimeoutBehaviorType.EXCEPTION.getTypeName() );
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates that the supplied Ehcache instance is valid for use as a Hibernate cache.
|
||||
*
|
||||
* @param cache The cache instance
|
||||
*
|
||||
* @throws CacheException If any explicit settings on the cache are not validate
|
||||
*/
|
||||
public static void validateEhcache(Ehcache cache) throws CacheException {
|
||||
final CacheConfiguration cacheConfig = cache.getCacheConfiguration();
|
||||
|
||||
if ( cacheConfig.isTerracottaClustered() ) {
|
||||
final TerracottaConfiguration tcConfig = cacheConfig.getTerracottaConfiguration();
|
||||
switch ( tcConfig.getValueMode() ) {
|
||||
case IDENTITY: {
|
||||
throw new CacheException(
|
||||
"The clustered Hibernate cache " + cache.getName() + " is using IDENTITY value mode.\n"
|
||||
+ "Identity value mode cannot be used with Hibernate cache regions."
|
||||
);
|
||||
}
|
||||
case SERIALIZATION:
|
||||
default: {
|
||||
// this is the recommended valueMode
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -97,11 +97,9 @@ public class EhcacheHibernate extends AbstractEmitterBean implements EhcacheHibe
|
|||
@Override
|
||||
public void setStatisticsEnabled(boolean flag) {
|
||||
if ( flag ) {
|
||||
ehcacheStats.enableStats();
|
||||
hibernateStats.enableStats();
|
||||
}
|
||||
else {
|
||||
ehcacheStats.disableStats();
|
||||
hibernateStats.disableStats();
|
||||
}
|
||||
statsEnabled.set( flag );
|
||||
|
@ -121,7 +119,6 @@ public class EhcacheHibernate extends AbstractEmitterBean implements EhcacheHibe
|
|||
*/
|
||||
@Override
|
||||
public void clearStats() {
|
||||
ehcacheStats.clearStats();
|
||||
hibernateStats.clearStats();
|
||||
}
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@ package org.hibernate.cache.ehcache.management.impl;
|
|||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.management.MBeanNotificationInfo;
|
||||
import javax.management.NotCompliantMBeanException;
|
||||
import javax.management.Notification;
|
||||
|
@ -33,7 +34,6 @@ import javax.management.Notification;
|
|||
import net.sf.ehcache.Cache;
|
||||
import net.sf.ehcache.CacheManager;
|
||||
import net.sf.ehcache.hibernate.management.api.EhcacheStats;
|
||||
import net.sf.ehcache.management.sampled.SampledCacheManager;
|
||||
|
||||
/**
|
||||
* Implementation of {@link EhcacheStats}
|
||||
|
@ -46,7 +46,6 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
private static final long MILLIS_PER_SECOND = 1000;
|
||||
private static final MBeanNotificationInfo NOTIFICATION_INFO;
|
||||
|
||||
private final SampledCacheManager sampledCacheManager;
|
||||
private final CacheManager cacheManager;
|
||||
private long statsSince = System.currentTimeMillis();
|
||||
|
||||
|
@ -64,35 +63,14 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
* Constructor accepting the backing {@link CacheManager}
|
||||
*
|
||||
* @param manager The {@link CacheManager} to expose stats for
|
||||
*
|
||||
* @throws javax.management.NotCompliantMBeanException should registering the MBean fail
|
||||
*/
|
||||
public EhcacheStatsImpl(CacheManager manager) throws NotCompliantMBeanException {
|
||||
super( EhcacheStats.class );
|
||||
this.sampledCacheManager = new SampledCacheManager( manager );
|
||||
this.cacheManager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStatisticsEnabled() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearStats() {
|
||||
sampledCacheManager.clearStatistics();
|
||||
statsSince = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disableStats() {
|
||||
setStatisticsEnabled( false );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void enableStats() {
|
||||
setStatisticsEnabled( true );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void flushRegionCache(String region) {
|
||||
final Cache cache = this.cacheManager.getCache( region );
|
||||
|
@ -127,7 +105,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getLiveCacheStatistics().getCacheHitCount();
|
||||
count += cache.getStatistics().cacheHitCount();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -136,7 +114,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
@Override
|
||||
public double getCacheHitRate() {
|
||||
final long now = System.currentTimeMillis();
|
||||
final double deltaSecs = (double) (now - statsSince) / MILLIS_PER_SECOND;
|
||||
final double deltaSecs = (double) ( now - statsSince ) / MILLIS_PER_SECOND;
|
||||
return getCacheHitCount() / deltaSecs;
|
||||
}
|
||||
|
||||
|
@ -146,7 +124,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getSampledCacheStatistics().getCacheHitMostRecentSample();
|
||||
count += cache.getStatistics().cacheHitOperation().rate().value().longValue();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -158,7 +136,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getLiveCacheStatistics().getCacheMissCount();
|
||||
count += cache.getStatistics().cacheMissCount();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -167,7 +145,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
@Override
|
||||
public double getCacheMissRate() {
|
||||
final long now = System.currentTimeMillis();
|
||||
final double deltaSecs = (double) (now - statsSince) / MILLIS_PER_SECOND;
|
||||
final double deltaSecs = (double) ( now - statsSince ) / MILLIS_PER_SECOND;
|
||||
return getCacheMissCount() / deltaSecs;
|
||||
}
|
||||
|
||||
|
@ -177,7 +155,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getSampledCacheStatistics().getCacheMissMostRecentSample();
|
||||
count += cache.getStatistics().cacheMissOperation().rate().value().longValue();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -189,7 +167,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getLiveCacheStatistics().getPutCount();
|
||||
count += cache.getStatistics().cachePutCount();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -198,7 +176,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
@Override
|
||||
public double getCachePutRate() {
|
||||
final long now = System.currentTimeMillis();
|
||||
final double deltaSecs = (double) (now - statsSince) / MILLIS_PER_SECOND;
|
||||
final double deltaSecs = (double) ( now - statsSince ) / MILLIS_PER_SECOND;
|
||||
return getCachePutCount() / deltaSecs;
|
||||
}
|
||||
|
||||
|
@ -208,7 +186,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
count += cache.getSampledCacheStatistics().getCacheElementPutMostRecentSample();
|
||||
count += cache.getStatistics().cachePutOperation().rate().value().longValue();
|
||||
}
|
||||
}
|
||||
return count;
|
||||
|
@ -286,12 +264,16 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
for ( String name : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( name );
|
||||
if ( cache != null ) {
|
||||
final Double hits = cache.getStatistics().cacheHitOperation().rate().value();
|
||||
final Double misses = cache.getStatistics().cacheMissNotFoundOperation().rate().value();
|
||||
final Double expired = cache.getStatistics().cacheMissExpiredOperation().rate().value();
|
||||
final Double puts = cache.getStatistics().cachePutOperation().rate().value();
|
||||
rv.put(
|
||||
name, new int[] {
|
||||
(int) cache.getSampledCacheStatistics().getCacheHitMostRecentSample(),
|
||||
(int) (cache.getSampledCacheStatistics().getCacheMissNotFoundMostRecentSample()
|
||||
+ cache.getSampledCacheStatistics().getCacheMissExpiredMostRecentSample()),
|
||||
(int) cache.getSampledCacheStatistics().getCacheElementPutMostRecentSample(),
|
||||
hits.intValue(),
|
||||
misses.intValue(),
|
||||
expired.intValue(),
|
||||
puts.intValue()
|
||||
}
|
||||
);
|
||||
}
|
||||
|
@ -332,7 +314,7 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
}
|
||||
}
|
||||
}
|
||||
return rv.toArray( new String[ rv.size() ] );
|
||||
return rv.toArray( new String[rv.size()] );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -472,27 +454,22 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setStatisticsEnabled(boolean flag) {
|
||||
for ( String cacheName : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( cacheName );
|
||||
if ( cache != null ) {
|
||||
cache.setStatisticsEnabled( flag );
|
||||
}
|
||||
}
|
||||
if ( flag ) {
|
||||
clearStats();
|
||||
}
|
||||
sendNotification( CACHE_STATISTICS_ENABLED, flag );
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getMaxGetTimeMillis() {
|
||||
long rv = 0;
|
||||
for ( String cacheName : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( cacheName );
|
||||
if ( cache != null ) {
|
||||
rv = Math.max( rv, cache.getLiveCacheStatistics().getMaxGetTimeMillis() );
|
||||
final Long maximum = cache.getStatistics()
|
||||
.cacheGetOperation().latency().maximum().value();
|
||||
if ( maximum != null ) {
|
||||
rv = Math.max(
|
||||
rv, TimeUnit.MILLISECONDS.convert(
|
||||
maximum,
|
||||
TimeUnit.NANOSECONDS
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
|
@ -500,21 +477,39 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
|
||||
@Override
|
||||
public long getMinGetTimeMillis() {
|
||||
long rv = 0;
|
||||
long rv = Long.MAX_VALUE;
|
||||
for ( String cacheName : cacheManager.getCacheNames() ) {
|
||||
final Cache cache = cacheManager.getCache( cacheName );
|
||||
if ( cache != null ) {
|
||||
rv = Math.max( rv, cache.getLiveCacheStatistics().getMinGetTimeMillis() );
|
||||
final Long minimum = cache.getStatistics()
|
||||
.cacheGetOperation()
|
||||
.latency()
|
||||
.minimum().value();
|
||||
if ( minimum != null ) {
|
||||
rv = Math.min(
|
||||
rv, TimeUnit.MILLISECONDS.convert(
|
||||
minimum,
|
||||
TimeUnit.NANOSECONDS
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
return rv == Long.MAX_VALUE ? 0 : rv;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getMaxGetTimeMillis(String cacheName) {
|
||||
final Cache cache = cacheManager.getCache( cacheName );
|
||||
if ( cache != null ) {
|
||||
return cache.getLiveCacheStatistics().getMaxGetTimeMillis();
|
||||
final Long maximum = cache.getStatistics()
|
||||
.cacheGetOperation()
|
||||
.latency()
|
||||
.maximum().value();
|
||||
return maximum == null ? 0 : TimeUnit.MILLISECONDS.convert(
|
||||
maximum,
|
||||
TimeUnit.NANOSECONDS
|
||||
);
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
|
@ -525,7 +520,14 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
public long getMinGetTimeMillis(String cacheName) {
|
||||
final Cache cache = cacheManager.getCache( cacheName );
|
||||
if ( cache != null ) {
|
||||
return cache.getLiveCacheStatistics().getMinGetTimeMillis();
|
||||
final Long minimum = cache.getStatistics()
|
||||
.cacheGetOperation()
|
||||
.latency()
|
||||
.minimum().value();
|
||||
return minimum == null ? 0 : TimeUnit.MILLISECONDS.convert(
|
||||
minimum,
|
||||
TimeUnit.NANOSECONDS
|
||||
);
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
|
@ -536,7 +538,14 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
public float getAverageGetTimeMillis(String region) {
|
||||
final Cache cache = this.cacheManager.getCache( region );
|
||||
if ( cache != null ) {
|
||||
return cache.getLiveCacheStatistics().getAverageGetTimeMillis();
|
||||
final Double avg = cache.getStatistics()
|
||||
.cacheGetOperation()
|
||||
.latency()
|
||||
.average().value();
|
||||
return TimeUnit.MILLISECONDS.convert(
|
||||
avg.longValue(),
|
||||
TimeUnit.NANOSECONDS
|
||||
);
|
||||
}
|
||||
else {
|
||||
return -1f;
|
||||
|
@ -550,6 +559,6 @@ public class EhcacheStatsImpl extends AbstractEmitterBean implements EhcacheStat
|
|||
|
||||
@Override
|
||||
public MBeanNotificationInfo[] getNotificationInfo() {
|
||||
return new MBeanNotificationInfo[] {NOTIFICATION_INFO};
|
||||
return new MBeanNotificationInfo[] { NOTIFICATION_INFO };
|
||||
}
|
||||
}
|
||||
|
|
|
@ -112,7 +112,7 @@ ext {
|
|||
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~ c3p0
|
||||
c3p0: "com.mchange:c3p0:0.9.2.1",
|
||||
ehcache: "net.sf.ehcache:ehcache-core:2.4.3",
|
||||
ehcache: "net.sf.ehcache:ehcache:2.7.5",
|
||||
proxool: "proxool:proxool:0.8.3"
|
||||
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue