HHH-19477 ConnectionReleaseMode.AFTER_STATEMENT ineffective due to missing connection release

hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java

@@ -14,6 +14,7 @@
 import java.util.function.Function;
 
 import org.hibernate.engine.jdbc.internal.FormatStyle;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
@@ -149,30 +150,32 @@ public static void cleanTemporaryTableRows(
 			TemporaryTableExporter exporter,
 			Function<SharedSessionContractImplementor,String> sessionUidAccess,
 			SharedSessionContractImplementor session) {
+		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
 		PreparedStatement ps = null;
 		try {
 			final String sql = exporter.getSqlTruncateCommand( temporaryTable, sessionUidAccess, session );
 
-			ps = session.getJdbcCoordinator().getStatementPreparer().prepareStatement( sql, false );
+			ps = jdbcCoordinator.getStatementPreparer().prepareStatement( sql, false );
 
 			if ( temporaryTable.getSessionUidColumn() != null ) {
 				final String sessionUid = sessionUidAccess.apply( session );
 				ps.setString( 1, sessionUid );
 			}
 
-			session.getJdbcCoordinator().getResultSetReturn().executeUpdate( ps, sql );
+			jdbcCoordinator.getResultSetReturn().executeUpdate( ps, sql );
 		}
 		catch( Throwable t ) {
 			log.unableToCleanupTemporaryIdTable(t);
 		}
 		finally {
 			if ( ps != null ) {
 				try {
-					session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( ps );
+					jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( ps );
 				}
 				catch( Throwable ignore ) {
 					// ignore
 				}
+				jdbcCoordinator.afterStatementExecution();
 			}
 		}
 	}

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

