HHH-19774 - Automatic flushing for child session with shared connection/tx

HHH-19808 - Automatic closing for child session with shared connection/tx

Author: sebersole

hibernate-core/src/main/java/org/hibernate/engine/creation/internal/ParentSessionObserver.java

@@ -22,9 +22,6 @@ public interface ParentSessionObserver {
 
 	/**
 	 * Callback when the parent is closed.  Used to close the child session.
-	 *
-	 * @apiNote Observation of closure of the parent is different from {@link org.hibernate.SessionBuilder#autoClose}
-	 * which indicates whether the session ought to be closed in response to transaction completion.
 	 */
 	void onParentClose();
 }

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java

@@ -24,38 +24,40 @@ public class DefaultFlushEventListener extends AbstractFlushingEventListener imp
 	 */
 	public void onFlush(FlushEvent event) throws HibernateException {
 		final var source = event.getSession();
-		final var persistenceContext = source.getPersistenceContextInternal();
+
 		final var eventMonitor = source.getEventMonitor();
-		if ( persistenceContext.getNumberOfManagedEntities() > 0
-				|| persistenceContext.getCollectionEntriesSize() > 0 ) {
-			EVENT_LISTENER_LOGGER.executingFlush();
-			final var flushEvent = eventMonitor.beginFlushEvent();
-			final var eventListenerManager = source.getEventListenerManager();
-			try {
-				eventListenerManager.flushStart();
+		final var flushEvent = eventMonitor.beginFlushEvent();
+
+		final var eventListenerManager = source.getEventListenerManager();
+		eventListenerManager.flushStart();
+
+		try {
+			final var persistenceContext = source.getPersistenceContextInternal();
+			if ( persistenceContext.getNumberOfManagedEntities() > 0
+					|| persistenceContext.getCollectionEntriesSize() > 0 ) {
+				EVENT_LISTENER_LOGGER.executingFlush();
 				flushEverythingToExecutions( event );
 				performExecutions( source );
 				postFlush( source );
-			}
-			finally {
-				eventMonitor.completeFlushEvent( flushEvent, event );
-				eventListenerManager.flushEnd(
-						event.getNumberOfEntitiesProcessed(),
-						event.getNumberOfCollectionsProcessed()
-				);
-			}
-
-			postPostFlush( source );
+				postPostFlush( source );
 
-			final var statistics = source.getFactory().getStatistics();
-			if ( statistics.isStatisticsEnabled() ) {
-				statistics.flush();
+				final var statistics = source.getFactory().getStatistics();
+				if ( statistics.isStatisticsEnabled() ) {
+					statistics.flush();
+				}
+			}
+			else if ( source.getActionQueue().hasAnyQueuedActions() ) {
+				EVENT_LISTENER_LOGGER.executingFlush();
+				// execute any queued unloaded-entity deletions
+				performExecutions( source );
 			}
 		}
-		else if ( source.getActionQueue().hasAnyQueuedActions() ) {
-			EVENT_LISTENER_LOGGER.executingFlush();
-			// execute any queued unloaded-entity deletions
-			performExecutions( source );
+		finally {
+			eventMonitor.completeFlushEvent( flushEvent, event );
+			eventListenerManager.flushEnd(
+					event.getNumberOfEntitiesProcessed(),
+					event.getNumberOfCollectionsProcessed()
+			);
 		}
 	}
 }

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -233,10 +233,7 @@ public void onParentFlush() {
 
 				@Override
 				public void onParentClose() {
-					// unless explicitly disabled, propagate the closure
-					if ( sharedOptions.shouldAutoClose() ) {
-						propagateClose();
-					}
+					propagateClose();
 				}
 			} );
 		}

hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java

