HHH-5823 - Poor multithread performance in UpdateTimestampsCache class

hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java

@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
  * indicated by the @author tags or express copyright attribution
  * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * distributed under license by Red Hat Inc.
  *
  * This copyrighted material is made available to anyone wishing to use, modify,
  * copy, or redistribute it subject to the terms and conditions of the GNU
@@ -20,14 +20,13 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.cache;
 
 import java.io.Serializable;
-import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,6 +48,7 @@ public class UpdateTimestampsCache {
 	public static final String REGION_NAME = UpdateTimestampsCache.class.getName();
 	private static final Logger log = LoggerFactory.getLogger( UpdateTimestampsCache.class );
 
+	private ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock();
 	private final TimestampsRegion region;
 
 	public UpdateTimestampsCache(Settings settings, Properties props) throws HibernateException {
@@ -58,38 +58,58 @@ public class UpdateTimestampsCache {
 		this.region = settings.getRegionFactory().buildTimestampsRegion( regionName, props );
 	}
 
-	public synchronized void preinvalidate(Serializable[] spaces) throws CacheException {
+	@SuppressWarnings({"UnnecessaryBoxing"})
+	public void preinvalidate(Serializable[] spaces) throws CacheException {
 		// TODO: to handle concurrent writes correctly, this should return a Lock to the client
+
+		readWriteLock.writeLock().lock();
+
+		try {
 			Long ts = new Long( region.nextTimestamp() + region.getTimeout() );
-		for ( int i=0; i<spaces.length; i++ ) {
+			for ( Serializable space : spaces ) {
 				if ( log.isDebugEnabled() ) {
-				log.debug( "Pre-invalidating space [" + spaces[i] + "]" );
+					log.debug( "Pre-invalidating space [" + space + "]" );
 				}
 				//put() has nowait semantics, is this really appropriate?
 				//note that it needs to be async replication, never local or sync
-			region.put( spaces[i], ts );
+				region.put( space, ts );
 			}
 			//TODO: return new Lock(ts);
 		}
+		finally {
+			readWriteLock.writeLock().unlock();
+		}
+	}
 
-	 public synchronized void invalidate(Serializable[] spaces) throws CacheException {
+	 @SuppressWarnings({"UnnecessaryBoxing"})
+	 public void invalidate(Serializable[] spaces) throws CacheException {
 		//TODO: to handle concurrent writes correctly, the client should pass in a Lock
+
+		 readWriteLock.writeLock().lock();
+
+		 try {
 			Long ts = new Long( region.nextTimestamp() );
 			//TODO: if lock.getTimestamp().equals(ts)
-		for ( int i=0; i<spaces.length; i++ ) {
+			 for (Serializable space : spaces) {
 				 if (log.isDebugEnabled()) {
-				log.debug( "Invalidating space [" + spaces[i] + "], timestamp: " + ts);
+					 log.debug( "Invalidating space [" + space + "], timestamp: " + ts );
 				 }
 				 //put() has nowait semantics, is this really appropriate?
 				 //note that it needs to be async replication, never local or sync
-			region.put( spaces[i], ts );
+				 region.put( space, ts );
+			 }
+		 }
+		 finally {
+			 readWriteLock.writeLock().unlock();
 		 }
 	}
 
-	public synchronized boolean isUpToDate(Set spaces, Long timestamp) throws HibernateException {
+	@SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
-		Iterator iter = spaces.iterator();
+	public boolean isUpToDate(Set spaces, Long timestamp) throws HibernateException {
-		while ( iter.hasNext() ) {
+		readWriteLock.readLock().lock();
-			Serializable space = (Serializable) iter.next();
+
+		try {
+			for ( Serializable space : (Set<Serializable>) spaces ) {
 				Long lastUpdate = (Long) region.get( space );
 				if ( lastUpdate == null ) {
 					//the last update timestamp was lost from the cache
@@ -108,6 +128,10 @@ public class UpdateTimestampsCache {
 			}
 			return true;
 		}
+		finally {
+			readWriteLock.readLock().unlock();
+		}
+	}
 
 	public void clear() throws CacheException {
 		region.evictAll();
@@ -127,7 +151,7 @@ public class UpdateTimestampsCache {
 	}
 	
 	public String toString() {
-		return "UpdateTimestampeCache";
+		return "UpdateTimestampCache";
 	}
 
 }