HHH-9988 Separate transaction manager used for Hibernate and caches

rvansa · galderz · commit fa8e94071fbf · 2015-08-12T10:39:17.000+02:00
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
@@ -67,6 +67,8 @@
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 
+import javax.transaction.TransactionManager;
+
 /**
  * A {@link RegionFactory} for <a href="http://www.jboss.org/infinispan">Infinispan</a>-backed cache
  * regions.
@@ -219,6 +221,7 @@ public class InfinispanRegionFactory implements RegionFactory {
 	private final Set<String> definedConfigurations = new HashSet<String>();
 
 	private org.infinispan.transaction.lookup.TransactionManagerLookup transactionManagerlookup;
+	private TransactionManager transactionManager;
 
 	private List<String> regionNames = new ArrayList<String>();
 	private SessionFactoryOptions settings;
@@ -247,7 +250,7 @@ public CollectionRegion buildCollectionRegion(
 			log.debug( "Building collection cache region [" + regionName + "]" );
 		}
 		final AdvancedCache cache = getCache( regionName, COLLECTION_KEY, properties, metadata);
-		final CollectionRegionImpl region = new CollectionRegionImpl( cache, regionName, metadata, this, buildCacheKeysFactory() );
+		final CollectionRegionImpl region = new CollectionRegionImpl( cache, regionName, transactionManager, metadata, this, buildCacheKeysFactory() );
 		startRegion( region, regionName );
 		return region;
 	}
@@ -264,7 +267,7 @@ public EntityRegion buildEntityRegion(String regionName, Properties properties,
 			);
 		}
 		final AdvancedCache cache = getCache( regionName, metadata.isMutable() ? ENTITY_KEY : IMMUTABLE_ENTITY_KEY, properties, metadata );
-		final EntityRegionImpl region = new EntityRegionImpl( cache, regionName, metadata, this, buildCacheKeysFactory() );
+		final EntityRegionImpl region = new EntityRegionImpl( cache, regionName, transactionManager, metadata, this, buildCacheKeysFactory() );
 		startRegion( region, regionName );
 		return region;
 	}
@@ -276,7 +279,7 @@ public NaturalIdRegion buildNaturalIdRegion(String regionName, Properties proper
 			log.debug("Building natural id cache region [" + regionName + "]");
 		}
 		final AdvancedCache cache = getCache( regionName, NATURAL_ID_KEY, properties, metadata);
-		final NaturalIdRegionImpl region = new NaturalIdRegionImpl( cache, regionName, metadata, this, buildCacheKeysFactory());
+		final NaturalIdRegionImpl region = new NaturalIdRegionImpl( cache, regionName, transactionManager, metadata, this, buildCacheKeysFactory());
 		startRegion( region, regionName );
 		return region;
 	}
@@ -294,7 +297,7 @@ public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties
 		}
 
 		final AdvancedCache cache = getCache( cacheName, QUERY_KEY, properties, null);
-		final QueryResultsRegionImpl region = new QueryResultsRegionImpl( cache, regionName, this );
+		final QueryResultsRegionImpl region = new QueryResultsRegionImpl( cache, regionName, transactionManager, this );
 		startRegion( region, regionName );
 		return region;
 	}
@@ -358,6 +361,7 @@ public void start(SessionFactoryOptions settings, Properties properties) throws
 		log.debug( "Starting Infinispan region factory" );
 		try {
 			transactionManagerlookup = createTransactionManagerLookup( settings, properties );
+			transactionManager = transactionManagerlookup.getTransactionManager();
 			manager = createCacheManager( properties, settings.getServiceRegistry() );
 			this.settings = settings;
 			initGenericDataTypeOverrides();
@@ -602,7 +606,7 @@ private void defineGenericDataTypeCacheConfigurations(Properties properties) {
 		}
 	}
 
-	private AdvancedCache getCache(String regionName, String typeKey, Properties properties, CacheDataDescription metadata) {
+	protected AdvancedCache getCache(String regionName, String typeKey, Properties properties, CacheDataDescription metadata) {
 		TypeOverrides regionOverride = typeOverrides.get( regionName );
 		if ( !definedConfigurations.contains( regionName ) ) {
 			final String templateCacheName;
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java
@@ -114,24 +114,26 @@ public class PutFromLoadValidator {
 	 * Creates a new put from load validator instance.
     *
     * @param cache Cache instance on which to store pending put information.
+	 * @param transactionManager Transaction manager
 	 */
