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

HHH-9776 elementCountInMemory should be local 

* By default Cache.size() is now cluster-wide and hence to calculate
elementCountInMemory, local flag needs to be passed in (as well as
skip cache load in case there's a remote store plugged into it).
This commit is contained in:
Galder Zamarreño 2015-05-08 17:39:02 +02:00
parent 37494f4a9f
commit f8186e10c2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java vendored
View File

@ -59,7 +59,7 @@ public abstract class BaseRegion implements Region {
}
private final String name;
private final AdvancedCache regionClearCache;
private final AdvancedCache localAndSkipLoadCache;
private final TransactionManager tm;
private final Object invalidationMutex = new Object();
@ -83,7 +83,7 @@ public abstract class BaseRegion implements Region {
this.name = name;
this.tm = cache.getTransactionManager();
this.factory = factory;
this.regionClearCache = cache.withFlags(
this.localAndSkipLoadCache = cache.withFlags(
Flag.CACHE_MODE_LOCAL, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT,
Flag.SKIP_CACHE_LOAD
);
@ -97,7 +97,7 @@ public abstract class BaseRegion implements Region {
@Override
public long getElementCountInMemory() {
if ( checkValid() ) {
return cache.size();
return localAndSkipLoadCache.size();
}
return 0;
@ -171,10 +171,10 @@ public abstract class BaseRegion implements Region {
Transaction tx = getCurrentTransaction();
if ( tx != null ) {
log.tracef("Transaction, clearing one element at the time");
Caches.removeAll(regionClearCache);
Caches.removeAll(localAndSkipLoadCache);
} else {
log.tracef("Non-transactional, clear in one go");
regionClearCache.clear();
localAndSkipLoadCache.clear();
}
log.tracef("Transition state from CLEARING to VALID");