From a3c852eb040a425bd198120a3de3ec4b41b22951 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Sun, 26 Feb 2017 20:41:42 +0000 Subject: [PATCH] NO-JIRA Database Page Store Improvements --- .../impl/PagingStoreFactoryDatabase.java | 68 +++++++++++++------ 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java index ee9d7bb557..7917165b2b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java @@ -45,7 +45,6 @@ import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFileFactoryDriv import org.apache.activemq.artemis.jdbc.store.sql.GenericSQLProvider; import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider; import org.apache.activemq.artemis.utils.ExecutorFactory; -import org.apache.activemq.artemis.utils.UUIDGenerator; /** * Integration point between Paging and JDBC @@ -80,6 +79,8 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { private JDBCSequentialFile directoryList; + private boolean started = false; + public PagingStoreFactoryDatabase(final DatabaseStorageConfiguration dbConf, final StorageManager storageManager, final long syncTimeout, @@ -93,27 +94,33 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { this.scheduledExecutor = scheduledExecutor; this.syncTimeout = syncTimeout; this.dbConf = dbConf; - - if (dbConf.getDataSource() != null) { - SQLProvider.Factory sqlProviderFactory = dbConf.getSqlProviderFactory(); - if (sqlProviderFactory == null) { - sqlProviderFactory = new GenericSQLProvider.Factory(); - } - pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getPageStoreTableName()), executorFactory.getExecutor()); - } else { - String driverClassName = dbConf.getJdbcDriverClassName(); - pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getJdbcConnectionUrl(), driverClassName, JDBCUtils.getSQLProvider(driverClassName, dbConf.getPageStoreTableName()), executorFactory.getExecutor()); - } - pagingFactoryFileFactory.start(); - directoryList = (JDBCSequentialFile) pagingFactoryFileFactory.createSequentialFile(DIRECTORY_NAME); - directoryList.open(); + start(); } + public synchronized void start() throws Exception { + if (!started) { + if (dbConf.getDataSource() != null) { + SQLProvider.Factory sqlProviderFactory = dbConf.getSqlProviderFactory(); + if (sqlProviderFactory == null) { + sqlProviderFactory = new GenericSQLProvider.Factory(); + } + pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getPageStoreTableName()), executorFactory.getExecutor()); + } else { + String driverClassName = dbConf.getJdbcDriverClassName(); + pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getJdbcConnectionUrl(), driverClassName, JDBCUtils.getSQLProvider(driverClassName, dbConf.getPageStoreTableName()), executorFactory.getExecutor()); + } + pagingFactoryFileFactory.start(); + started = true; + } + } // Public -------------------------------------------------------- @Override - public void stop() { - pagingFactoryFileFactory.stop(); + public synchronized void stop() { + if (started) { + pagingFactoryFileFactory.stop(); + started = false; + } } @Override @@ -136,8 +143,8 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { @Override public synchronized SequentialFileFactory newFileFactory(final SimpleString address) throws Exception { - String guid = UUIDGenerator.getInstance().generateStringUUID(); - SequentialFileFactory factory = newFileFactory(guid, true); + String tableName = "" + storageManager.generateID(); + SequentialFileFactory factory = newFileFactory(tableName, true); factory.start(); SequentialFile file = factory.createSequentialFile(PagingStoreFactoryDatabase.ADDRESS_FILE); @@ -146,6 +153,7 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(SimpleString.sizeofNullableString(address)); buffer.writeSimpleString(address); file.write(buffer, true); + file.close(); return factory; } @@ -157,15 +165,18 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { @Override public synchronized List reloadStores(final HierarchicalRepository addressSettingsRepository) throws Exception { // We assume the directory list < Integer.MAX_VALUE (this is only a list of addresses). + JDBCSequentialFile directoryList = (JDBCSequentialFile) pagingFactoryFileFactory.createSequentialFile(DIRECTORY_NAME); + directoryList.open(); + int size = ((Long) directoryList.size()).intValue(); ActiveMQBuffer buffer = readActiveMQBuffer(directoryList, size); ArrayList storesReturn = new ArrayList<>(); while (buffer.readableBytes() > 0) { - SimpleString guid = buffer.readSimpleString(); + SimpleString table = buffer.readSimpleString(); - JDBCSequentialFileFactory factory = (JDBCSequentialFileFactory) newFileFactory(guid.toString(), false); + JDBCSequentialFileFactory factory = (JDBCSequentialFileFactory) newFileFactory(table.toString(), false); factory.start(); JDBCSequentialFile addressFile = (JDBCSequentialFile) factory.createSequentialFile(ADDRESS_FILE); @@ -185,15 +196,28 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory { storesReturn.add(store); } + directoryList.close(); return storesReturn; } private synchronized SequentialFileFactory newFileFactory(final String directoryName, boolean writeToDirectory) throws Exception { + JDBCSequentialFile directoryList = (JDBCSequentialFile) pagingFactoryFileFactory.createSequentialFile(DIRECTORY_NAME); + directoryList.open(); SimpleString simpleString = SimpleString.toSimpleString(directoryName); ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(simpleString.sizeof()); buffer.writeSimpleString(simpleString); if (writeToDirectory) directoryList.write(buffer, true); - return new JDBCSequentialFileFactory(pagingFactoryFileFactory.getDbDriver().getConnection(), JDBCUtils.getSQLProvider(dbConf.getJdbcDriverClassName(), getTableNameForGUID(directoryName)), executorFactory.getExecutor()); + directoryList.close(); + + SQLProvider sqlProvider = null; + if (dbConf.getDataSource() != null) { + SQLProvider.Factory sqlProviderFactory = dbConf.getSqlProviderFactory() == null ? new GenericSQLProvider.Factory() : dbConf.getSqlProviderFactory(); + sqlProvider = sqlProviderFactory.create(getTableNameForGUID(directoryName)); + } else { + sqlProvider = JDBCUtils.getSQLProvider(dbConf.getJdbcDriverClassName(), getTableNameForGUID(directoryName)); + } + + return new JDBCSequentialFileFactory(pagingFactoryFileFactory.getDbDriver().getConnection(), sqlProvider, executorFactory.getExecutor()); } private String getTableNameForGUID(String guid) {