Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3308 from franz1981/jdbc_fix 

ARTEMIS-2955 commons-dbcp2 performance issue with Derby Embedded DBMS
This commit is contained in:
Gary Tully 2020-10-20 10:32:45 +01:00 committed by GitHub
parent 0077f354cd 769101ac69
commit 28d9038673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
View File

@ -132,6 +132,7 @@ public abstract class AbstractJDBCDriver {
logger.tracef("Table %s did exist but is empty. Starting initialization.", tableName);
} else {
logger.tracef("Table %s did exist but is empty. Initialization completed: no initialization statements left.", tableName);
connection.commit();
}
}
} catch (SQLException e) {

18
artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
View File

@ -24,6 +24,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.jdbc.store.logging.LoggingConnection;
import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.jboss.logging.Logger;
@ -34,19 +35,31 @@ public class JDBCConnectionProvider {
private Executor networkTimeoutExecutor;
private int networkTimeoutMillis;
private boolean supportNetworkTimeout;
private final String user;
private final String password;
public JDBCConnectionProvider(DataSource dataSource) {
this(dataSource, null, null);
}
public JDBCConnectionProvider(DataSource dataSource, String user, String password) {
this.dataSource = dataSource;
this.networkTimeoutExecutor = null;
this.networkTimeoutMillis = -1;
this.supportNetworkTimeout = true;
this.user = user;
this.password = password;
addDerbyShutdownHook();
}
public synchronized Connection getConnection() throws SQLException {
Connection connection;
try {
connection = dataSource.getConnection();
if (user != null || password != null) {
connection = dataSource.getConnection(user, password);
} else {
connection = dataSource.getConnection();
}
if (logger.isTraceEnabled() && !(connection instanceof LoggingConnection)) {
connection = new LoggingConnection(connection, logger);
}
@ -92,7 +105,8 @@ public class JDBCConnectionProvider {
public void addDerbyShutdownHook() {
// Shutdown the derby if using the derby embedded driver.
try (Connection connection = getConnection()) {
if (connection.getMetaData().getDriverName().equals("org.apache.derby.jdbc.EmbeddedDriver")) {
PropertySQLProvider.Factory.SQLDialect sqlDialect = PropertySQLProvider.Factory.investigateDialect(connection);
if (sqlDialect == PropertySQLProvider.Factory.SQLDialect.DERBY) {
if (shutAdded.compareAndSet(false, true)) {
Runtime.getRuntime().addShutdownHook(new ShutdownDerby());
}

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
View File

@ -151,7 +151,8 @@ public class DatabaseStorageConfiguration implements StoreConfiguration {
*/
private DataSource getDataSource() {
if (dataSource == null) {
if (dataSourceProperties.isEmpty()) {
// the next settings are going to be applied only if the datasource is the default one
if (dataSourceProperties.isEmpty() && ActiveMQDefaultConfiguration.getDefaultDataSourceClassName().equals(dataSourceClassName)) {
addDataSourceProperty("driverClassName", jdbcDriverClassName);
addDataSourceProperty("url", jdbcConnectionUrl);
if (jdbcUser != null) {
@ -162,6 +163,8 @@ public class DatabaseStorageConfiguration implements StoreConfiguration {
}
// Let the pool to have unbounded number of connections by default to prevent connection starvation
addDataSourceProperty("maxTotal", "-1");
// Let the pool to have unbounded number of cached prepared statements to save the initialization cost
addDataSourceProperty("poolPreparedStatements", "true");
}
dataSource = JDBCDataSourceUtils.getDataSource(dataSourceClassName, dataSourceProperties);
}
@ -179,7 +182,12 @@ public class DatabaseStorageConfiguration implements StoreConfiguration {
public JDBCConnectionProvider getConnectionProvider() {
if (connectionProvider == null) {
connectionProvider = new JDBCConnectionProvider(getDataSource());
// commons-dbcp2 doesn't support DataSource::getConnection(user, password)
if (dataSourceClassName == ActiveMQDefaultConfiguration.getDefaultDataSourceClassName()) {
connectionProvider = new JDBCConnectionProvider(getDataSource());
} else {
connectionProvider = new JDBCConnectionProvider(getDataSource(), getJdbcUser(), getJdbcPassword());
}
}
return connectionProvider;
}

10
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -257,6 +257,10 @@ public abstract class ActiveMQTestBase extends Assert {
@After
public void shutdownDerby() {
try {
DriverManager.getConnection("jdbc:derby:" + getEmbeddedDataBaseName() + ";destroy=true");
} catch (Exception ignored) {
}
try {
DriverManager.getConnection("jdbc:derby:;shutdown=true");
} catch (Exception ignored) {
@ -837,8 +841,12 @@ public abstract class ActiveMQTestBase extends Assert {
return testDir;
}
private String getEmbeddedDataBaseName() {
return "memory:" + getTestDir();
}
protected final String getTestJDBCConnectionUrl() {
return System.getProperty("jdbc.connection.url", "jdbc:derby:" + getTestDir() + File.separator + "derby;create=true");
return System.getProperty("jdbc.connection.url", "jdbc:derby:" + getEmbeddedDataBaseName() + ";create=true");
}
protected final String getJDBCClassName() {