@@ -184,79 +184,69 @@ void testClosePropagation(SessionFactoryScope factoryScope) {
 	 */
 	@Test
 	void testAutoFlushStatefulChild(SessionFactoryScope factoryScope) {
-		final var sqlCollector = factoryScope.getCollectingStatementInspector();
-		sqlCollector.clear();
-
-		factoryScope.inTransaction( (parentSession) -> {
-			try (SessionImplementor childSession = (SessionImplementor) parentSession
-					.sessionWithOptions()
-					.connection()
-					.openSession()) {
-				// persist an entity through the child session -
-				// should be auto flushed (technically as part of the try-with-resources close of the child session)
-				childSession.persist( new Something( 1, "first" ) );
-			}
-		} );
-
-		// make sure the flush and insert happened
-		assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
-		factoryScope.inTransaction( (session) -> {
-			final Something created = session.find( Something.class, 1 );
-			assertThat( created ).isNotNull();
-		} );
-
-	}
+		final MutableObject<SharedSessionContractImplementor> parentSessionRef = new MutableObject<>();
+		final MutableObject<SharedSessionContractImplementor> childSessionRef = new MutableObject<>();
 
-	/**
-	 * NOTE: builds on assertions from {@link #testConnectionAndTransactionSharing}
-	 * and {@linkplain #testClosePropagation}
-	 */
-	@Test
-	void testAutoFlushStatefulChildNoClose(SessionFactoryScope factoryScope) {
 		final var sqlCollector = factoryScope.getCollectingStatementInspector();
 		sqlCollector.clear();
 
 		factoryScope.inTransaction( (parentSession) -> {
-			SessionImplementor childSession = (SessionImplementor) parentSession
+			parentSessionRef.set(  parentSession );
+
+			// IMPORTANT: it is important that the child session not be closed here (e.g. try-with-resources).
+			final SessionImplementor childSession = (SessionImplementor) parentSession
 					.sessionWithOptions()
 					.connection()
 					.openSession();
+			childSessionRef.set( childSession );
 
-			// persist an entity through the shared/child session.
-			// then make sure the auto-flush of the parent session
-			// propagates to the shared/child
+			// persist an entity through the child session - should be auto flushed as part of the
+			// parent session's flush cycle
 			childSession.persist( new Something( 1, "first" ) );
 		} );
 
+		assertThat( parentSessionRef.get().isClosed() ).isTrue();
+		assertThat( childSessionRef.get().isClosed() ).isTrue();
+
 		// make sure the flush and insert happened
 		assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
 		factoryScope.inTransaction( (session) -> {
 			final Something created = session.find( Something.class, 1 );
 			assertThat( created ).isNotNull();
 		} );
-	}
 
+	}
 
 
 	/**
 	 * NOTE: builds on assertions from {@link #testConnectionAndTransactionSharing}
 	 */
 	@Test
 	void testAutoFlushStatelessChild(SessionFactoryScope factoryScope) {
+		final MutableObject<SharedSessionContractImplementor> parentSessionRef = new MutableObject<>();
+		final MutableObject<SharedSessionContractImplementor> childSessionRef = new MutableObject<>();
+
 		final var sqlCollector = factoryScope.getCollectingStatementInspector();
 		sqlCollector.clear();
 
 		factoryScope.inStatelessTransaction( (parentSession) -> {
-			try (SessionImplementor childSession = (SessionImplementor) parentSession
+			parentSessionRef.set( parentSession );
+
+			// IMPORTANT: it is important that the child session not be closed here (e.g. try-with-resources).
+			final var childSession = (SessionImplementor) parentSession
 					.sessionWithOptions()
 					.connection()
-					.openSession()) {
-				// persist an entity through the child session -
-				// should be auto flushed (technically as part of the try-with-resources close of the child session)
-				childSession.persist( new Something( 1, "first" ) );
-			}
+					.openSession();
+			childSessionRef.set( childSession );
+
+			// persist an entity through the child session - should be auto flushed as part of the
+			// parent session's flush cycle
+			childSession.persist( new Something( 1, "first" ) );
 		} );
 
+		assertThat( parentSessionRef.get().isClosed() ).isTrue();
+		assertThat( childSessionRef.get().isClosed() ).isTrue();
+
 		// make sure the flush and insert happened
 		assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
 		factoryScope.inTransaction( (session) -> {