6:33 p.m.
Author: steve.ebersole(a)jboss.com
Date: 2009-07-13 19:33:02 -0400 (Mon, 13 Jul 2009)
New Revision: 17084
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
core/trunk/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java
core/trunk/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java
core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
Log:
HHH-4034 - Update org.hibernate.action.BulkOperationCleanupAction to use new Region cache
APIs
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -53,7 +53,11 @@
}
public String[] getMappings() {
- return new String[] { "cache/jbc2/functional/Item.hbm.xml",
"cache/jbc2/functional/Customer.hbm.xml",
"cache/jbc2/functional/Contact.hbm.xml" };
+ return new String[] {
+ "cache/jbc/functional/Item.hbm.xml",
+ "cache/jbc/functional/Customer.hbm.xml",
+ "cache/jbc/functional/Contact.hbm.xml"
+ };
}
public void configure(Configuration cfg) {
@@ -96,7 +100,7 @@
/**
* Apply any region-factory specific configurations.
*
- * @param the Configuration to update.
+ * @param cfg the Configuration to update.
*/
protected abstract void configureCacheFactory(Configuration cfg);
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -118,7 +118,7 @@
@Override
public String[] getMappings()
{
- return new String[] { "cache/jbc2/functional/classloader/Account.hbm.xml"
};
+ return new String[] { "cache/jbc/functional/classloader/Account.hbm.xml"
};
}
@Override
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -105,7 +105,7 @@
@Override
public String[] getMappings()
{
- return new String[] { "cache/jbc2/functional/classloader/Account.hbm.xml"
};
+ return new String[] { "cache/jbc/functional/classloader/Account.hbm.xml"
};
}
@Override
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -31,8 +31,8 @@
public class IsolatedCacheTestSetup extends SelectedClassnameClassLoaderTestSetup
{
- public static final String DEF_CACHE_FACTORY_RESOURCE =
"org/hibernate/cache/jbc2/builder/jbc2-configs.xml";
- public static final String DEF_JGROUPS_RESOURCE =
"org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+ public static final String DEF_CACHE_FACTORY_RESOURCE =
"org/hibernate/cache/jbc/builder/jbc2-configs.xml";
+ public static final String DEF_JGROUPS_RESOURCE =
"org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
private String[] isolatedClasses;
private String cacheConfig;
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -36,8 +36,8 @@
*/
public class CacheManagerTestSetup extends TestSetup
{
- public static final String DEF_CACHE_FACTORY_RESOURCE =
"org/hibernate/cache/jbc2/builder/jbc2-configs.xml";
- public static final String DEF_JGROUPS_RESOURCE =
"org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+ public static final String DEF_CACHE_FACTORY_RESOURCE =
"org/hibernate/cache/jbc/builder/jbc2-configs.xml";
+ public static final String DEF_JGROUPS_RESOURCE =
"org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
private final String jbcConfig;
private final String jgConfig;
Modified:
core/trunk/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java
===================================================================
---
core/trunk/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -25,8 +25,12 @@
package org.hibernate.action;
import org.hibernate.HibernateException;
+import org.hibernate.cache.access.SoftLock;
+import org.hibernate.cache.access.EntityRegionAccessStrategy;
+import org.hibernate.cache.access.CollectionRegionAccessStrategy;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.Queryable;
+import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.SessionImplementor;
@@ -36,49 +40,84 @@
import java.util.Iterator;
import java.util.HashSet;
import java.util.ArrayList;
+import java.util.Arrays;
/**
- * Implementation of BulkOperationCleanupAction.
+ * An {@link org.hibernate.engine.ActionQueue} {@link Executable} for ensuring
+ * shared cache cleanup in relation to performed bulk HQL queries.
+ * <p/>
+ * NOTE: currently this executes for <tt>INSERT</tt> queries as well as
+ * <tt>UPDATE</tt> and <tt>DELETE</tt> queries. For
<tt>INSERT</tt> it is
+ * really not needed as we'd have no invalid entity/collection data to
+ * cleanup (we'd still nee to invalidate the appropriate update-timestamps
+ * regions) as a result of this query.
*
* @author Steve Ebersole
*/
public class BulkOperationCleanupAction implements Executable, Serializable {
+ private final Serializable[] affectedTableSpaces;
- private final SessionImplementor session;
+ private final Set entityCleanups = new HashSet();
+ private final Set collectionCleanups = new HashSet();
- private final Set affectedEntityNames = new HashSet();
- private final Set affectedCollectionRoles = new HashSet();
- private final Serializable[] spaces;
-
- public BulkOperationCleanupAction(SessionImplementor session, Queryable[]
affectedQueryables) {
- this.session = session;
- // TODO : probably better to calculate these and pass them in, as it'll be more
performant
+ /**
+ * Constructs an action to cleanup "affected cache regions" based on the
+ * affected entity persisters. The affected regions are defined as the
+ * region (if any) of the entity persisters themselves, plus the
+ * collection regions for any collection in which those entity
+ * persisters participate as elements/keys/etc.
+ *
+ * @param session The session to which this request is tied.
+ * @param affectedQueryables The affected entity persisters.
+ */
+ public BulkOperationCleanupAction(
+ SessionImplementor session,
+ Queryable[] affectedQueryables) {
+ SessionFactoryImplementor factory = session.getFactory();
ArrayList tmpSpaces = new ArrayList();
for ( int i = 0; i < affectedQueryables.length; i++ ) {
+ tmpSpaces.addAll( Arrays.asList( affectedQueryables[i].getQuerySpaces() ) );
if ( affectedQueryables[i].hasCache() ) {
- affectedEntityNames.add( affectedQueryables[i].getEntityName() );
+ entityCleanups.add(
+ new EntityCleanup(
+ affectedQueryables[i].getCacheAccessStrategy()
+ )
+ );
}
- Set roles = session.getFactory().getCollectionRolesByEntityParticipant(
affectedQueryables[i].getEntityName() );
+ Set roles = factory.getCollectionRolesByEntityParticipant(
affectedQueryables[i].getEntityName() );
if ( roles != null ) {
- affectedCollectionRoles.addAll( roles );
+ Iterator itr = roles.iterator();
+ while ( itr.hasNext() ) {
+ String role = ( String ) itr.next();
+ CollectionPersister collectionPersister = factory.getCollectionPersister( role );
+ if ( collectionPersister.hasCache() ) {
+ collectionCleanups.add(
+ new CollectionCleanup(
+ collectionPersister.getCacheAccessStrategy()
+ )
+ );
+ }
+ }
}
- for ( int y = 0; y < affectedQueryables[i].getQuerySpaces().length; y++ ) {
- tmpSpaces.add( affectedQueryables[i].getQuerySpaces()[y] );
- }
}
- this.spaces = new Serializable[ tmpSpaces.size() ];
- for ( int i = 0; i < tmpSpaces.size(); i++ ) {
- this.spaces[i] = ( Serializable ) tmpSpaces.get( i );
- }
+
+ this.affectedTableSpaces = ( Serializable[] ) tmpSpaces.toArray( new Serializable[
tmpSpaces.size() ] );
}
-
- /** Create an action that will evict collection and entity regions based on queryspaces
(table names).
- * TODO: cache the autodetected information and pass it in instead.
- **/
- public BulkOperationCleanupAction(SessionImplementor session, Set querySpaces) {
- this.session = session;
- Set tmpSpaces = new HashSet(querySpaces);
+ /**
+ * Constructs an action to cleanup "affected cache regions" based on a
+ * set of affected table spaces. This differs from {@link
#BulkOperationCleanupAction(SessionImplementor, Queryable[])}
+ * in that here we have the affected <strong>table names</strong>. From
those
+ * we deduce the entity persisters whcih are affected based on the defined
+ * {@link EntityPersister#getQuerySpaces() table spaces}; and from there, we
+ * determine the affected collection regions based on any collections
+ * in which those entity persisters participate as elements/keys/etc.
+ *
+ * @param session The session to which this request is tied.
+ * @param tableSpaces The table spaces.
+ */
+ public BulkOperationCleanupAction(SessionImplementor session, Set tableSpaces) {
+ Set tmpSpaces = new HashSet(tableSpaces);
SessionFactoryImplementor factory = session.getFactory();
Iterator iterator = factory.getAllClassMetadata().entrySet().iterator();
while ( iterator.hasNext() ) {
@@ -87,41 +126,66 @@
EntityPersister persister = factory.getEntityPersister( entityName );
Serializable[] entitySpaces = persister.getQuerySpaces();
- if (affectedEntity( querySpaces, entitySpaces )) {
+ if ( affectedEntity( tableSpaces, entitySpaces ) ) {
+ tmpSpaces.addAll( Arrays.asList( entitySpaces ) );
if ( persister.hasCache() ) {
- affectedEntityNames.add( persister.getEntityName() );
+ entityCleanups.add(
+ new EntityCleanup(
+ persister.getCacheAccessStrategy()
+ )
+ );
}
Set roles = session.getFactory().getCollectionRolesByEntityParticipant(
persister.getEntityName() );
if ( roles != null ) {
- affectedCollectionRoles.addAll( roles );
+ Iterator itr = roles.iterator();
+ while ( itr.hasNext() ) {
+ String role = ( String ) itr.next();
+ CollectionPersister collectionPersister = factory.getCollectionPersister( role );
+ if ( collectionPersister.hasCache() ) {
+ collectionCleanups.add(
+ new CollectionCleanup(
+ collectionPersister.getCacheAccessStrategy()
+ )
+ );
+ }
+ }
}
- for ( int y = 0; y < entitySpaces.length; y++ ) {
- tmpSpaces.add( entitySpaces[y] );
- }
}
+ }
- }
- this.spaces = (Serializable[]) tmpSpaces.toArray( new Serializable[tmpSpaces.size()]
);
+ this.affectedTableSpaces = ( Serializable[] ) tmpSpaces.toArray( new Serializable[
tmpSpaces.size() ] );
}
- /** returns true if no queryspaces or if there are a match */
- private boolean affectedEntity(Set querySpaces, Serializable[] entitySpaces) {
- if(querySpaces==null || querySpaces.isEmpty()) {
+ /**
+ * Check to determine whether the table spaces reported by an entity
+ * persister match against the defined affected table spaces.
+ *
+ * @param affectedTableSpaces The table spaces reported to be affected by
+ * the query.
+ * @param checkTableSpaces The table spaces (from the entity persister)
+ * to check against the affected table spaces.
+ *
+ * @return True if there are affected table spaces and any of the incoming
+ * check table spaces occur in that set.
+ */
+ private boolean affectedEntity(
+ Set affectedTableSpaces,
+ Serializable[] checkTableSpaces) {
+ if ( affectedTableSpaces == null || affectedTableSpaces.isEmpty() ) {
return true;
}
-
- for ( int i = 0; i < entitySpaces.length; i++ ) {
- if ( querySpaces.contains( entitySpaces[i] ) ) {
+
+ for ( int i = 0; i < checkTableSpaces.length; i++ ) {
+ if ( affectedTableSpaces.contains( checkTableSpaces[i] ) ) {
return true;
}
}
return false;
}
- public void init() {
- evictEntityRegions();
- evictCollectionRegions();
+ public Serializable[] getPropertySpaces() {
+ return affectedTableSpaces;
}
public boolean hasAfterTransactionCompletion() {
@@ -129,12 +193,17 @@
}
public void afterTransactionCompletion(boolean success) throws HibernateException {
- evictEntityRegions();
- evictCollectionRegions();
- }
+ Iterator itr = entityCleanups.iterator();
+ while ( itr.hasNext() ) {
+ final EntityCleanup cleanup = ( EntityCleanup ) itr.next();
+ cleanup.release();
+ }
- public Serializable[] getPropertySpaces() {
- return spaces;
+ itr = collectionCleanups.iterator();
+ while ( itr.hasNext() ) {
+ final CollectionCleanup cleanup = ( CollectionCleanup ) itr.next();
+ cleanup.release();
+ }
}
public void beforeExecutions() throws HibernateException {
@@ -145,23 +214,33 @@
// nothing to do
}
- private void evictEntityRegions() {
- if ( affectedEntityNames != null ) {
- Iterator itr = affectedEntityNames.iterator();
- while ( itr.hasNext() ) {
- final String entityName = ( String ) itr.next();
- session.getFactory().evictEntity( entityName );
- }
+ private static class EntityCleanup {
+ private final EntityRegionAccessStrategy cacheAccess;
+ private final SoftLock cacheLock;
+
+ private EntityCleanup(EntityRegionAccessStrategy cacheAccess) {
+ this.cacheAccess = cacheAccess;
+ this.cacheLock = cacheAccess.lockRegion();
+ cacheAccess.removeAll();
}
+
+ private void release() {
+ cacheAccess.unlockRegion( cacheLock );
+ }
}
- private void evictCollectionRegions() {
- if ( affectedCollectionRoles != null ) {
- Iterator itr = affectedCollectionRoles.iterator();
- while ( itr.hasNext() ) {
- final String roleName = ( String ) itr.next();
- session.getFactory().evictCollection( roleName );
- }
+ private static class CollectionCleanup {
+ private final CollectionRegionAccessStrategy cacheAccess;
+ private final SoftLock cacheLock;
+
+ private CollectionCleanup(CollectionRegionAccessStrategy cacheAccess) {
+ this.cacheAccess = cacheAccess;
+ this.cacheLock = cacheAccess.lockRegion();
+ cacheAccess.removeAll();
}
+
+ private void release() {
+ cacheAccess.unlockRegion( cacheLock );
+ }
}
}
Modified:
core/trunk/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java
===================================================================
---
core/trunk/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -49,7 +49,7 @@
/**
* Defines a query execution plan for a native-SQL query.
- *
+ *
* @author Steve Ebersole
*/
public class NativeSQLQueryPlan implements Serializable {
@@ -95,18 +95,28 @@
}
/**
- * Bind positional parameter values to the <tt>PreparedStatement</tt>
- * (these are parameters specified by a JDBC-style ?).
+ * Perform binding of all the JDBC bind parameter values based on the user-defined
+ * positional query parameters (these are the '?'-style hibernate query
+ * params) into the JDBC {@link PreparedStatement}.
+ *
+ * @param st The prepared statement to which to bind the parameter values.
+ * @param queryParameters The query parameters specified by the application.
+ * @param start JDBC paramer binds are positional, so this is the position
+ * from which to start binding.
+ * @param session The session from which the query originated.
+ *
+ * @return The number of JDBC bind positions accounted for during execution.
+ *
+ * @throws SQLException Some form of JDBC error binding the values.
+ * @throws HibernateException Generally indicates a mapping problem or type mismatch.
*/
- private int bindPositionalParameters(final PreparedStatement st,
- final QueryParameters queryParameters, final int start,
- final SessionImplementor session) throws SQLException,
- HibernateException {
-
- final Object[] values = queryParameters
- .getFilteredPositionalParameterValues();
- final Type[] types = queryParameters
- .getFilteredPositionalParameterTypes();
+ private int bindPositionalParameters(
+ final PreparedStatement st,
+ final QueryParameters queryParameters,
+ final int start,
+ final SessionImplementor session) throws SQLException {
+ final Object[] values = queryParameters.getFilteredPositionalParameterValues();
+ final Type[] types = queryParameters.getFilteredPositionalParameterTypes();
int span = 0;
for (int i = 0; i < values.length; i++) {
types[i].nullSafeSet( st, values[i], start + span, session );
@@ -116,15 +126,25 @@
}
/**
- * Bind named parameters to the <tt>PreparedStatement</tt>. This has an
- * empty implementation on this superclass and should be implemented by
- * subclasses (queries) which allow named parameters.
+ * Perform binding of all the JDBC bind parameter values based on the user-defined
+ * named query parameters into the JDBC {@link PreparedStatement}.
+ *
+ * @param ps The prepared statement to which to bind the parameter values.
+ * @param namedParams The named query parameters specified by the application.
+ * @param start JDBC paramer binds are positional, so this is the position
+ * from which to start binding.
+ * @param session The session from which the query originated.
+ *
+ * @return The number of JDBC bind positions accounted for during execution.
+ *
+ * @throws SQLException Some form of JDBC error binding the values.
+ * @throws HibernateException Generally indicates a mapping problem or type mismatch.
*/
- private int bindNamedParameters(final PreparedStatement ps,
- final Map namedParams, final int start,
- final SessionImplementor session) throws SQLException,
- HibernateException {
-
+ private int bindNamedParameters(
+ final PreparedStatement ps,
+ final Map namedParams,
+ final int start,
+ final SessionImplementor session) throws SQLException {
if ( namedParams != null ) {
// assumes that types are all of span 1
Iterator iter = namedParams.entrySet().iterator();
@@ -155,22 +175,23 @@
protected void coordinateSharedCacheCleanup(SessionImplementor session) {
BulkOperationCleanupAction action = new BulkOperationCleanupAction( session,
getCustomQuery().getQuerySpaces() );
- action.init();
-
if ( session.isEventSource() ) {
( ( EventSource ) session ).getActionQueue().addAction( action );
}
+ else {
+ action.afterTransactionCompletion( true );
+ }
}
public int performExecuteUpdate(QueryParameters queryParameters,
SessionImplementor session) throws HibernateException {
-
+
coordinateSharedCacheCleanup( session );
-
+
if(queryParameters.isCallable()) {
throw new IllegalArgumentException("callable not yet supported for native
queries");
}
-
+
int result = 0;
PreparedStatement ps;
try {
@@ -191,8 +212,8 @@
finally {
if ( ps != null ) {
session.getBatcher().closeStatement( ps );
- }
- }
+ }
+ }
}
catch (SQLException sqle) {
throw JDBCExceptionHelper.convert( session.getFactory()
@@ -202,5 +223,5 @@
return result;
}
-
+
}
Modified:
core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
===================================================================
---
core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-07-13
16:03:20 UTC (rev 17083)
+++
core/trunk/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2009-07-13
23:33:02 UTC (rev 17084)
@@ -240,11 +240,12 @@
protected void coordinateSharedCacheCleanup(SessionImplementor session) {
BulkOperationCleanupAction action = new BulkOperationCleanupAction( session,
getAffectedQueryables() );
- action.init();
-
if ( session.isEventSource() ) {
( ( EventSource ) session ).getActionQueue().addAction( action );
}
+ else {
+ action.afterTransactionCompletion( true );
+ }
}
protected boolean shouldIsolateTemporaryTableDDL() {