HHH-19394 add an optimization to short-circuit cascade PERSIST

Author: gavinking

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

@@ -283,6 +283,11 @@ public boolean performOnLazyProperty() {
 			return false;
 		}
 
+		@Override
+		public boolean anythingToCascade(EntityPersister persister) {
+			return persister.hasCascadePersist();
+		}
+
 		@Override
 		public String toString() {
 			return "ACTION_PERSIST";
@@ -326,6 +331,11 @@ public boolean performOnLazyProperty() {
 			return false;
 		}
 
+		@Override
+		public boolean anythingToCascade(EntityPersister persister) {
+			return persister.hasCascadePersist();
+		}
+
 		@Override
 		public String toString() {
 			return "ACTION_PERSIST_ON_FLUSH";
@@ -380,13 +390,19 @@ public Iterator<?> getCascadableChildrenIterator(
 
 		@Override
 		public boolean anythingToCascade(EntityPersister persister) {
+			// Must override the implementation from the superclass
+			// because transient checking happens even for entities
+			// with cascade NONE on all associations
 			// if the entity has no associations, we can just ignore it
 			return persister.hasToOnes()
 				|| persister.hasOwnedCollections();
 		}
 
 		@Override
 		public boolean appliesTo(Type type, CascadeStyle style) {
+			// Very important to override the implementation from
+			// the superclass, because CHECK_ON_FLUSH is the only
+			// style that executes for fields with cascade NONE
 			return super.appliesTo( type, style )
 				// we only care about associations here,
 				// but they can hide inside embeddables

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

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

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

@@ -337,24 +337,30 @@ default void visitQuerySpaces(Consumer<String> querySpaceConsumer) {
 
 	/**
 	 * Determine whether this entity has any
-	 * (non-{@linkplain org.hibernate.engine.spi.CascadeStyles#NONE none}) cascading.
+	 * {@linkplain org.hibernate.engine.spi.CascadeStyles#NONE cascading} operations.
 	 *
 	 * @return True if the entity has any properties with a cascade other than NONE;
 	 *         false otherwise (aka, no cascading).
 	 */
 	boolean hasCascades();
 
+	/**
+	 * Determine whether this entity has any
+	 * {@linkplain org.hibernate.engine.spi.CascadeStyles#PERSIST persist cascading}.
+	 *
+	 * @return True if the entity has any properties with a cascade PERSIST or ALL;
+	 *         false otherwise.
+	 */
+	boolean hasCascadePersist();
+
 	/**
 	 * Determine whether this entity has any
 	 * {@linkplain org.hibernate.engine.spi.CascadeStyles#DELETE delete cascading}.
 	 *
-	 * @return True if the entity has any properties with a cascade other than NONE;
+	 * @return True if the entity has any properties with a cascade REMOVE or ALL;
 	 *         false otherwise.
 	 */
-	default boolean hasCascadeDelete() {
-		//bad default implementation for compatibility
-		return hasCascades();
-	}
+	boolean hasCascadeDelete();
 
 	/**
 	 * Determine whether this entity has any many-to-one or one-to-one associations.
@@ -372,10 +378,7 @@ default boolean hasCascadeDelete() {
 	 * @return True if the entity has an owned collection;
 	 * false otherwise.
 	 */
-	default boolean hasOwnedCollections() {
-		//bad default implementation for compatibility
-		return hasCollections();
-	}
+	boolean hasOwnedCollections();
 
 	/**
 	 * Determine whether instances of this entity are considered mutable.

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

@@ -128,6 +128,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 hasCascadePersist;
 	private final boolean hasCascadeDelete;
 	private final boolean mutable;
 	private final boolean isAbstract;
@@ -242,6 +243,7 @@ public EntityMetamodel(
 		int tempVersionProperty = NO_VERSION_INDX;
 		boolean foundCascade = false;
 		boolean foundToOne = false;
+		boolean foundCascadePersist = false;
 		boolean foundCascadeDelete = false;
 		boolean foundCollection = false;
 		boolean foundOwnedCollection = false;
@@ -378,6 +380,10 @@ else if ( !allowMutation ) {
 			if ( cascadeStyles[i] != CascadeStyles.NONE ) {
 				foundCascade = true;
 			}
+			if ( cascadeStyles[i].doCascade(CascadingActions.PERSIST)
+					|| cascadeStyles[i].doCascade(CascadingActions.PERSIST_ON_FLUSH) ) {
+				foundCascadePersist = true;
+			}
 			if ( cascadeStyles[i].doCascade(CascadingActions.REMOVE) ) {
 				foundCascadeDelete = true;
 			}
@@ -420,6 +426,7 @@ else if ( !allowMutation ) {
 
 		hasCascades = foundCascade;
 		hasToOnes = foundToOne;
+		hasCascadePersist = foundCascadePersist;
 		hasCascadeDelete = foundCascadeDelete;
 		hasNonIdentifierPropertyNamedId = foundNonIdentifierPropertyNamedId;
 		versionPropertyIndex = tempVersionProperty;
@@ -768,6 +775,10 @@ public boolean hasCascadeDelete() {
 		return hasCascadeDelete;
 	}
 
+	public boolean hasCascadePersist() {
+		return hasCascadePersist;
+	}
+
 	public boolean isMutable() {
 		return mutable;
 	}

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

@@ -304,11 +304,26 @@ public boolean hasCascades() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCascadeDelete() {
+			return false;
+		}
+
 		@Override
 		public boolean hasToOnes() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCascadePersist() {
+			return false;
+		}
+
+		@Override
+		public boolean hasOwnedCollections() {
+			return false;
+		}
+
 		@Override
 		public boolean isMutable() {
 			return false;

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

@@ -329,11 +329,26 @@ public boolean hasCascades() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCascadeDelete() {
+			return false;
+		}
+
 		@Override
 		public boolean hasToOnes() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCascadePersist() {
+			return false;
+		}
+
+		@Override
+		public boolean hasOwnedCollections() {
+			return false;
+		}
+
 		@Override
 		public boolean isMutable() {
 			return false;

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

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