@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.jdbc.Expectation;
@@ -66,8 +67,10 @@ public TableMapping getMutatingTableDetails() {
 	@Override
 	public void releaseStatement(SharedSessionContractImplementor session) {
 		if ( statement != null ) {
-			session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
+			final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement );
 			statement = null;
+			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java

@@ -106,7 +106,6 @@ public GeneratedValues performMutation(
 				statementDetails.releaseStatement( session );
 			}
 			jdbcValueBindings.afterStatement( statementDetails.getMutatingTableDetails() );
-			session.getJdbcCoordinator().afterStatementExecution();
 		}
 
 		// the insert is complete, select the generated id...

hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java

@@ -153,7 +153,6 @@ public GeneratedValues performMutation(
 				statementDetails.releaseStatement( session );
 			}
 			jdbcValueBindings.afterStatement( statementDetails.getMutatingTableDetails() );
-			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java

@@ -276,22 +276,25 @@ protected void doStaticDelete(
 				session
 		);
 
-		mutationExecutor.execute(
-				entity,
-				null,
-				null,
-				(statementDetails, affectedRowCount, batchPosition) -> identifiedResultsCheck(
-						statementDetails,
-						affectedRowCount,
-						batchPosition,
-						entityPersister(),
-						id,
-						factory()
-				),
-				session
-		);
-
-		mutationExecutor.release();
+		try {
+			mutationExecutor.execute(
+					entity,
+					null,
+					null,
+					(statementDetails, affectedRowCount, batchPosition) -> identifiedResultsCheck(
+							statementDetails,
+							affectedRowCount,
+							batchPosition,
+							entityPersister(),
+							id,
+							factory()
+					),
+					session
+			);
+		}
+		finally {
+			mutationExecutor.release();
+		}
 	}
 
 	protected void applyStaticDeleteTableDetails(

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java

@@ -711,6 +711,7 @@ private ProcedureOutputsImpl buildOutputs() {
 		}
 		catch (SQLException e) {
 			getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
+			getSession().getJdbcCoordinator().afterStatementExecution();
 			throw getSession().getJdbcServices().getSqlExceptionHelper().convert(
 					e,
 					"Error registering CallableStatement parameters",

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java

@@ -147,10 +147,4 @@ protected Output buildFunctionReturn() {
 			return buildResultSetOutput( () -> results );
 		}
 	}
-
-	@Override
-	public void release() {
-		super.release();
-		getResultContext().getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( callableStatement );
-	}
 }

hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java

@@ -16,6 +16,7 @@
 import java.util.function.Supplier;
 
 import org.hibernate.JDBCException;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.event.spi.EventManager;
@@ -147,7 +148,9 @@ public boolean goToNext() {
 
 	@Override
 	public void release() {
-		context.getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( jdbcStatement );
+		final JdbcCoordinator jdbcCoordinator = context.getSession().getJdbcCoordinator();
+		jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( jdbcStatement );
+		jdbcCoordinator.afterStatementExecution();
 	}
 
 	private List<?> extractCurrentResults() {

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java

@@ -115,19 +115,25 @@ private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 
 		final PreparedStatementGroupSingleTable statementGroup = new PreparedStatementGroupSingleTable( upsertDelete, session );
 		final PreparedStatementDetails statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() );
-		final PreparedStatement upsertDeleteStatement = statementDetails.resolveStatement();
-		session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
-
-		bindDeleteKeyValues(
-				jdbcValueBindings,
-				optionalTableUpdate.getParameters(),
-				statementDetails,
-				session
-		);
 
-		final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
-				.executeUpdate( upsertDeleteStatement, statementDetails.getSqlString() );
-		MODEL_MUTATION_LOGGER.tracef( "`%s` rows upsert-deleted from `%s`", rowCount, tableMapping.getTableName() );
+		try {
+			final PreparedStatement upsertDeleteStatement = statementDetails.resolveStatement();
+			session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
+
+			bindDeleteKeyValues(
+					jdbcValueBindings,
+					optionalTableUpdate.getParameters(),
+					statementDetails,
+					session
+			);
+
+			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
+					.executeUpdate( upsertDeleteStatement, statementDetails.getSqlString() );
+			MODEL_MUTATION_LOGGER.tracef( "`%s` rows upsert-deleted from `%s`", rowCount, tableMapping.getTableName() );
+		}
+		finally {
+			statementDetails.releaseStatement( session );
+		}
 	}
 
 	private void bindDeleteKeyValues(
@@ -189,14 +195,19 @@ private void performUpsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 		final PreparedStatementGroupSingleTable statementGroup = new PreparedStatementGroupSingleTable( upsertOperation, session );
 		final PreparedStatementDetails statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() );
 
-		final PreparedStatement updateStatement = statementDetails.resolveStatement();
-		session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
+		try {
+			final PreparedStatement updateStatement = statementDetails.resolveStatement();
+			session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
 
-		jdbcValueBindings.beforeStatement( statementDetails );
+			jdbcValueBindings.beforeStatement( statementDetails );
 
-		final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
-				.executeUpdate( updateStatement, statementDetails.getSqlString() );
+			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
+					.executeUpdate( updateStatement, statementDetails.getSqlString() );
 
-		MODEL_MUTATION_LOGGER.tracef( "`%s` rows upserted into `%s`", rowCount, tableMapping.getTableName() );
+			MODEL_MUTATION_LOGGER.tracef( "`%s` rows upserted into `%s`", rowCount, tableMapping.getTableName() );
+		}
+		finally {
+			statementDetails.releaseStatement( session );
+		}
 	}
 }

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java

@@ -172,13 +172,20 @@ public void performMutation(
 	private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
 		final JdbcDeleteMutation jdbcDelete = createJdbcDelete( session );
 
-		final PreparedStatement deleteStatement = createStatementDetails( jdbcDelete, session );
+		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+		final PreparedStatement deleteStatement = createStatementDetails( jdbcDelete, jdbcCoordinator );
 		session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcDelete.getSqlString() );
 
 		bindKeyValues( jdbcValueBindings, deleteStatement, jdbcDelete, session );
 
-		session.getJdbcCoordinator().getResultSetReturn()
-				.executeUpdate( deleteStatement, jdbcDelete.getSqlString() );
+		try {
+			session.getJdbcCoordinator().getResultSetReturn()
+					.executeUpdate( deleteStatement, jdbcDelete.getSqlString() );
+		}
+		finally {
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( deleteStatement );
+			jdbcCoordinator.afterStatementExecution();
+		}
 	}
 
 	private void bindKeyValues(
@@ -374,12 +381,16 @@ private boolean performUpdate(
 					statementDetails.getSqlString()
 			);
 		}
+		finally {
+			statementDetails.releaseStatement( session );
+		}
 	}
 
 	private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
 		final JdbcInsertMutation jdbcInsert = createJdbcInsert( session );
 
-		final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, session );
+		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+		final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, jdbcCoordinator );
 
 		try {
 			session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcInsert.getSqlString() );
@@ -408,11 +419,12 @@ private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 				} );
 			}
 
