HHH-6858 non-intrusive performance improvements

Sanne · stliu · commit fb0255a87a89 · 2011-11-30T11:39:53.000+08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
@@ -260,7 +260,6 @@ public SynchronizationCallbackCoordinator getSynchronizationCallbackCoordinator(
 	}
 
 	public void pulse() {
-		LOG.trace( "Starting transaction coordinator pulse" );
 		if ( transactionFactory().compatibleWithJtaSynchronization() ) {
 			// the configured transaction strategy says it supports callbacks via JTA synchronization, so attempt to
 			// register JTA synchronization if possible
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -45,7 +45,6 @@
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
-import org.hibernate.event.service.spi.EventListenerGroup;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.EventType;
@@ -213,6 +212,12 @@ private void flushEntities(FlushEvent event) throws HibernateException {
 		// It is safe because of how IdentityMap implements entrySet()
 
 		final EventSource source = event.getSession();
+		final Iterable<FlushEntityEventListener> flushListeners = source
+				.getFactory()
+				.getServiceRegistry()
+				.getService( EventListenerRegistry.class )
+				.getEventListenerGroup( EventType.FLUSH_ENTITY )
+				.listeners();
 
 		final Map.Entry[] list = IdentityMap.concurrentEntries( source.getPersistenceContext().getEntityEntries() );
 		final int size = list.length;
@@ -226,12 +231,7 @@ private void flushEntities(FlushEvent event) throws HibernateException {
 
 			if ( status != Status.LOADING && status != Status.GONE ) {
 				final FlushEntityEvent entityEvent = new FlushEntityEvent( source, me.getKey(), entry );
-				final EventListenerGroup<FlushEntityEventListener> listenerGroup = source
-						.getFactory()
-						.getServiceRegistry()
-						.getService( EventListenerRegistry.class )
-						.getEventListenerGroup( EventType.FLUSH_ENTITY );
-				for ( FlushEntityEventListener listener : listenerGroup.listeners() ) {
+				for ( FlushEntityEventListener listener : flushListeners ) {
 					listener.onFlushEntity( entityEvent );
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -77,7 +77,6 @@
 import org.hibernate.UnresolvableObjectException;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.internal.StatefulPersistenceContext;
-import org.hibernate.engine.jdbc.LobCreationContext;
 import org.hibernate.engine.jdbc.LobCreator;
 import org.hibernate.engine.query.spi.FilterQueryPlan;
 import org.hibernate.engine.query.spi.HQLQueryPlan;
@@ -94,7 +93,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
-import org.hibernate.engine.transaction.spi.TransactionContext;
 import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.engine.transaction.spi.TransactionImplementor;
 import org.hibernate.event.service.spi.EventListenerGroup;
@@ -1078,8 +1076,9 @@ public void flush() throws HibernateException {
 		if ( persistenceContext.getCascadeLevel() > 0 ) {
 			throw new HibernateException("Flush during cascade is dangerous");
 		}
+		FlushEvent flushEvent = new FlushEvent( this );
 		for ( FlushEventListener listener : listeners( EventType.FLUSH ) ) {
-			listener.onFlush( new FlushEvent( this ) );
+			listener.onFlush( flushEvent );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/EqualsHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/EqualsHelper.java
@@ -30,8 +30,8 @@
  */
 public final class EqualsHelper {
 
-	public static boolean equals(Object x, Object y) {
-		return x==y || ( x!=null && y!=null && x.equals(y) );
+	public static boolean equals(final Object x, final Object y) {
+		return x == y || ( x != null && y != null && x.equals( y ) );
 	}
 	
 	private EqualsHelper() {}
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java
@@ -459,6 +459,7 @@ public Object getIdentifier(Object entity, EntityMode entityMode, SessionImpleme
 			final Object[] propertyValues = virtualIdComponent.getPropertyValues( entity, entityMode );
 			final Type[] subTypes = virtualIdComponent.getSubtypes();
 			final Type[] copierSubTypes = mappedIdentifierType.getSubtypes();
+			final Iterable<PersistEventListener> persistEventListeners = persistEventListeners( session );
 			final int length = subTypes.length;
 			for ( int i = 0 ; i < length; i++ ) {
 				if ( propertyValues[i] == null ) {
@@ -484,7 +485,7 @@ public Object getIdentifier(Object entity, EntityMode entityMode, SessionImpleme
 						else {
 							LOG.debug( "Performing implicit derived identity cascade" );
 							final PersistEvent event = new PersistEvent( null, propertyValues[i], (EventSource) session );
-							for ( PersistEventListener listener : persistEventListeners( session ) ) {
+							for ( PersistEventListener listener : persistEventListeners ) {
 								listener.onPersist( event );
 							}
 							pcEntry = session.getPersistenceContext().getEntry( propertyValues[i] );

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,6 @@ public SynchronizationCallbackCoordinator getSynchronizationCallbackCoordinator(`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`public void pulse() {`
`263`		`- LOG.trace( "Starting transaction coordinator pulse" );`
`264`	`263`	`if ( transactionFactory().compatibleWithJtaSynchronization() ) {`
`265`	`264`	`// the configured transaction strategy says it supports callbacks via JTA synchronization, so attempt to`
`266`	`265`	`// register JTA synchronization if possible`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@`
`30`	`30`	`*/`
`31`	`31`	`public final class EqualsHelper {`
`32`	`32`
`33`		`- public static boolean equals(Object x, Object y) {`
`34`		`- return x==y \|\| ( x!=null && y!=null && x.equals(y) );`
	`33`	`+ public static boolean equals(final Object x, final Object y) {`
	`34`	`+ return x == y \|\| ( x != null && y != null && x.equals( y ) );`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private EqualsHelper() {}`