Backport of HHH-16900 to 6.2

hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/EntityMutationOperationGroup.java

@@ -0,0 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.engine.jdbc.mutation.internal;
+
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+public interface EntityMutationOperationGroup extends MutationOperationGroup {
+
+	/**
+	 * The model-part being mutated.
+	 * N.B. it returns a widened type compared to the same method in the super interface.
+	 */
+	@Override
+	EntityMutationTarget getMutationTarget();
+
+	@Override
+	default EntityMutationOperationGroup asEntityMutationOperationGroup() {
+		return this;
+	}
+
+}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsert.java

@@ -60,8 +60,8 @@ public class MutationExecutorPostInsert implements MutationExecutor, JdbcValueBi
 
 	protected final JdbcValueBindingsImpl valueBindings;
 
-	public MutationExecutorPostInsert(MutationOperationGroup mutationOperationGroup, SharedSessionContractImplementor session) {
-		this.mutationTarget = (EntityMutationTarget) mutationOperationGroup.getMutationTarget();
+	public MutationExecutorPostInsert(EntityMutationOperationGroup mutationOperationGroup, SharedSessionContractImplementor session) {
+		this.mutationTarget = mutationOperationGroup.getMutationTarget();
 		this.valueBindings = new JdbcValueBindingsImpl(
 				MutationType.INSERT,
 				mutationTarget,
@@ -70,17 +70,16 @@ public MutationExecutorPostInsert(MutationOperationGroup mutationOperationGroup,
 		);
 		this.mutationOperationGroup = mutationOperationGroup;
 
-		final PreparableMutationOperation identityInsertOperation = mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() );
+		final PreparableMutationOperation identityInsertOperation = (PreparableMutationOperation) mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() );
 		this.identityInsertStatementDetails = ModelMutationHelper.identityPreparation(
 				identityInsertOperation,
 				session
 		);
 
 		List<PreparableMutationOperation> secondaryTableMutations = null;
 
-		final List<MutationOperation> operations = mutationOperationGroup.getOperations();
-		for ( int i = 0; i < operations.size(); i++ ) {
-			final MutationOperation operation = operations.get( i );
+		for ( int i = 0; i < mutationOperationGroup.getNumberOfOperations(); i++ ) {
+			final MutationOperation operation = mutationOperationGroup.getOperation( i );
 
 			if ( operation.getTableDetails().isIdentifierTable() ) {
 				// the identifier table is handled via `identityInsertStatementDetails`

hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsertSingleTable.java

@@ -51,14 +51,14 @@ public class MutationExecutorPostInsertSingleTable implements MutationExecutor,
 	private final JdbcValueBindingsImpl valueBindings;
 
 	public MutationExecutorPostInsertSingleTable(
-			MutationOperationGroup mutationOperationGroup,
+			EntityMutationOperationGroup mutationOperationGroup,
 			SharedSessionContractImplementor session) {
-		this.mutationTarget = (EntityMutationTarget) mutationOperationGroup.getMutationTarget();
+		this.mutationTarget = mutationOperationGroup.getMutationTarget();
 		this.session = session;
 
 		assert mutationOperationGroup.getNumberOfOperations() == 1;
 
-		this.operation = mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() );
+		this.operation = (PreparableMutationOperation) mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() );
 		this.identityInsertStatementDetails = identityPreparation( operation, session );
 
 		this.valueBindings = new JdbcValueBindingsImpl(

hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java

@@ -11,7 +11,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
@@ -23,7 +22,6 @@
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
 import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.PreparableMutationOperation;
@@ -79,12 +77,10 @@ public MutationExecutorStandard(
 		List<PreparableMutationOperation> nonBatchedJdbcMutations = null;
 		List<SelfExecutingUpdateOperation> selfExecutingMutations = null;
 
-		final List<MutationOperation> operations = mutationOperationGroup.getOperations();
-
 		boolean hasAnyNonBatchedJdbcOperations = false;
 
-		for ( int i = operations.size() - 1; i >= 0; i-- ) {
-			final MutationOperation operation = operations.get( i );
+		for ( int i = mutationOperationGroup.getNumberOfOperations() - 1; i >= 0; i-- ) {
+			final MutationOperation operation = mutationOperationGroup.getOperation( i );
 			if ( operation instanceof SelfExecutingUpdateOperation ) {
 				final SelfExecutingUpdateOperation selfExecutingMutation = (SelfExecutingUpdateOperation) operation;
 				if ( selfExecutingMutations == null ) {

hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java

@@ -7,7 +7,6 @@
 package org.hibernate.engine.jdbc.mutation.internal;
 
 import java.util.Map;
-import java.util.function.Supplier;
 
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
@@ -16,11 +15,8 @@
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
-import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.PreparableMutationOperation;
 import org.hibernate.sql.model.SelfExecutingUpdateOperation;
@@ -58,18 +54,15 @@ public MutationExecutor createExecutor(
 
 		final int numberOfOperations = operationGroup.getNumberOfOperations();
 		final MutationType mutationType = operationGroup.getMutationType();
-		final MutationTarget<?> mutationTarget = operationGroup.getMutationTarget();
+		final EntityMutationOperationGroup entityMutationOperationGroup = operationGroup.asEntityMutationOperationGroup();
 
 		if ( mutationType == MutationType.INSERT
-				&& mutationTarget instanceof EntityMutationTarget
-				&& ( (EntityMutationTarget) mutationTarget ).getIdentityInsertDelegate() != null ) {
-			assert mutationTarget instanceof EntityMappingType;
-
+				&& entityMutationOperationGroup != null
+				&& entityMutationOperationGroup.getMutationTarget().getIdentityInsertDelegate() != null ) {
 			if ( numberOfOperations > 1 ) {
-				return new MutationExecutorPostInsert( operationGroup, session );
+				return new MutationExecutorPostInsert( entityMutationOperationGroup, session );
 			}
-
-			return new MutationExecutorPostInsertSingleTable( operationGroup, session );
+			return new MutationExecutorPostInsertSingleTable( entityMutationOperationGroup, session );
 		}
 
 		if ( numberOfOperations == 1 ) {

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java

@@ -27,6 +27,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.mutation.CollectionMutationTarget;
 import org.hibernate.persister.entity.PropertyMapping;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.FromClauseAccess;

hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java

@@ -20,6 +20,7 @@
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.sql.model.internal.MutationOperationGroupFactory;
 import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -74,7 +75,6 @@
 import org.hibernate.sql.model.ast.RestrictedTableMutation;
 import org.hibernate.sql.model.ast.TableUpdate;
 import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
-import org.hibernate.sql.model.internal.MutationOperationGroupSingle;
 import org.hibernate.sql.model.internal.TableUpdateStandard;
 import org.hibernate.sql.model.jdbc.JdbcDeleteMutation;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
@@ -228,7 +228,7 @@ && hasIndex()
 
 		final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor(
 				() -> new BasicBatchKey( getNavigableRole() + "#INDEX" ),
-				new MutationOperationGroupSingle( MutationType.UPDATE, this, updateRowOperation ),
+				MutationOperationGroupFactory.singleOperation( MutationType.UPDATE, this, updateRowOperation ),
 				session
 		);
 

hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java

@@ -12,13 +12,14 @@
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.sql.model.internal.MutationOperationGroupFactory;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
-import org.hibernate.sql.model.internal.MutationOperationGroupSingle;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
@@ -34,7 +35,7 @@ public class DeleteRowsCoordinatorStandard implements DeleteRowsCoordinator {
 	private final BasicBatchKey batchKey;
 	private final MutationExecutorService mutationExecutorService;
 
-	private MutationOperationGroupSingle operationGroup;
+	private MutationOperationGroup operationGroup;
 
 	public DeleteRowsCoordinatorStandard(
 			CollectionMutationTarget mutationTarget,
@@ -113,11 +114,11 @@ public void deleteRows(PersistentCollection<?> collection, Object key, SharedSes
 		}
 	}
 
-	private MutationOperationGroupSingle createOperationGroup() {
+	private MutationOperationGroup createOperationGroup() {
 		assert mutationTarget.getTargetPart() != null;
 		assert mutationTarget.getTargetPart().getKeyDescriptor() != null;
 
 		final JdbcMutationOperation operation = rowMutationOperations.getDeleteRowOperation();
-		return new MutationOperationGroupSingle( MutationType.DELETE, mutationTarget, operation );
+		return MutationOperationGroupFactory.singleOperation( MutationType.DELETE, mutationTarget, operation );
 	}
 }

hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorTablePerSubclass.java

@@ -7,12 +7,11 @@
 package org.hibernate.persister.collection.mutation;
 
 import java.util.Iterator;
-import java.util.function.Supplier;
 
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
-import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.sql.model.internal.MutationOperationGroupFactory;
 import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.EntityEntry;
@@ -22,8 +21,8 @@
 import org.hibernate.persister.collection.OneToManyPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
-import org.hibernate.sql.model.internal.MutationOperationGroupSingle;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
@@ -135,7 +134,7 @@ private SubclassEntry getSubclassEntry(EntityPersister elementPersister) {
 		);
 	}
 
-	private MutationOperationGroupSingle createOperationGroup(EntityPersister elementPersister) {
+	private MutationOperationGroup createOperationGroup(EntityPersister elementPersister) {
 		assert mutationTarget.getTargetPart() != null;
 		assert mutationTarget.getTargetPart().getKeyDescriptor() != null;
 
@@ -153,16 +152,16 @@ private MutationOperationGroupSingle createOperationGroup(EntityPersister elemen
 						collectionTableMapping.getDeleteRowDetails()
 				)
 		);
-		return new MutationOperationGroupSingle( MutationType.DELETE, mutationTarget, operation );
+		return MutationOperationGroupFactory.singleOperation( MutationType.DELETE, mutationTarget, operation );
 	}
 
 	private static class SubclassEntry {
 
 		private final BatchKeyAccess batchKeySupplier;
 
-		private final MutationOperationGroupSingle operationGroup;
+		private final MutationOperationGroup operationGroup;
 
-		public SubclassEntry(BatchKeyAccess batchKeySupplier, MutationOperationGroupSingle operationGroup) {
+		public SubclassEntry(BatchKeyAccess batchKeySupplier, MutationOperationGroup operationGroup) {
 			this.batchKeySupplier = batchKeySupplier;
 			this.operationGroup = operationGroup;
 		}

hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java

@@ -12,13 +12,14 @@
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.sql.model.internal.MutationOperationGroupFactory;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
-import org.hibernate.sql.model.internal.MutationOperationGroupSingle;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
@@ -33,7 +34,7 @@ public class InsertRowsCoordinatorStandard implements InsertRowsCoordinator {
 	private final BasicBatchKey batchKey;
 	private final MutationExecutorService mutationExecutorService;
 
-	private MutationOperationGroupSingle operationGroup;
+	private MutationOperationGroup operationGroup;
 
 	public InsertRowsCoordinatorStandard(
 			CollectionMutationTarget mutationTarget,
@@ -127,11 +128,11 @@ public void insertRows(
 		}
 	}
 
-	private MutationOperationGroupSingle createOperationGroup() {
+	private MutationOperationGroup createOperationGroup() {
 		assert mutationTarget.getTargetPart() != null;
 		assert mutationTarget.getTargetPart().getKeyDescriptor() != null;
 
 		final JdbcMutationOperation operation = rowMutationOperations.getInsertRowOperation();
-		return new MutationOperationGroupSingle( MutationType.INSERT, mutationTarget, operation );
+		return MutationOperationGroupFactory.singleOperation( MutationType.INSERT, mutationTarget, operation );
 	}
 }

hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorTablePerSubclass.java

@@ -11,6 +11,7 @@
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.sql.model.internal.MutationOperationGroupFactory;
 import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.EntityEntry;
@@ -20,8 +21,8 @@
 import org.hibernate.persister.collection.OneToManyPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
-import org.hibernate.sql.model.internal.MutationOperationGroupSingle;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
@@ -42,7 +43,10 @@ public InsertRowsCoordinatorTablePerSubclass(
 			ServiceRegistry serviceRegistry) {
 		this.mutationTarget = mutationTarget;
 		this.rowMutationOperations = rowMutationOperations;
-		this.subclassEntries = new SubclassEntry[mutationTarget.getElementPersister().getRootEntityDescriptor().getSubclassEntityNames().size()];
+		this.subclassEntries = new SubclassEntry[mutationTarget.getElementPersister()
+				.getRootEntityDescriptor()
+				.getSubclassEntityNames()
+				.size()];
 		this.mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
 	}
 
@@ -153,7 +157,7 @@ private SubclassEntry getSubclassEntry(EntityPersister elementPersister) {
 		);
 	}
 
-	private MutationOperationGroupSingle createOperationGroup(EntityPersister elementPersister) {
+	private MutationOperationGroup createOperationGroup(EntityPersister elementPersister) {
 		assert mutationTarget.getTargetPart() != null;
 		assert mutationTarget.getTargetPart().getKeyDescriptor() != null;
 
@@ -171,16 +175,16 @@ private MutationOperationGroupSingle createOperationGroup(EntityPersister elemen
 						collectionTableMapping.getDeleteRowDetails()
 				)
 		);
-		return new MutationOperationGroupSingle( MutationType.INSERT, mutationTarget, operation );
+		return MutationOperationGroupFactory.singleOperation( MutationType.INSERT, mutationTarget, operation );
 	}
 
 	private static class SubclassEntry {
 
 		private final BatchKeyAccess batchKeySupplier;
 
-		private final MutationOperationGroupSingle operationGroup;
+		private final MutationOperationGroup operationGroup;
 
-		public SubclassEntry(BatchKeyAccess batchKeySupplier, MutationOperationGroupSingle operationGroup) {
+		public SubclassEntry(BatchKeyAccess batchKeySupplier, MutationOperationGroup operationGroup) {
 			this.batchKeySupplier = batchKeySupplier;
 			this.operationGroup = operationGroup;
 		}