refactor TableMetaDataLoader

azexcy · Aug 1, 2018 · 2d54305 · 2d54305
1 parent f162921
commit 2d54305
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/...ng-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSource.java b/...ng-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSource.java
@@ -26,7 +26,7 @@
 import io.shardingsphere.core.jdbc.adapter.AbstractDataSourceAdapter;
 import io.shardingsphere.core.jdbc.core.ShardingContext;
 import io.shardingsphere.core.jdbc.core.connection.ShardingConnection;
-import io.shardingsphere.core.jdbc.metadata.AutoClosedJDBCTableMetaDataExecutorAdapter;
+import io.shardingsphere.core.jdbc.metadata.DataSourceMapTableMetaDataExecutorAdapter;
 import io.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import io.shardingsphere.core.rule.MasterSlaveRule;
 import io.shardingsphere.core.rule.ShardingRule;
@@ -68,7 +68,7 @@ public ShardingDataSource(final Map<String, DataSource> dataSourceMap, final Sha
         shardingProperties = new ShardingProperties(null == props ? new Properties() : props);
         int executorSize = shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_SIZE);
         executorEngine = new ExecutorEngine(executorSize);
-        ShardingTableMetaData shardingTableMetaData = new ShardingTableMetaData(executorEngine.getExecutorService(), new AutoClosedJDBCTableMetaDataExecutorAdapter(dataSourceMap));
+        ShardingTableMetaData shardingTableMetaData = new ShardingTableMetaData(executorEngine.getExecutorService(), new DataSourceMapTableMetaDataExecutorAdapter(dataSourceMap));
         shardingTableMetaData.init(shardingRule);
         boolean showSQL = shardingProperties.getValue(ShardingPropertiesConstant.SQL_SHOW);
         shardingContext = new ShardingContext(dataSourceMap, shardingRule, getDatabaseType(), executorEngine, shardingTableMetaData, showSQL);
@@ -91,7 +91,7 @@ public void renew(final Map<String, DataSource> newDataSourceMap, final Sharding
             originalExecutorEngine.close();
         }
         boolean newShowSQL = newShardingProperties.getValue(ShardingPropertiesConstant.SQL_SHOW);
-        ShardingTableMetaData shardingMetaData = new ShardingTableMetaData(executorEngine.getExecutorService(), new AutoClosedJDBCTableMetaDataExecutorAdapter(newDataSourceMap));
+        ShardingTableMetaData shardingMetaData = new ShardingTableMetaData(executorEngine.getExecutorService(), new DataSourceMapTableMetaDataExecutorAdapter(newDataSourceMap));
         shardingMetaData.init(newShardingRule);
         shardingProperties = newShardingProperties;
         shardingContext = new ShardingContext(newDataSourceMap, newShardingRule, getDatabaseType(), executorEngine, shardingMetaData, newShowSQL);

diff --git a/...c/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java b/...c/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java
@@ -30,7 +30,7 @@
 import io.shardingsphere.core.jdbc.core.connection.ShardingConnection;
 import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSet;
 import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSet;
-import io.shardingsphere.core.jdbc.metadata.ConnectionHoldJDBCTableMetaDataExecutorAdapter;
+import io.shardingsphere.core.jdbc.metadata.ShardingConnectionTableMetaDataExecutorAdapter;
 import io.shardingsphere.core.merger.JDBCQueryResult;
 import io.shardingsphere.core.merger.MergeEngine;
 import io.shardingsphere.core.merger.MergeEngineFactory;
@@ -217,7 +217,7 @@ private void refreshTableMetaData() {
             String logicTableName = routeResult.getSqlStatement().getTables().getSingleTableName();
             ShardingTableMetaData shardingTableMetaData = connection.getShardingContext().getMetaData().getTable();
             TableMetaDataLoader tableMetaDataLoader = new TableMetaDataLoader(
-                    connection.getShardingContext().getExecutorEngine().getExecutorService(), new ConnectionHoldJDBCTableMetaDataExecutorAdapter(logicTableName, connection));
+                    connection.getShardingContext().getExecutorEngine().getExecutorService(), new ShardingConnectionTableMetaDataExecutorAdapter(logicTableName, connection));
             shardingTableMetaData.put(logicTableName, tableMetaDataLoader.loadTableMetaData(logicTableName, connection.getShardingContext().getShardingRule()));
         }
     }

diff --git a/...ding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java b/...ding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java
@@ -26,7 +26,7 @@
 import io.shardingsphere.core.jdbc.core.connection.ShardingConnection;
 import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSet;
 import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSet;
