HHH-7150 added Cache#evictAllRegions

hibernate · Oct 7, 2013 · 0ba9a3a · 0ba9a3a
1 parent 4a898c5
commit 0ba9a3a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/Cache.java b/hibernate-core/src/main/java/org/hibernate/Cache.java
@@ -185,4 +185,9 @@ public interface Cache {
 	 * Evict data from all query regions.
 	 */
 	public void evictQueryRegions();
+
+	/**
+	 * Evict all data from the cache.
+	 */
+	public void evictAllRegions();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java
@@ -354,4 +354,13 @@ public Map<String, Region> getAllSecondLevelCacheRegions() {
 	public RegionFactory getRegionFactory() {
 		return regionFactory;
 	}
+
+	@Override
+	public void evictAllRegions() {
+		evictCollectionRegions();
+		evictDefaultQueryRegion();
+		evictEntityRegions();
+		evictQueryRegions();
+		evictNaturalIdRegions();
+	}
 }
diff --git a/...nate-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerFactoryImpl.java b/...nate-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerFactoryImpl.java
@@ -557,6 +557,7 @@ public void evict(Class entityClass) {
 		}
 
 		public void evictAll() {
+			// Evict only the "JPA cache", which is purely defined as the entity regions.
 			sessionFactory.getCache().evictEntityRegions();
 // TODO : if we want to allow an optional clearing of all cache data, the additional calls would be:
 //			sessionFactory.getCache().evictCollectionRegions();

diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -441,11 +441,7 @@ public final void afterTest() throws Exception {
 
 	protected void cleanupCache() {
 		if ( sessionFactory != null ) {
-			sessionFactory.getCache().evictCollectionRegions();
-			sessionFactory.getCache().evictDefaultQueryRegion();
-			sessionFactory.getCache().evictEntityRegions();
-			sessionFactory.getCache().evictQueryRegions();
-			sessionFactory.getCache().evictNaturalIdRegions();
+			sessionFactory.getCache().evictAllRegions();
 		}
 	}