-	public PutFromLoadValidator(AdvancedCache cache) {
-		this( cache, NAKED_PUT_INVALIDATION_PERIOD );
+	public PutFromLoadValidator(AdvancedCache cache, TransactionManager transactionManager) {
+		this( cache, transactionManager, NAKED_PUT_INVALIDATION_PERIOD );
 	}
 
    /**
     * Constructor variant for use by unit tests; allows control of various timeouts by the test.
     *
     * @param cache Cache instance on which to store pending put information.
+	 * @param transactionManager Transaction manager
     * @param nakedPutInvalidationPeriod Period (in ms) after a removal during which a call to
     *                                   {@link #acquirePutFromLoadLock(Object)} that hasn't been
     *                                   {@link #registerPendingPut(Object) pre-registered} (aka a "naked put")
     *                                   will return false.
     */
 	public PutFromLoadValidator(
-			AdvancedCache cache,
+			AdvancedCache cache, TransactionManager transactionManager,
 			long nakedPutInvalidationPeriod) {
-		this(cache, cache.getCacheManager(), cache.getTransactionManager(),
+		this(cache, cache.getCacheManager(), transactionManager,
 				nakedPutInvalidationPeriod
 		);
 	}
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
@@ -17,6 +17,8 @@
 import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
 import org.infinispan.AdvancedCache;
 
+import javax.transaction.TransactionManager;
+
 /**
  * Collection region implementation
  *
@@ -31,14 +33,15 @@ public class CollectionRegionImpl extends BaseTransactionalDataRegion implements
     *
     * @param cache instance to store collection instances
     * @param name of collection type
+	 * @param transactionManager
     * @param metadata for the collection type
     * @param factory for the region
 	* @param cacheKeysFactory factory for cache keys
     */
 	public CollectionRegionImpl(
-			AdvancedCache cache, String name,
+			AdvancedCache cache, String name, TransactionManager transactionManager,
 			CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {
-		super( cache, name, metadata, factory, cacheKeysFactory );
+		super( cache, name, transactionManager, metadata, factory, cacheKeysFactory );
 	}
 
 	@Override
@@ -52,7 +55,7 @@ public CollectionRegionAccessStrategy buildAccessStrategy(AccessType accessType)
 	}
 
 	public PutFromLoadValidator getPutFromLoadValidator() {
-		return new PutFromLoadValidator( cache );
+		return new PutFromLoadValidator( cache, getTransactionManager() );
 	}
 
 }
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
@@ -18,6 +18,8 @@
 
 import org.infinispan.AdvancedCache;
 
+import javax.transaction.TransactionManager;
+
 /**
  * Entity region implementation
  *
@@ -32,14 +34,15 @@ public class EntityRegionImpl extends BaseTransactionalDataRegion implements Ent
     *
     * @param cache instance to store entity instances
     * @param name of entity type
+	 * @param transactionManager
     * @param metadata for the entity type
     * @param factory for the region
 	* @param cacheKeysFactory factory for cache keys
     */
 	public EntityRegionImpl(
-			AdvancedCache cache, String name,
+			AdvancedCache cache, String name, TransactionManager transactionManager,
 			CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {
-		super( cache, name, metadata, factory, cacheKeysFactory);
+		super( cache, name, transactionManager, metadata, factory, cacheKeysFactory);
 	}
 
 	@Override
@@ -60,6 +63,6 @@ public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) thr
 	}
 
 	public PutFromLoadValidator getPutFromLoadValidator() {
-		return new PutFromLoadValidator( cache );
+		return new PutFromLoadValidator( cache, getTransactionManager() );
 	}
 }
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java
@@ -34,7 +34,7 @@ public abstract class BaseGeneralDataRegion extends BaseRegion implements Genera
 	public BaseGeneralDataRegion(
 			AdvancedCache cache, String name,
 			RegionFactory factory) {
-		super( cache, name, factory );
+		super( cache, name, null, factory );
 		this.putCache = Caches.ignoreReturnValuesCache( cache );
 	}
 
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
@@ -59,12 +59,13 @@ private enum InvalidateState {
     *
     * @param cache instance for the region
     * @param name of the region
+	 * @param transactionManager transaction manager may be needed even for non-transactional caches.
     * @param factory for this region
     */
-	public BaseRegion(AdvancedCache cache, String name, RegionFactory factory) {
+	public BaseRegion(AdvancedCache cache, String name, TransactionManager transactionManager, RegionFactory factory) {
 		this.cache = cache;
 		this.name = name;
-		this.tm = cache.getTransactionManager();
+		this.tm = transactionManager;
 		this.factory = factory;
 		this.localAndSkipLoadCache = cache.withFlags(
 				Flag.CACHE_MODE_LOCAL, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT,
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java
@@ -13,6 +13,8 @@
 
 import org.infinispan.AdvancedCache;
 
+import javax.transaction.TransactionManager;
+
 /**
  * Support for Inifinispan {@link org.hibernate.cache.spi.TransactionalDataRegion} implementors.
  *
@@ -31,14 +33,15 @@ public abstract class BaseTransactionalDataRegion
     *
     * @param cache instance to store transactional data
     * @param name of the transactional region
+	 * @param transactionManager
     * @param metadata for the transactional region
     * @param factory for the transactional region
 	* @param cacheKeysFactory factory for cache keys
     */
 	public BaseTransactionalDataRegion(
-			AdvancedCache cache, String name,
+			AdvancedCache cache, String name, TransactionManager transactionManager,
 			CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {
-		super( cache, name, factory);
+		super( cache, name, transactionManager, factory);
 		this.metadata = metadata;
 		this.cacheKeysFactory = cacheKeysFactory;
 	}
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/NaturalIdRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/NaturalIdRegionImpl.java
@@ -17,6 +17,8 @@
 import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
 import org.infinispan.AdvancedCache;
 
+import javax.transaction.TransactionManager;
+
 /**
  * Natural ID cache region
  *
@@ -31,14 +33,15 @@ public class NaturalIdRegionImpl extends BaseTransactionalDataRegion
     *
     * @param cache instance to store natural ids
     * @param name of natural id region
+	 * @param transactionManager
     * @param metadata for the natural id region
     * @param factory for the natural id region
 	* @param cacheKeysFactory factory for cache keys
     */
 	public NaturalIdRegionImpl(
-			AdvancedCache cache, String name,
+			AdvancedCache cache, String name, TransactionManager transactionManager,
 			CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {
-		super( cache, name, metadata, factory, cacheKeysFactory );
+		super( cache, name, transactionManager, metadata, factory, cacheKeysFactory );
 	}
 
 	@Override
@@ -54,7 +57,7 @@ public NaturalIdRegionAccessStrategy buildAccessStrategy(AccessType accessType)
 	}
 
 	public PutFromLoadValidator getPutFromLoadValidator() {
-		return new PutFromLoadValidator( cache );
+		return new PutFromLoadValidator( cache, getTransactionManager() );
 	}
 
 }
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
@@ -58,8 +58,8 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
     * @param name of the query region
     * @param factory for the query region
     */
-	public QueryResultsRegionImpl(AdvancedCache cache, String name, RegionFactory factory) {
-		super( cache, name, null, factory, null );
+	public QueryResultsRegionImpl(AdvancedCache cache, String name, TransactionManager transactionManager, RegionFactory factory) {
+		super( cache, name, transactionManager, null, factory, null );
 		// If Infinispan is using INVALIDATION for query cache, we don't want to propagate changes.
 		// We use the Timestamps cache to manage invalidation
 		final boolean localOnly = Caches.isInvalidationCache( cache );

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;`
`18`	`18`	`import org.infinispan.AdvancedCache;`
`19`	`19`
	`20`	`+import javax.transaction.TransactionManager;`
	`21`	`+`
`20`	`22`	`/**`
`21`	`23`	`* Collection region implementation`
`22`	`24`	`*`
`@@ -31,14 +33,15 @@ public class CollectionRegionImpl extends BaseTransactionalDataRegion implements`
`31`	`33`	`*`
`32`	`34`	`* @param cache instance to store collection instances`
`33`	`35`	`* @param name of collection type`
	`36`	`+ * @param transactionManager`
`34`	`37`	`* @param metadata for the collection type`
`35`	`38`	`* @param factory for the region`
`36`	`39`	`* @param cacheKeysFactory factory for cache keys`
`37`	`40`	`*/`
`38`	`41`	`public CollectionRegionImpl(`
`39`		`- AdvancedCache cache, String name,`
	`42`	`+ AdvancedCache cache, String name, TransactionManager transactionManager,`
`40`	`43`	`CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {`
`41`		`- super( cache, name, metadata, factory, cacheKeysFactory );`
	`44`	`+ super( cache, name, transactionManager, metadata, factory, cacheKeysFactory );`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`@Override`
`@@ -52,7 +55,7 @@ public CollectionRegionAccessStrategy buildAccessStrategy(AccessType accessType)`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`public PutFromLoadValidator getPutFromLoadValidator() {`
`55`		`- return new PutFromLoadValidator( cache );`
	`58`	`+ return new PutFromLoadValidator( cache, getTransactionManager() );`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`
`19`	`19`	`import org.infinispan.AdvancedCache;`
`20`	`20`
	`21`	`+import javax.transaction.TransactionManager;`
	`22`	`+`
`21`	`23`	`/**`
`22`	`24`	`* Entity region implementation`
`23`	`25`	`*`
`@@ -32,14 +34,15 @@ public class EntityRegionImpl extends BaseTransactionalDataRegion implements Ent`
`32`	`34`	`*`
`33`	`35`	`* @param cache instance to store entity instances`
`34`	`36`	`* @param name of entity type`
	`37`	`+ * @param transactionManager`
`35`	`38`	`* @param metadata for the entity type`
`36`	`39`	`* @param factory for the region`
`37`	`40`	`* @param cacheKeysFactory factory for cache keys`
`38`	`41`	`*/`
`39`	`42`	`public EntityRegionImpl(`
`40`		`- AdvancedCache cache, String name,`
	`43`	`+ AdvancedCache cache, String name, TransactionManager transactionManager,`
`41`	`44`	`CacheDataDescription metadata, RegionFactory factory, CacheKeysFactory cacheKeysFactory) {`
`42`		`- super( cache, name, metadata, factory, cacheKeysFactory);`
	`45`	`+ super( cache, name, transactionManager, metadata, factory, cacheKeysFactory);`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`@Override`
`@@ -60,6 +63,6 @@ public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) thr`
`60`	`63`	`}`
`61`	`64`
`62`	`65`	`public PutFromLoadValidator getPutFromLoadValidator() {`
`63`		`- return new PutFromLoadValidator( cache );`
	`66`	`+ return new PutFromLoadValidator( cache, getTransactionManager() );`
`64`	`67`	`}`
`65`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public abstract class BaseGeneralDataRegion extends BaseRegion implements Genera`
`34`	`34`	`public BaseGeneralDataRegion(`
`35`	`35`	`AdvancedCache cache, String name,`
`36`	`36`	`RegionFactory factory) {`
`37`		`- super( cache, name, factory );`
	`37`	`+ super( cache, name, null, factory );`
`38`	`38`	`this.putCache = Caches.ignoreReturnValuesCache( cache );`
`39`	`39`	`}`
`40`	`40`