Merge StorageUnitMetaData and StorageUnit

features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java

@@ -88,11 +88,11 @@ private void collectForShardingStatisticTable(final ShardingSphereDatabase datab
     }
 
     private void addTableRowsAndDataLength(final Map<String, StorageUnitMetaData> metaDataMap, final DataNode dataNode, final List<Object> row) throws SQLException {
-        DatabaseType databaseType = metaDataMap.get(dataNode.getDataSourceName()).getStorageUnit().getStorageType();
+        DatabaseType databaseType = metaDataMap.get(dataNode.getDataSourceName()).getStorageType();
         Optional<DialectShardingStatisticsTableCollector> dialectCollector = DatabaseTypedSPILoader.findService(DialectShardingStatisticsTableCollector.class, databaseType);
         boolean isAppended = false;
         if (dialectCollector.isPresent()) {
-            try (Connection connection = metaDataMap.get(dataNode.getDataSourceName()).getStorageUnit().getDataSource().getConnection()) {
+            try (Connection connection = metaDataMap.get(dataNode.getDataSourceName()).getDataSource().getConnection()) {
                 isAppended = dialectCollector.get().appendRow(connection, dataNode, row);
             }
         }

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java

@@ -113,6 +113,6 @@ private void closeResources(final ShardingSphereDatabase database) {
         database.getRuleMetaData().findRules(ResourceHeldRule.class).forEach(each -> each.closeStaleResource(databaseName));
         database.getRuleMetaData().findSingleRule(StaticDataSourceContainedRule.class).ifPresent(StaticDataSourceContainedRule::cleanStorageNodeDataSources);
         Optional.ofNullable(database.getResourceMetaData())
-                .ifPresent(optional -> optional.getStorageUnitMetaDataMap().values().forEach(each -> new DataSourcePoolDestroyer(each.getStorageUnit().getDataSource()).asyncDestroy()));
+                .ifPresent(optional -> optional.getStorageUnitMetaDataMap().values().forEach(each -> new DataSourcePoolDestroyer(each.getDataSource()).asyncDestroy()));
     }
 }

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabase.java

@@ -199,7 +199,7 @@ public synchronized void reloadRules(final Class<? extends ShardingSphereRule> r
         toBeReloadedRules.stream().findFirst().ifPresent(optional -> {
             databaseRules.removeAll(toBeReloadedRules);
             Map<String, DataSource> dataSources = resourceMetaData.getStorageUnitMetaDataMap().entrySet().stream()
-                    .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageUnit().getDataSource(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
+                    .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getDataSource(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
             databaseRules.add(((MutableDataNodeRule) optional).reloadRule(ruleConfig, name, dataSources, databaseRules));
         });
         ruleMetaData.getRules().clear();

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java

@@ -91,8 +91,8 @@ public Collection<String> getAllInstanceDataSourceNames() {
     }
 
     private boolean isExisted(final String dataSourceName, final Collection<String> existedDataSourceNames) {
-        return existedDataSourceNames.stream().anyMatch(each -> storageUnitMetaDataMap.get(dataSourceName).getStorageUnit().getConnectionProperties()
-                .isInSameDatabaseInstance(storageUnitMetaDataMap.get(each).getStorageUnit().getConnectionProperties()));
+        return existedDataSourceNames.stream().anyMatch(each -> storageUnitMetaDataMap.get(dataSourceName).getConnectionProperties()
+                .isInSameDatabaseInstance(storageUnitMetaDataMap.get(each).getConnectionProperties()));
     }
 
     /**
@@ -102,7 +102,7 @@ private boolean isExisted(final String dataSourceName, final Collection<String>
      * @return connection properties
      */
     public ConnectionProperties getConnectionProperties(final String dataSourceName) {
-        return storageUnitMetaDataMap.get(dataSourceName).getStorageUnit().getConnectionProperties();
+        return storageUnitMetaDataMap.get(dataSourceName).getConnectionProperties();
     }
 
     /**
@@ -112,7 +112,7 @@ public ConnectionProperties getConnectionProperties(final String dataSourceName)
      * @return storage type
      */
     public DatabaseType getStorageType(final String dataSourceName) {
-        return storageUnitMetaDataMap.get(dataSourceName).getStorageUnit().getStorageType();
+        return storageUnitMetaDataMap.get(dataSourceName).getStorageType();
     }
 
     /**

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitMetaData.java

@@ -18,10 +18,19 @@
 package org.apache.shardingsphere.infra.metadata.database.resource.unit;
 
 import lombok.Getter;
+import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
+import org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.infra.database.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
+import org.apache.shardingsphere.infra.state.datasource.DataSourceStateManager;
 
 import javax.sql.DataSource;
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * Storage unit meta data.
@@ -31,10 +40,33 @@ public final class StorageUnitMetaData {
 
     private final StorageNode storageNode;
 
-    private final StorageUnit storageUnit;
+    private final DataSource dataSource;
+
+    private final DataSourcePoolProperties dataSourcePoolProperties;
+
+    private final DatabaseType storageType;
+
+    private final ConnectionProperties connectionProperties;
 
     public StorageUnitMetaData(final String databaseName, final StorageNode storageNode, final DataSourcePoolProperties dataSourcePoolProperties, final DataSource dataSource) {
         this.storageNode = storageNode;
-        storageUnit = new StorageUnit(databaseName, dataSource, dataSourcePoolProperties, storageNode);
+        this.dataSource = new CatalogSwitchableDataSource(dataSource, storageNode.getCatalog(), storageNode.getUrl());
+        this.dataSourcePoolProperties = dataSourcePoolProperties;
+        boolean isDataSourceEnabled = !DataSourceStateManager.getInstance().getEnabledDataSources(databaseName, Collections.singletonMap(storageNode.getName().getName(), dataSource)).isEmpty();
+        storageType = createStorageType(isDataSourceEnabled);
+        connectionProperties = createConnectionProperties(isDataSourceEnabled, storageNode);
+    }
+
+    private DatabaseType createStorageType(final boolean isDataSourceEnabled) {
+        return DatabaseTypeEngine.getStorageType(isDataSourceEnabled ? Collections.singleton(dataSource) : Collections.emptyList());
+    }
+
+    private ConnectionProperties createConnectionProperties(final boolean isDataSourceEnabled, final StorageNode storageNode) {
+        if (!isDataSourceEnabled) {
+            return null;
+        }
+        Map<String, Object> standardProps = dataSourcePoolProperties.getConnectionPropertySynonyms().getStandardProperties();
+        ConnectionPropertiesParser parser = DatabaseTypedSPILoader.getService(ConnectionPropertiesParser.class, storageType);
+        return parser.parse(standardProps.getOrDefault("url", "").toString(), standardProps.getOrDefault("username", "").toString(), storageNode.getCatalog());
     }
 }

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderMaterial.java

@@ -53,9 +53,9 @@ public final class GenericSchemaBuilderMaterial {
     public GenericSchemaBuilderMaterial(final DatabaseType protocolType, final Map<String, StorageUnitMetaData> storageUnitMetaDataMap,
                                         final Collection<ShardingSphereRule> rules, final ConfigurationProperties props, final String defaultSchemaName) {
         this(protocolType, storageUnitMetaDataMap.entrySet().stream()
-                .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageUnit().getStorageType(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)),
+                .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageType(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)),
                 storageUnitMetaDataMap.entrySet().stream()
-                        .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageUnit().getDataSource(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)),
+                        .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getDataSource(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)),
                 rules, props, defaultSchemaName);
     }
 

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereTableDataCollectorUtils.java

@@ -59,7 +59,7 @@ public static Collection<ShardingSphereRowData> collectRowData(final ShardingSph
         Collection<ShardingSphereRowData> result = new LinkedList<>();
         for (StorageUnitMetaData each : database.getResourceMetaData().getStorageUnitMetaDataMap().values()) {
             try (
-                    Connection connection = each.getStorageUnit().getDataSource().getConnection();
+                    Connection connection = each.getDataSource().getConnection();
                     Statement statement = connection.createStatement();
                     ResultSet resultSet = statement.executeQuery(sql)) {
                 result.addAll(getRows(table, selectedColumnNames, resultSet));
@@ -69,7 +69,7 @@ public static Collection<ShardingSphereRowData> collectRowData(final ShardingSph
     }
 
     private static boolean isDifferentProtocolAndStorageType(final ShardingSphereDatabase database) {
-        return !database.getResourceMetaData().getStorageUnitMetaDataMap().values().stream().allMatch(each -> each.getStorageUnit().getStorageType().equals(database.getProtocolType()));
+        return !database.getResourceMetaData().getStorageUnitMetaDataMap().values().stream().allMatch(each -> each.getStorageType().equals(database.getProtocolType()));
     }
 
     private static Collection<ShardingSphereRowData> getRows(final ShardingSphereTable table, final Collection<String> selectedColumnNames, final ResultSet resultSet) throws SQLException {

infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/DriverExecutionPrepareEngine.java

@@ -97,7 +97,7 @@ protected List<ExecutionGroup<T>> group(final String dataSourceName, final int c
     @SuppressWarnings("unchecked")
     private ExecutionGroup<T> createExecutionGroup(final String dataSourceName, final List<SQLUnit> sqlUnits, final C connection, final ConnectionMode connectionMode) throws SQLException {
         List<T> inputs = new LinkedList<>();
-        DatabaseType databaseType = storageUnitMetaDataMap.get(dataSourceName).getStorageUnit().getStorageType();
+        DatabaseType databaseType = storageUnitMetaDataMap.get(dataSourceName).getStorageType();
         for (SQLUnit each : sqlUnits) {
             inputs.add((T) sqlExecutionUnitBuilder.build(new ExecutionUnit(dataSourceName, each), statementManager, connection, connectionMode, option, databaseType));
         }

infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java

@@ -49,7 +49,7 @@ public final class GenericSQLRewriteEngine {
     public GenericSQLRewriteResult rewrite(final SQLRewriteContext sqlRewriteContext) {
         String sql = translatorRule.translate(
                 new DefaultSQLBuilder(sqlRewriteContext).toSQL(), sqlRewriteContext.getSqlStatementContext().getSqlStatement(), protocolType,
-                storageUnitMetaDataMap.isEmpty() ? protocolType : storageUnitMetaDataMap.values().iterator().next().getStorageUnit().getStorageType());
+                storageUnitMetaDataMap.isEmpty() ? protocolType : storageUnitMetaDataMap.values().iterator().next().getStorageType());
         return new GenericSQLRewriteResult(new SQLRewriteUnit(sql, sqlRewriteContext.getParameterBuilder().getParameters()));
     }
 }

infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java

@@ -157,7 +157,7 @@ private boolean isInSameDataNode(final Collection<DataNode> dataNodes, final Rou
     private Map<RouteUnit, SQLRewriteUnit> translate(final SQLStatement sqlStatement, final Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits) {
         Map<RouteUnit, SQLRewriteUnit> result = new LinkedHashMap<>(sqlRewriteUnits.size(), 1F);
         for (Entry<RouteUnit, SQLRewriteUnit> entry : sqlRewriteUnits.entrySet()) {
-            DatabaseType storageType = storageUnitMetaDataMap.get(entry.getKey().getDataSourceMapper().getActualName()).getStorageUnit().getStorageType();
+            DatabaseType storageType = storageUnitMetaDataMap.get(entry.getKey().getDataSourceMapper().getActualName()).getStorageType();
             String sql = translatorRule.translate(entry.getValue().getSql(), sqlStatement, protocolType, storageType);
             SQLRewriteUnit sqlRewriteUnit = new SQLRewriteUnit(sql, entry.getValue().getParameters());
             result.put(entry.getKey(), sqlRewriteUnit);

infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java

@@ -25,7 +25,6 @@
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
 import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnitMetaData;
-import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
 import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.rewrite.engine.result.GenericSQLRewriteResult;
@@ -84,15 +83,11 @@ void assertRewriteForRouteSQLRewriteResult() {
     }
 
     private ResourceMetaData mockResourceMetaData() {
-        StorageUnit storageUnit1 = mock(StorageUnit.class);
-        when(storageUnit1.getStorageType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "H2"));
-        StorageUnit storageUnit2 = mock(StorageUnit.class);
-        when(storageUnit2.getStorageType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "MySQL"));
         Map<String, StorageUnitMetaData> metaDataMap = new LinkedHashMap<>(2, 1F);
         StorageUnitMetaData storageUnitMetaData1 = mock(StorageUnitMetaData.class);
-        when(storageUnitMetaData1.getStorageUnit()).thenReturn(storageUnit1);
+        when(storageUnitMetaData1.getStorageType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "H2"));
         StorageUnitMetaData storageUnitMetaData2 = mock(StorageUnitMetaData.class);
-        when(storageUnitMetaData2.getStorageUnit()).thenReturn(storageUnit2);
+        when(storageUnitMetaData2.getStorageType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "MySQL"));
         metaDataMap.put("ds_0", storageUnitMetaData1);
         metaDataMap.put("ds_1", storageUnitMetaData2);
         ResourceMetaData result = mock(ResourceMetaData.class, RETURNS_DEEP_STUBS);

infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngineTest.java

@@ -65,7 +65,7 @@ void assertRewriteStorageTypeIsEmpty() {
 
     private Map<String, StorageUnitMetaData> mockStorageUnitMetaData(final DatabaseType databaseType) {
         StorageUnitMetaData result = mock(StorageUnitMetaData.class, RETURNS_DEEP_STUBS);
-        when(result.getStorageUnit().getStorageType()).thenReturn(databaseType);
+        when(result.getStorageType()).thenReturn(databaseType);
         return Collections.singletonMap("ds_0", result);
     }
 

infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngineTest.java

@@ -178,7 +178,7 @@ private ShardingSphereDatabase mockDatabase() {
 
     private Map<String, StorageUnitMetaData> mockStorageUnitMetaData(final DatabaseType databaseType) {
         StorageUnitMetaData result = mock(StorageUnitMetaData.class, RETURNS_DEEP_STUBS);
-        when(result.getStorageUnit().getStorageType()).thenReturn(databaseType);
+        when(result.getStorageType()).thenReturn(databaseType);
         return Collections.singletonMap("ds_0", result);
     }
 }