Skip to content
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

Jump to bottom

Addresses a shortcoming of the Universal Connection Pool pool creation logic in certain test scenarios #8642

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Addresses a shortcoming of the Universal Connection Pool pool creation logic in certain test scenarios #8642

Show file tree
Hide file tree
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
26 changes: 23 additions & 3 deletions ...rc/main/java/io/helidon/integrations/datasource/ucp/cdi/UCPBackedDataSourceExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
import jakarta.enterprise.util.TypeLiteral;
import jakarta.inject.Named;
import oracle.ucp.UniversalConnectionPoolException;
import oracle.ucp.admin.UniversalConnectionPoolManagerImpl;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceFactory;
import oracle.ucp.jdbc.PoolDataSourceImpl;
Expand Down Expand Up @@ -141,7 +143,10 @@ protected final void addBean(BeanConfigurator<DataSource> beanConfigurator,
.produceWith(instance -> {
try {
return createDataSource(instance, dataSourceName, xa, dataSourceProperties);
} catch (IntrospectionException | ReflectiveOperationException | SQLException exception) {
} catch (IntrospectionException
| ReflectiveOperationException
| SQLException
| UniversalConnectionPoolException exception) {
throw new CreationException(exception.getMessage(), exception);
}
})
Expand All @@ -162,7 +167,7 @@ private static PoolDataSource createDataSource(Instance<Object> instance,
Named dataSourceName,
boolean xa,
Properties properties)
throws IntrospectionException, ReflectiveOperationException, SQLException {
throws IntrospectionException, ReflectiveOperationException, SQLException, UniversalConnectionPoolException {
// See
// https://docs.oracle.com/en/database/oracle/oracle-database/19/jjucp/get-started.html#GUID-2CC8D6EC-483F-4942-88BA-C0A1A1B68226
// for the general pattern.
Expand Down Expand Up @@ -269,7 +274,22 @@ private static PoolDataSource createDataSource(Instance<Object> instance,
}
}
if (returnValue.getConnectionPoolName() == null) {
returnValue.setConnectionPoolName(dataSourceName.value());
String proposedConnectionPoolName = dataSourceName.value();
String[] existingConnectionPoolNames =
UniversalConnectionPoolManagerImpl.getUniversalConnectionPoolManager().getConnectionPoolNames();
for (String existingConnectionPoolName : existingConnectionPoolNames) {
if (proposedConnectionPoolName.equals(existingConnectionPoolName)) {
// If the return value of an invocation of PoolDataSource#getConnectionPoolName() equals the name of
// an already existing UniversalConnectionPool instance, the first invocation of
// PoolDataSource#getConnection(), or any other operation that requires pool creation, will throw a
// SQLException (!). In this case only we let the auto-generated name (!) be used instead.
proposedConnectionPoolName = null;
break;
}
}
if (proposedConnectionPoolName != null) {
returnValue.setConnectionPoolName(proposedConnectionPoolName);
}
}
Instance<SSLContext> sslContextInstance = instance.select(SSLContext.class, dataSourceName);
if (!sslContextInstance.isUnsatisfied()) {
Expand Down
24 changes: 24 additions & 0 deletions ...i/datasource-ucp/src/test/java/io/helidon/integrations/datasource/ucp/cdi/TestUcpApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.helidon.integrations.datasource.ucp.cdi;

import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;

Expand Down Expand Up @@ -77,6 +78,29 @@ void testCreateConnectionPoolFailsWithoutSufficientInformation() throws SQLExcep
() -> ucpManager.createConnectionPool((UniversalConnectionPoolAdapter) getPoolDataSource()));
}

@Test
void testTwoPoolDataSourceCreationsWithSameName() throws SQLException, UniversalConnectionPoolException {
PoolDataSource pds = getPoolDataSource();
pds.setConnectionFactoryClassName("org.h2.jdbcx.JdbcDataSource");
pds.setURL("jdbc:h2:mem:test");
pds.setConnectionPoolName("pool0");
try (Connection c = pds.getConnection()) { // creates the pool
}
UniversalConnectionPoolManager ucpManager = UniversalConnectionPoolManagerImpl.getUniversalConnectionPoolManager();
String[] names = ucpManager.getConnectionPoolNames();
assertThat("Connection pool names: " + java.util.Arrays.asList(names), names.length, is(1));
assertThat(names[0], is("pool0"));
pds = getPoolDataSource(); // new one
pds.setConnectionFactoryClassName("org.h2.jdbcx.JdbcDataSource");
pds.setURL("jdbc:h2:mem:test");
pds.setConnectionPoolName("pool0");
assertThrows(SQLException.class, pds::getConnection); // !!
pds.setConnectionPoolName(null);
try (Connection c = pds.getConnection()) {
}
assertThat(pds.getConnectionPoolName(), is(not(nullValue()))); // !!
}

@Test
void testCreateConnectionPoolManuallyWithoutName() throws SQLException, UniversalConnectionPoolException {
PoolDataSource pds = getPoolDataSource();
Expand Down