-import io.shardingsphere.core.jdbc.metadata.ConnectionHoldJDBCTableMetaDataExecutorAdapter;
+import io.shardingsphere.core.jdbc.metadata.ShardingConnectionTableMetaDataExecutorAdapter;
 import io.shardingsphere.core.merger.JDBCQueryResult;
 import io.shardingsphere.core.merger.MergeEngine;
 import io.shardingsphere.core.merger.MergeEngineFactory;
@@ -251,7 +251,7 @@ private void refreshTableMetaData() {
             String logicTableName = routeResult.getSqlStatement().getTables().getSingleTableName();
             ShardingTableMetaData shardingTableMetaData = connection.getShardingContext().getMetaData().getTable();
             TableMetaDataLoader tableMetaDataLoader = new TableMetaDataLoader(
-                    connection.getShardingContext().getExecutorEngine().getExecutorService(), new ConnectionHoldJDBCTableMetaDataExecutorAdapter(logicTableName, connection));
+                    connection.getShardingContext().getExecutorEngine().getExecutorService(), new ShardingConnectionTableMetaDataExecutorAdapter(logicTableName, connection));
             shardingTableMetaData.put(logicTableName, tableMetaDataLoader.loadTableMetaData(logicTableName, connection.getShardingContext().getShardingRule()));
         }
     }

diff --git a/...osedJDBCTableMetaDataExecutorAdapter.java → ...ourceMapTableMetaDataExecutorAdapter.java b/...osedJDBCTableMetaDataExecutorAdapter.java → ...ourceMapTableMetaDataExecutorAdapter.java
@@ -26,12 +26,12 @@
 import java.util.Map;
 
 /**
- * Table meta data executor adapter for JDBC and auto closed.
+ * Table meta data executor adapter for JDBC with data source map.
  *
  * @author zhangliang
  */
 @RequiredArgsConstructor
-public final class AutoClosedJDBCTableMetaDataExecutorAdapter implements TableMetaDataExecutorAdapter {
+public final class DataSourceMapTableMetaDataExecutorAdapter implements TableMetaDataExecutorAdapter {
 
     private final Map<String, DataSource> dataSourceMap;
 

diff --git a/...HoldJDBCTableMetaDataExecutorAdapter.java → ...nnectionTableMetaDataExecutorAdapter.java b/...HoldJDBCTableMetaDataExecutorAdapter.java → ...nnectionTableMetaDataExecutorAdapter.java
@@ -25,12 +25,12 @@
 import java.sql.SQLException;
 
 /**
- * Table meta data executor adapter for JDBC and connection hold by creator.
+ * Table meta data executor adapter for JDBC with sharding connection.
  *
  * @author zhangliang
  */
 @RequiredArgsConstructor
-public final class ConnectionHoldJDBCTableMetaDataExecutorAdapter implements TableMetaDataExecutorAdapter {
+public final class ShardingConnectionTableMetaDataExecutorAdapter implements TableMetaDataExecutorAdapter {
 
     private final String logicTableName;
 

diff --git a/...dbc/src/test/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnectionTest.java b/...dbc/src/test/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnectionTest.java
@@ -25,7 +25,7 @@
 import io.shardingsphere.core.fixture.TestDataSource;
 import io.shardingsphere.core.jdbc.core.ShardingContext;
 import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource;
-import io.shardingsphere.core.jdbc.metadata.AutoClosedJDBCTableMetaDataExecutorAdapter;
+import io.shardingsphere.core.jdbc.metadata.DataSourceMapTableMetaDataExecutorAdapter;
 import io.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import io.shardingsphere.core.rule.ShardingRule;
 import org.junit.After;
@@ -75,7 +75,7 @@ public void setUp() {
         dataSourceMap.put(DS_NAME, masterSlaveDataSource);
         ShardingRule shardingRule = new ShardingRule(shardingRuleConfig, dataSourceMap.keySet());
         ListeningExecutorService executorService = Mockito.mock(ListeningExecutorService.class);
-        ShardingTableMetaData shardingTableMetaData = new ShardingTableMetaData(executorService, new AutoClosedJDBCTableMetaDataExecutorAdapter(dataSourceMap));
+        ShardingTableMetaData shardingTableMetaData = new ShardingTableMetaData(executorService, new DataSourceMapTableMetaDataExecutorAdapter(dataSourceMap));
         ShardingContext shardingContext = new ShardingContext(dataSourceMap, shardingRule, DatabaseType.H2, null, shardingTableMetaData, false);
         connection = new ShardingConnection(shardingContext);
     }