HHH-19394 optimize cascade processing for CHECK_ON_FLUSH

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java

@@ -84,7 +84,7 @@ public static <T> void cascade(
 			final EntityPersister persister,
 			final Object parent,
 			final T anything) throws HibernateException {
-		if ( persister.hasCascades() || action == CHECK_ON_FLUSH ) { // performance opt
+		if ( action.anythingToCascade( persister ) ) { // performance opt
 			final boolean traceEnabled = LOG.isTraceEnabled();
 			if ( traceEnabled ) {
 				LOG.tracev( "Processing cascade {0} for: {1}", action, persister.getEntityName() );
@@ -118,7 +118,7 @@ public static <T> void cascade(
 								&& !persister.getBytecodeEnhancementMetadata()
 										.isAttributeLoaded( parent, propertyName );
 
-				if ( style.doCascade( action ) ) {
+				if ( action.appliesTo( type, style ) ) {
 					final Object child;
 					if ( isUninitializedProperty  ) {
 						assert enhancedForLazyLoading;
@@ -435,8 +435,9 @@ private static <T> void cascadeComponent(
 		for ( int i = 0; i < types.length; i++ ) {
 			final CascadeStyle componentPropertyStyle = componentType.getCascadeStyle( i );
 			final String subPropertyName = propertyNames[i];
-			if ( componentPropertyStyle.doCascade( action )
-					|| componentPropertyStyle.hasOrphanDelete() && action.deleteOrphans() ) {
+			final Type subPropertyType = types[i];
+			if ( action.appliesTo( subPropertyType, componentPropertyStyle )
+				|| componentPropertyStyle.hasOrphanDelete() && action.deleteOrphans() ) {
 				if ( children == null ) {
 					// Get children on demand.
 					children = componentType.getPropertyValues( child, eventSource );
@@ -448,7 +449,7 @@ private static <T> void cascadeComponent(
 						componentPath,
 						parent,
 						children[i],
-						types[i],
+						subPropertyType,
 						componentPropertyStyle,
 						subPropertyName,
 						anything,

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java

@@ -8,7 +8,9 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.CollectionType;
+import org.hibernate.type.Type;
 
 /**
  * A session action that may be cascaded from parent entity to its children
@@ -60,4 +62,19 @@ Iterator<?> getCascadableChildrenIterator(
 	 * Should this action be performed (or noCascade consulted) in the case of lazy properties.
 	 */
 	boolean performOnLazyProperty();
+
+	/**
+	 * Does this action have any work to do for the entity type with the given persister?
+	 *
+	 * @since 7
+	 */
+	boolean anythingToCascade(EntityPersister persister);
+
+	/**
+	 * Does this action have any work to do for fields of the given type with the given
+	 * cascade style?
+	 *
+	 * @since 7
+	 */
+	boolean appliesTo(Type type, CascadeStyle style);
 }

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java

@@ -17,7 +17,9 @@
 import org.hibernate.event.spi.PersistContext;
 import org.hibernate.event.spi.RefreshContext;
 import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.CollectionType;
+import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
@@ -73,6 +75,11 @@ public boolean deleteOrphans() {
 			return true;
 		}
 
+		@Override
+		public boolean anythingToCascade(EntityPersister persister) {
+			return persister.hasCascadeDelete();
+		}
+
 		@Override
 		public String toString() {
 			return "ACTION_DELETE";
@@ -371,6 +378,21 @@ public Iterator<?> getCascadableChildrenIterator(
 			}
 		}
 
+		@Override
+		public boolean anythingToCascade(EntityPersister persister) {
+			// if the entity has no associations, we can just ignore it
+			return persister.hasToOnes()
+				|| persister.hasOwnedCollections();
+		}
+
+		@Override
+		public boolean appliesTo(Type type, CascadeStyle style) {
+			return super.appliesTo( type, style )
+				// we only care about associations here,
+				// but they can hide inside embeddables
+				&& ( type.isComponentType() || type.isAssociationType() );
+		}
+
 		@Override
 		public boolean deleteOrphans() {
 			return false;
@@ -457,6 +479,18 @@ public abstract static class BaseCascadingAction<T> implements CascadingAction<T
 		public boolean performOnLazyProperty() {
 			return true;
 		}
+
+		@Override
+		public boolean anythingToCascade(EntityPersister persister) {
+			// if the entity has cascade NONE everywhere, we can ignore it
+			// TODO: the persister could track which kinds of cascade it has
+			return persister.hasCascades();
+		}
+
+		@Override
+		public boolean appliesTo(Type type, CascadeStyle style) {
+			return style.doCascade( this );
+		}
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -3754,6 +3754,11 @@ public boolean hasCascades() {
 		return entityMetamodel.hasCascades();
 	}
 
+	@Override
+	public boolean hasToOnes() {
+		return entityMetamodel.hasToOnes();
+	}
+
 	@Override
 	public boolean hasCascadeDelete() {
 		return entityMetamodel.hasCascadeDelete();

hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java

@@ -351,6 +351,16 @@ default boolean hasCascadeDelete() {
 		return hasCascades();
 	}
 
+	/**
+	 * Determine whether this entity has any many-to-one or one-to-one associations.
+	 *
+	 * @return True if the entity has a many-to-one or one-to-one association;
+	 * false otherwise.
+	 *
+	 * @since 7
+	 */
+	boolean hasToOnes();
+
 	/**
 	 * Determine whether this entity has any owned collections.
 	 *

hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java

@@ -127,6 +127,7 @@ public class EntityMetamodel implements Serializable {
 
 	private boolean lazy; //not final because proxy factory creation can fail
 	private final boolean hasCascades;
+	private final boolean hasToOnes;
 	private final boolean hasCascadeDelete;
 	private final boolean mutable;
 	private final boolean isAbstract;
@@ -240,6 +241,7 @@ public EntityMetamodel(
 
 		int tempVersionProperty = NO_VERSION_INDX;
 		boolean foundCascade = false;
+		boolean foundToOne = false;
 		boolean foundCascadeDelete = false;
 		boolean foundCollection = false;
 		boolean foundOwnedCollection = false;
@@ -380,6 +382,9 @@ else if ( !allowMutation ) {
 				foundCascadeDelete = true;
 			}
 
+			if ( indicatesToOne( attribute.getType() ) ) {
+				foundToOne = true;
+			}
 			if ( indicatesCollection( attribute.getType() ) ) {
 				foundCollection = true;
 			}
@@ -414,6 +419,7 @@ else if ( !allowMutation ) {
 		versionGenerator = tempVersionGenerator;
 
 		hasCascades = foundCascade;
+		hasToOnes = foundToOne;
 		hasCascadeDelete = foundCascadeDelete;
 		hasNonIdentifierPropertyNamedId = foundNonIdentifierPropertyNamedId;
 		versionPropertyIndex = tempVersionProperty;
@@ -621,13 +627,26 @@ public Set<String> getSubclassEntityNames() {
 		return subclassEntityNames;
 	}
 
+	private static boolean indicatesToOne(Type type) {
+		if ( type.isEntityType() ) {
+			return true;
+		}
+		else if ( type instanceof CompositeType compositeType ) {
+			for ( Type subtype : compositeType.getSubtypes() ) {
+				if ( indicatesToOne( subtype ) ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	private static boolean indicatesCollection(Type type) {
 		if ( type instanceof CollectionType ) {
 			return true;
 		}
-		else if ( type.isComponentType() ) {
-			Type[] subtypes = ( (CompositeType) type ).getSubtypes();
-			for ( Type subtype : subtypes ) {
+		else if ( type instanceof CompositeType compositeType ) {
+			for ( Type subtype : compositeType.getSubtypes() ) {
 				if ( indicatesCollection( subtype ) ) {
 					return true;
 				}
@@ -640,8 +659,7 @@ private static boolean indicatesOwnedCollection(Type type, MetadataImplementor m
 		if ( type instanceof CollectionType collectionType ) {
 			return !metadata.getCollectionBinding( collectionType.getRole() ).isInverse();
 		}
-		else if ( type.isComponentType() ) {
-			final CompositeType compositeType = (CompositeType) type;
+		else if ( type instanceof CompositeType compositeType ) {
 			for ( Type subtype : compositeType.getSubtypes() ) {
 				if ( indicatesOwnedCollection( subtype, metadata ) ) {
 					return true;
@@ -742,6 +760,10 @@ public boolean hasCascades() {
 		return hasCascades;
 	}
 
+	public boolean hasToOnes() {
+		return hasToOnes;
+	}
+
 	public boolean hasCascadeDelete() {
 		return hasCascadeDelete;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java

@@ -304,6 +304,11 @@ public boolean hasCascades() {
 			return false;
 		}
 
+		@Override
+		public boolean hasToOnes() {
+			return false;
+		}
+
 		@Override
 		public boolean isMutable() {
 			return false;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java

@@ -329,6 +329,11 @@ public boolean hasCascades() {
 			return false;
 		}
 
+		@Override
+		public boolean hasToOnes() {
+			return false;
+		}
+
 		@Override
 		public boolean isMutable() {
 			return false;

hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java

@@ -257,6 +257,11 @@ public boolean hasCascades() {
 		return false;
 	}
 
+	@Override
+	public boolean hasToOnes() {
+		return false;
+	}
+
 	public boolean isMutable() {
 		return true;
 	}