Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18454 - Skip connection provider retrieval and DB info logging when booting offline 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2024-08-05 18:40:43 +02:00 committed by Steve Ebersole
parent e80d1ac54e
commit dc8a56be8f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java vendored
View File

@ -19,6 +19,8 @@ import org.hibernate.dialect.DatabaseVersion;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo; import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo;
import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
@ -123,6 +125,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
} }
final JdbcEnvironment jdbcEnvironment; final JdbcEnvironment jdbcEnvironment;
DatabaseConnectionInfo databaseConnectionInfo;
if ( allowJdbcMetadataAccess( configurationValues ) ) { if ( allowJdbcMetadataAccess( configurationValues ) ) {
jdbcEnvironment = getJdbcEnvironmentUsingJdbcMetadata( jdbcEnvironment = getJdbcEnvironmentUsingJdbcMetadata(
configurationValues, configurationValues,
@ -132,6 +135,7 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
explicitDatabaseMajorVersion, explicitDatabaseMajorVersion,
explicitDatabaseMinorVersion, explicitDatabaseMinorVersion,
explicitDatabaseVersion); explicitDatabaseVersion);
databaseConnectionInfo = buildDbInfo( registry );
} }
else if ( explicitDialectConfiguration( explicitDatabaseName, configurationValues ) ) { else if ( explicitDialectConfiguration( explicitDatabaseName, configurationValues ) ) {
jdbcEnvironment = getJdbcEnvironmentWithExplicitConfiguration( jdbcEnvironment = getJdbcEnvironmentWithExplicitConfiguration(
@ -143,31 +147,42 @@ public class JdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEn
explicitDatabaseMinorVersion, explicitDatabaseMinorVersion,
explicitDatabaseVersion explicitDatabaseVersion
); );
databaseConnectionInfo = buildDbInfo( configurationValues );
} }
else { else {
jdbcEnvironment = getJdbcEnvironmentWithDefaults( configurationValues, registry, dialectFactory ); jdbcEnvironment = getJdbcEnvironmentWithDefaults( configurationValues, registry, dialectFactory );
databaseConnectionInfo = buildDbInfo( configurationValues );
} }
logDbInfo( registry, jdbcEnvironment ); // most likely, the version hasn't been set yet, at least not for the ConnectionProviders that we currently maintain
databaseConnectionInfo.setDBVersion( jdbcEnvironment.getDialect().getVersion() );
// Standardized DB info logging
ConnectionInfoLogger.INSTANCE.logConnectionInfoDetails( databaseConnectionInfo.getDBInfoAsString() );
return jdbcEnvironment; return jdbcEnvironment;
} }
private static void logDbInfo(ServiceRegistryImplementor registry, JdbcEnvironment jdbcEnvironment) { private DatabaseConnectionInfo buildDbInfo(ServiceRegistryImplementor registry) {
// Standardized DB info logging
DatabaseConnectionInfo databaseConnectionInfo = null;
if ( !isMultiTenancyEnabled( registry ) ) { if ( !isMultiTenancyEnabled( registry ) ) {
final ConnectionProvider cp = registry.requireService( ConnectionProvider.class ); final ConnectionProvider cp = registry.requireService( ConnectionProvider.class );
databaseConnectionInfo = cp.getDatabaseConnectionInfo(); return cp.getDatabaseConnectionInfo();
} }
else { else {
final MultiTenantConnectionProvider<?> mcp = registry.getService( MultiTenantConnectionProvider.class ); final MultiTenantConnectionProvider<?> mcp = registry.getService( MultiTenantConnectionProvider.class );
databaseConnectionInfo = mcp.getDatabaseConnectionInfo(); assert mcp != null;
return mcp.getDatabaseConnectionInfo();
}
} }
// most likely, the version hasn't been set yet, at least not for the ConnectionProviders that we currently maintain
databaseConnectionInfo.setDBVersion( jdbcEnvironment.getDialect().getVersion() );
ConnectionInfoLogger.INSTANCE.logConnectionInfoDetails( databaseConnectionInfo.getDBInfoAsString() ); private DatabaseConnectionInfo buildDbInfo(Map<String, Object> configurationValues) {
return new DatabaseConnectionInfoImpl()
.setDBUrl( (String) configurationValues.get(JdbcSettings.JAKARTA_JDBC_URL) )
.setDBDriverName( (String) configurationValues.get(JdbcSettings.JAKARTA_JDBC_DRIVER) )
.setDBAutoCommitMode( (String) configurationValues.get(JdbcSettings.AUTOCOMMIT) )
.setDBIsolationLevel( ConnectionProviderInitiator.toIsolationNiceName( ConnectionProviderInitiator.interpretIsolation(configurationValues.get(JdbcSettings.ISOLATION)) ) )
// No setting for min. pool size
.setDBMaxPoolSize( (String) configurationValues.get(JdbcSettings.POOL_SIZE) );
} }
private static JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults( private static JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults(