Commit 9cdcf5a0 authored by terrymanu's avatar terrymanu
Browse files

refactor TableMetaData

parent 80925fb9

sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java

+5 −5
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ import java.util.Map; 
 */

public final class TableMetaDataInitializer {

    

    private final TableMetaDataConnectionManager executorAdapter;

    private final TableMetaDataConnectionManager connectionManager;

    

    private final TableMetaDataLoader tableMetaDataLoader;

    

    public TableMetaDataInitializer(final ListeningExecutorService executorService, final TableMetaDataConnectionManager executorAdapter) {

        this.executorAdapter = executorAdapter;

        tableMetaDataLoader = new TableMetaDataLoader(executorService, executorAdapter);

    public TableMetaDataInitializer(final ListeningExecutorService executorService, final TableMetaDataConnectionManager connectionManager) {

        this.connectionManager = connectionManager;

        tableMetaDataLoader = new TableMetaDataLoader(executorService, connectionManager);

    }

    

    /**
@@ -86,7 +86,7 @@ public final class TableMetaDataInitializer { 
    

    private Collection<String> getAllTableNames(final String dataSourceName) throws SQLException {

        Collection<String> result = new LinkedList<>();

        try (Connection connection = executorAdapter.getConnection(dataSourceName);

        try (Connection connection = connectionManager.getConnection(dataSourceName);

             ResultSet resultSet = connection.getMetaData().getTables(null, null, null, null)) {

            while (resultSet.next()) {

                result.add(resultSet.getString("TABLE_NAME"));

sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public final class TableMetaDataLoader { 
    

    private final ListeningExecutorService executorService;

    

    private final TableMetaDataConnectionManager executorAdapter;

    private final TableMetaDataConnectionManager connectionManager;

    

    /**

     * Load table meta data.
@@ -70,12 +70,12 @@ public final class TableMetaDataLoader { 
    }

    

    private TableMetaData load(final DataNode dataNode) throws SQLException {

        if (executorAdapter.isAutoClose()) {

            try (Connection connection = executorAdapter.getConnection(dataNode.getDataSourceName())) {

        if (connectionManager.isAutoClose()) {

            try (Connection connection = connectionManager.getConnection(dataNode.getDataSourceName())) {

                return load(connection, dataNode);

            }

        }

        return load(executorAdapter.getConnection(dataNode.getDataSourceName()), dataNode);

        return load(connectionManager.getConnection(dataNode.getDataSourceName()), dataNode);

    }

    

    private TableMetaData load(final Connection connection, final DataNode dataNode) throws SQLException {