Rework multi-table handling and non-select query plan code to allow caching and help Hibernate Reactive

Author: beikov

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java

@@ -47,7 +47,6 @@
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
-import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 
@@ -100,32 +99,6 @@ else if ( modelPart instanceof EmbeddedAttributeMapping ) {
 		);
 	}
 
-	public static void cleanUpCollectionTables(
-			EntityMappingType entityDescriptor,
-			BiFunction<TableReference, PluralAttributeMapping, Predicate> restrictionProducer,
-			JdbcParameterBindings jdbcParameterBindings,
-			ExecutionContext executionContext) {
-		visitCollectionTableDeletes(
-				entityDescriptor,
-				restrictionProducer,
-				jdbcParameterBindings,
-				executionContext.getQueryOptions(),
-				jdbcMutation -> {
-					executionContext.getSession().getFactory().getJdbcServices().getJdbcMutationExecutor().execute(
-							jdbcMutation,
-							jdbcParameterBindings,
-							sql -> executionContext.getSession()
-									.getJdbcCoordinator()
-									.getStatementPreparer()
-									.prepareStatement( sql ),
-							(integer, preparedStatement) -> {
-							},
-							executionContext
-					);
-				}
-		);
-	}
-
 	public static void visitCollectionTableDeletes(
 			EntityMappingType entityDescriptor,
 			BiFunction<TableReference, PluralAttributeMapping, Predicate> restrictionProducer,
@@ -139,7 +112,7 @@ public static void visitCollectionTableDeletes(
 		entityDescriptor.visitSubTypeAttributeMappings(
 				attributeMapping -> {
 					if ( attributeMapping instanceof PluralAttributeMapping ) {
-						cleanUpCollectionTable(
+						visitCollectionTableDeletes(
 								(PluralAttributeMapping) attributeMapping,
 								restrictionProducer,
 								jdbcParameterBindings,
@@ -148,7 +121,7 @@ public static void visitCollectionTableDeletes(
 						);
 					}
 					else if ( attributeMapping instanceof EmbeddedAttributeMapping ) {
-						cleanUpCollectionTables(
+						visitCollectionTableDeletes(
 								(EmbeddedAttributeMapping) attributeMapping,
 								restrictionProducer,
 								jdbcParameterBindings,
@@ -160,7 +133,7 @@ else if ( attributeMapping instanceof EmbeddedAttributeMapping ) {
 		);
 	}
 
-	private static void cleanUpCollectionTables(
+	private static void visitCollectionTableDeletes(
 			EmbeddedAttributeMapping attributeMapping,
 			BiFunction<TableReference, PluralAttributeMapping, Predicate> restrictionProducer,
 			JdbcParameterBindings jdbcParameterBindings,
@@ -169,7 +142,7 @@ private static void cleanUpCollectionTables(
 		attributeMapping.visitSubParts(
 				modelPart -> {
 					if ( modelPart instanceof PluralAttributeMapping ) {
-						cleanUpCollectionTable(
+						visitCollectionTableDeletes(
 								(PluralAttributeMapping) modelPart,
 								restrictionProducer,
 								jdbcParameterBindings,
@@ -178,7 +151,7 @@ private static void cleanUpCollectionTables(
 						);
 					}
 					else if ( modelPart instanceof EmbeddedAttributeMapping ) {
-						cleanUpCollectionTables(
+						visitCollectionTableDeletes(
 								(EmbeddedAttributeMapping) modelPart,
 								restrictionProducer,
 								jdbcParameterBindings,
@@ -191,7 +164,7 @@ else if ( modelPart instanceof EmbeddedAttributeMapping ) {
 		);
 	}
 
-	private static void cleanUpCollectionTable(
+	private static void visitCollectionTableDeletes(
 			PluralAttributeMapping attributeMapping,
 			BiFunction<TableReference, PluralAttributeMapping, Predicate> restrictionProducer,
 			JdbcParameterBindings jdbcParameterBindings,