-			session.getJdbcCoordinator().getResultSetReturn()
+			jdbcCoordinator.getResultSetReturn()
 					.executeUpdate( insertStatement, jdbcInsert.getSqlString() );
 		}
 		finally {
-			session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( insertStatement );
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insertStatement );
+			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 
@@ -453,11 +465,10 @@ private JdbcInsertMutation createJdbcInsert(SharedSessionContractImplementor ses
 
 	private static PreparedStatement createStatementDetails(
 			PreparableMutationOperation operation,
-			SharedSessionContractImplementor session) {
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+			JdbcCoordinator jdbcCoordinator) {
 		final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer();
 		final PreparedStatement statement = statementPreparer.prepareStatement( operation.getSqlString(), false );
-		session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement );
+		jdbcCoordinator.getLogicalConnection().getResourceRegistry().register( null, statement );
 		return statement;
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -17,6 +17,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.NoopLimitHandler;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -324,8 +325,8 @@ protected LockMode determineFollowOnLockMode(LockOptions lockOptions) {
 
 	@Override
 	public void release() {
-		final LogicalConnectionImplementor logicalConnection = getPersistenceContext().getJdbcCoordinator()
-				.getLogicalConnection();
+		final JdbcCoordinator jdbcCoordinator = getPersistenceContext().getJdbcCoordinator();
+		final LogicalConnectionImplementor logicalConnection = jdbcCoordinator.getLogicalConnection();
 		if ( resultSet != null ) {
 			logicalConnection.getResourceRegistry().release( resultSet, preparedStatement );
 			resultSet = null;
@@ -334,9 +335,8 @@ public void release() {
 		if ( preparedStatement != null ) {
 			logicalConnection.getResourceRegistry().release( preparedStatement );
 			preparedStatement = null;
+			jdbcCoordinator.afterStatementExecution();
 		}
-
-		logicalConnection.afterStatement();
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java

@@ -20,6 +20,7 @@
 
 import org.hibernate.testing.boot.BasicTestingJdbcServiceImpl;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.jupiter.api.AfterEach;
@@ -118,9 +119,9 @@
 
 	@Test
 	public void testBasicRelease() {
-		connectionProvider.clear();
 		ResourceRegistry registry = sessionFactoryScope().fromSession(
 				session -> {
+					connectionProvider.clear();
 					JdbcCoordinatorImpl jdbcCoord = (JdbcCoordinatorImpl) session.getJdbcCoordinator();
 					ResourceRegistry resourceRegistry = jdbcCoord.getLogicalConnection().getResourceRegistry();
 					try {
@@ -155,9 +156,9 @@
 
 	@Test
 	public void testReleaseCircumventedByHeldResources() {
-		connectionProvider.clear();
 		ResourceRegistry registry = sessionFactoryScope().fromSession(
 				session -> {
+					connectionProvider.clear();
 					JdbcCoordinatorImpl jdbcCoord = (JdbcCoordinatorImpl) session.getJdbcCoordinator();
 					ResourceRegistry resourceRegistry = jdbcCoord.getLogicalConnection().getResourceRegistry();
 
@@ -219,10 +220,9 @@
 
 	@Test
 	public void testReleaseCircumventedManually() {
-		connectionProvider.clear();
-		connectionProvider.clear();
 		ResourceRegistry registry = sessionFactoryScope().fromSession(
 				session -> {
+					connectionProvider.clear();
 					JdbcCoordinatorImpl jdbcCoord = (JdbcCoordinatorImpl) session.getJdbcCoordinator();
 					ResourceRegistry resourceRegistry = jdbcCoord.getLogicalConnection().getResourceRegistry();
 
@@ -275,4 +275,20 @@
 		assertEquals( 0, connectionProvider.getAcquiredConnections().size() );
 		assertEquals( 2, connectionProvider.getReleasedConnections().size() );
 	}
+
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-19477")
+	public void testHql() {
+		sessionFactoryScope().inTransaction( session -> {
+			connectionProvider.clear();
+			JdbcCoordinatorImpl jdbcCoord = (JdbcCoordinatorImpl) session.getJdbcCoordinator();
+			ResourceRegistry resourceRegistry = jdbcCoord.getLogicalConnection().getResourceRegistry();
+
+			session.createSelectionQuery( "select 1" ).uniqueResult();
+
+			assertFalse( resourceRegistry.hasRegisteredResources() );
+			assertEquals( 0, connectionProvider.getAcquiredConnections().size() );
+			assertEquals( 1, connectionProvider.getReleasedConnections().size() );
+		} );
+	}
 }