Skip to content

HHH-19831 LeakingStatementCachingTest hangs #11055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

HHH-19831 LeakingStatementCachingTest hangs #11055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions hibernate-core/src/test/java/org/hibernate/orm/test/batch/LeakingStatementCachingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ class LeakingStatementCachingTest {

@AfterAll
public void tearDown(SessionFactoryScope scope) {
SINGLE_CONNECTION_DATASOURCE.close();
try {
scope.getSessionFactory().getSchemaManager().dropMappedObjects( false );
}
finally {
SINGLE_CONNECTION_DATASOURCE.close();
}
}

@Test
Expand Down Expand Up @@ -127,38 +132,48 @@ public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {

serviceRegistryBuilder.applySetting( AvailableSettings.CONNECTION_PROVIDER,
new DataSourceConnectionProvider() );
serviceRegistryBuilder.applySetting( AvailableSettings.SHOW_SQL, false );
serviceRegistryBuilder.applySetting( AvailableSettings.SHOW_SQL, true );
serviceRegistryBuilder.applySetting( AvailableSettings.HBM2DDL_AUTO, "create" );
serviceRegistryBuilder.applySetting( AvailableSettings.LOG_JDBC_WARNINGS, false );
serviceRegistryBuilder.getSettings().remove( AvailableSettings.URL );
}
}

private static class SingleConnectionDataSource implements javax.sql.DataSource {

private final BlockingQueue<Connection> connectionQueue = new ArrayBlockingQueue<>( 1 );
private BlockingQueue<Connection> connectionQueue;

public SingleConnectionDataSource() {
DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl();
connectionProvider.configure(
PropertiesHelper.map( ConnectionProviderBuilder.getConnectionProviderProperties() ) );
try {
connectionQueue.add( new ConnectionWrapper( connectionProvider.getConnection(), this ) );
}
catch (SQLException e) {
throw new RuntimeException( e );
}
}

@Override
public Connection getConnection() {
try {
return connectionQueue.take();
if ( connectionQueue == null ) {
connectionQueue = new ArrayBlockingQueue<>( 1 );
connectionQueue.add( buildConnectionWrapper() );
}
if ( connectionQueue.isEmpty() ) {
throw new IllegalStateException( "A problem occurred retrieving the connection" );
}
Connection connection = connectionQueue.take();
if ( connection == null || connection.isClosed() ) {
throw new IllegalStateException( "A problem occurred retrieving the connection" );
}
return connection;
}
catch (InterruptedException e) {
catch (Exception e) {
throw new RuntimeException( e );
}
}

private ConnectionWrapper buildConnectionWrapper() throws SQLException {
DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl();
connectionProvider.configure(
PropertiesHelper.map( ConnectionProviderBuilder.getConnectionProviderProperties() ) );
return new ConnectionWrapper( connectionProvider.getConnection(), this );
}

@Override
public Connection getConnection(String username, String password) {
throw new UnsupportedOperationException();
Expand Down